Skip to content

Fix memory leak #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leak #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions sshfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,23 +1441,25 @@ static int do_read(struct conn *conn, struct buffer *buf)

static int sftp_read(struct conn *conn, uint8_t *type, struct buffer *buf)
{
int res;
int res = -1;
struct buffer buf2;
uint32_t len;
buf_init(&buf2, 5);
res = do_read(conn, &buf2);
if (res != -1) {
if (buf_get_uint32(&buf2, &len) == -1)
return -1;
goto out;
if (len > MAX_REPLY_LEN) {
fprintf(stderr, "reply len too large: %u\n", len);
return -1;
goto out;
}
if (buf_get_uint8(&buf2, type) == -1)
return -1;
goto out;
buf_init(buf, len - 1);
res = do_read(conn, buf);
}

out:
buf_free(&buf2);
return res;
}
Expand Down Expand Up @@ -1530,10 +1532,15 @@ static int process_one_request(struct conn *conn)

buf_init(&buf, 0);
res = sftp_read(conn, &type, &buf);
if (res == -1)
if (res == -1) {
if (buf.p)
buf_free(&buf);
return -1;
if (buf_get_uint32(&buf, &id) == -1)
}
if (buf_get_uint32(&buf, &id) == -1) {
buf_free(&buf);
return -1;
}

pthread_mutex_lock(&sshfs.lock);
req = (struct request *)
Expand Down Expand Up @@ -2278,6 +2285,7 @@ static int sftp_readdir_async(struct conn *conn, struct buffer *handle,
struct buffer name;
int tmperr;

buf_init(&name, 0);
while (!done && outstanding < max) {
tmperr = sftp_readdir_send(conn, &req, handle);

Expand Down Expand Up @@ -2325,6 +2333,7 @@ static int sftp_readdir_async(struct conn *conn, struct buffer *handle,
if (!done) {
err = buf_get_entries(&name, buf, filler);
buf_free(&name);
name.p = NULL;

/* increase number of outstanding requests */
if (max < READDIR_MAX)
Expand All @@ -2334,6 +2343,8 @@ static int sftp_readdir_async(struct conn *conn, struct buffer *handle,
done = 1;
}
}
if (name.p)
buf_free(&name);
}
assert(list == NULL);

Expand Down