[PATCH v2] Skip the null pointer check before calling realloc
Alex Henrie
alexhenrie24 at gmail.com
Wed Nov 18 06:24:45 UTC 2015
# HG changeset patch
# User Alex Henrie <alexhenrie24 at gmail.com>
# Date 1447827030 25200
# Tue Nov 17 23:10:30 2015 -0700
# Node ID fb4a3c0272c0bc9c764258db65ff0b975a75b19e
# Parent 05899a336fcd9bae4356ae1eb5cb03c55aa92c1d
Skip the null pointer check before calling realloc.
"If ptr is a null pointer, realloc() shall be equivalent to malloc() for
the specified size."
http://pubs.opengroup.org/onlinepubs/9699919799/functions/realloc.html
Also, sizeof(char*) is more correct here than sizeof(char**), although
in practice it doesn't make a difference.
diff --git a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
--- a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
+++ b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
@@ -519,21 +519,17 @@ splitPathList(const char* str, int* path
int count = 0;
char** segments = NULL;
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**) );
- }
+ segments = (char**)realloc( segments, (count+1)*sizeof(char*) );
jplis_assert(segments != (char**)NULL);
segments[count++] = c;
c = strchr(c, ' ');
if (c == NULL) {
break;
}
*c = '\0';
c++;
More information about the jdk9-dev
mailing list