libmtp-discuss

[Libmtp-discuss] [PATCH 1/3] ptp: fix memory leak

[Reverend H. <mk....@gm...>]

[src/ptp.c:2472]: (error) Memory leak: storageids.Storage
---
 src/ptp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ptp.c b/src/ptp.c
index d66c8f2..b5c375e 100644
--- a/src/ptp.c
+++ b/src/ptp.c
@@ -2469,6 +2469,7 @@ ptp_list_folder_eos (PTPParams *params, uint32_t storage, uint32_t handle) {
 				newobs = realloc (params->objects,sizeof(PTPObject)*(params->nrofobjects+1));
 				if (!newobs) {
 					free (tmp);
+					free (storageids.Storage);
 					return PTP_RC_GeneralError;
 				}
 				params->objects = newobs;
-- 
2.19.2

[Libmtp-discuss] [PATCH 2/3] libmtp: fix couple of realloc failures

[Reverend H. <mk....@gm...>]

[src/libmtp.c:4002]: (error) Common realloc mistake: 'localtypes' nulled but not freed upon failure
[src/libmtp.c:4009]: (error) Common realloc mistake: 'localtypes' nulled but not freed upon failure
---
 src/libmtp.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/libmtp.c b/src/libmtp.c
index 23bb3d2..65db571 100644
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -3999,15 +3999,21 @@ int LIBMTP_Get_Supported_Filetypes(LIBMTP_mtpdevice_t *device, uint16_t ** const
   }
   // The forgotten Ogg support on YP-10 and others...
   if (FLAG_OGG_IS_UNKNOWN(ptp_usb)) {
-    localtypes = (uint16_t *) realloc(localtypes,
-		(params->deviceinfo.ImageFormats_len+1) * sizeof(uint16_t));
+    uint16_t *tmp = (uint16_t *) realloc(
+        localtypes, (params->deviceinfo.ImageFormats_len+1) * sizeof(uint16_t));
+    if (tmp == NULL)
+      return -ENOMEM;
+    localtypes = tmp;
     localtypes[localtypelen] = LIBMTP_FILETYPE_OGG;
     localtypelen++;
   }
   // The forgotten FLAC support on Cowon iAudio S9 and others...
   if (FLAG_FLAC_IS_UNKNOWN(ptp_usb)) {
-    localtypes = (uint16_t *) realloc(localtypes,
-		(params->deviceinfo.ImageFormats_len+1) * sizeof(uint16_t));
+    uint16_t *tmp = (uint16_t *) realloc(
+        localtypes, (params->deviceinfo.ImageFormats_len+1) * sizeof(uint16_t));
+    if (tmp == NULL)
+      return -ENOMEM;
+    localtypes = tmp;
     localtypes[localtypelen] = LIBMTP_FILETYPE_FLAC;
     localtypelen++;
   }
-- 
2.19.2

[Libmtp-discuss] [PATCH 3/3] mtpz: fix couple of memory leaks

[Reverend H. <mk....@gm...>]

[src/mtpz.c:1643]: (error) Memory leak: hash_key
[src/mtpz.c:1589]: (error) Memory leak: v10
[src/mtpz.c:1589]: (error) Memory leak: v11
[src/mtpz.c:1739]: (error) Memory leak: odata
---
 src/mtpz.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/mtpz.c b/src/mtpz.c
index aeff17c..75d3648 100644
--- a/src/mtpz.c
+++ b/src/mtpz.c
@@ -1586,6 +1586,9 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, unsigned char *random, un
 	reader += 2;
 	if (*(reader++) != '\x03' || *(reader++) != '\x40')
 	{
+		free(v10);
+		free(v11);
+		free(hash_key);
 		return -1;
 	}
 
@@ -1608,6 +1611,9 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, unsigned char *random, un
 	if (memcmp(rand_data, random, 16) != 0)
 	{
 		free(rand_data);
+		free(hash_key);
+		free(v10);
+		free(v11);
 		return -1;
 	}
 	free(rand_data);
@@ -1639,6 +1645,7 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, unsigned char *random, un
 	free(v10);
 	free(v11);
 	free(act_msg);
+	free(hash_key);
 
 	return ret;
 }
@@ -1736,6 +1743,7 @@ ptp_mtpz_makeapplicationcertificatemessage (unsigned int *out_len, unsigned char
 	{
 		LIBMTP_INFO("(MTPZ) Failure - could not instantiate RSA object.\n");
 		*out_len = 0;
+		free(odata);
 		return NULL;
 	}
 
-- 
2.19.2