Fix leaks in obex
PATCH v2 2/6 Fix leaks in obex
In filesystem, g_file_get_contents allocates fresh memory to buf. It needs to be freed after conversion to a GString object.
Destination was missed on an error path as is mld.
--- obexd/plugins/filesystem.c | 2 +- obexd/plugins/ftp.c | 8 ++++++-- obexd/plugins/messages-dummy.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
obexd/plugins/filesystem.c@@ -416,6 +416,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, renamed from obexd/plugins/filesystem.c +0 -0
}
object->buffer = g_string_new(buf);
+ g_free(buf);
if (size)
*size = object->buffer->len;
obexd/plugins/ftp.c +6 -2
@@ -386,8 +386,10 @@ static int ftp_copy(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );
@@ -424,8 +426,10 @@ static int ftp_move(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );
obexd/plugins/messages-dummy.c +1 -0
@@ -488,6 +488,7 @@ int messages_get_messages_listing(void *session, const char *name,int err = -errno;DBG ("fopen(): %d, %s" , -err,strerror (-err));g_free (path); +g_free (mld);return -EBADR ; } }
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerHi Steve,
Quoted 65 lines · Steve Grubb
In filesystem,
g_file_get_contentsallocates fresh memory to buf. It needs to be freed after conversion to a GString object.Destination was missed on an error path as is mld.
--- obexd/plugins/filesystem.c | 2 +- obexd/plugins/ftp.c | 8 ++++++-- obexd/plugins/messages-dummy.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)obexd/plugins/filesystem.c@@ -416,6 +416,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, renamed from obexd/plugins/filesystem.c +1
-0} object->buffer = g_string_new(buf); + g_free(buf); if (size) *size = object->buffer->len;obexd/plugins/ftp.c +6
-2@@ -386,8 +386,10 @@ static int ftp_copy(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );@@ -424,8 +426,10 @@ static int ftp_move(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );obexd/plugins/messages-dummy.c +1
-1@@ -488,6 +488,7 @@ int messages_get_messages_listing(void *session, const char *name,int err = -errno;DBG ("fopen(): %d, %s" , -err,strerror (-err));g_free (path); +g_free (mld);return -EBADR ; } } --
Quoted 1 line
2.31.1
You will need to resend this since apparently patchwork cannot identify this as the same set as the others:
https://patchwork.kernel.org/project/bluetooth/list/?series=482521
Signature · 1 line
Luiz Augusto von Dentz