changeset 14450:1723608170c0

8145278: Fix memory leak in splitPathList Reviewed-by: sspitsyn, dsamersoff, dcubed
author ahenrie
date Tue, 17 Nov 2015 23:10:30 -0700
parents 4b78af87def9
children 769777ebcc81 1d38cf0f291c 6e607ec47322
files src/java.instrument/share/native/libinstrument/InvocationAdapter.c
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c	Thu Apr 14 19:55:41 2016 -0700
+++ b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c	Tue Nov 17 23:10:30 2015 -0700
@@ -518,18 +518,22 @@
 splitPathList(const char* str, int* pathCount, char*** paths) {
     int count = 0;
     char** segments = NULL;
+    char** new_segments;
     char* c = (char*) str;
     while (*c != '\0') {
         while (*c == ' ') c++;          /* skip leading spaces */
         if (*c == '\0') {
             break;
         }
-        if (segments == NULL) {
-            segments = (char**)malloc( sizeof(char**) );
-        } else {
-            segments = (char**)realloc( segments, (count+1)*sizeof(char**) );
+        new_segments = (char**)realloc(segments, (count+1)*sizeof(char*));
+        if (new_segments == NULL) {
+            jplis_assert(0);
+            free(segments);
+            count = 0;
+            segments = NULL;
+            break;
         }
-        jplis_assert(segments != (char**)NULL);
+        segments = new_segments;
         segments[count++] = c;
         c = strchr(c, ' ');
         if (c == NULL) {