commit 51a2e4d5d44a6f788da207dff301356e16b4e283
author Colin Cross <ccross@android.com> Tue May 21 21:13:50 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 21 21:13:51 2013 +0000
tree 8149db7af2a1d0ac21814114c6a52baad4250833
parent 9246f8d6def40a50933a980fac773a909f2138d7
parent 544a7f7a36cb9434505fe5cdc9e79d16937ac23f

Merge "libsysutils: fix null pointer and memory leak issue"

libsysutils/src/SocketClient.cpp

diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp
index 3d4984d..ae0e077 100644
--- a/libsysutils/src/SocketClient.cpp
+++ b/libsysutils/src/SocketClient.cpp
@@ -112,6 +112,12 @@
     char *result = (char *)malloc(len * 2 + 3);
     char *current = result;
     const char *end = arg + len;
+    char *oldresult;
+
+    if(result == NULL) {
+        SLOGW("malloc error (%s)", strerror(errno));
+        return NULL;
+    }
 
     *(current++) = '"';
     while (arg < end) {
@@ -125,8 +131,9 @@
     }
     *(current++) = '"';
     *(current++) = '\0';
+    oldresult = result; // save pointer in case realloc fails
     result = (char *)realloc(result, current-result);
-    return result;
+    return result ? result : oldresult;
 }