commit a806bbd518ff3e67e4d4efb937ff8f23bae18585
author Kenny Root <kroot@google.com> Tue Feb 05 01:18:46 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 05 01:18:46 2013 +0000
tree 451796cabcc07644956ab85ebc81359c009754e5
parent 36c6fd66661cc42ee8f0fe6e97b73e56282b73b6
parent b03c9fb5f9c058a8ae0485c986a8ab934ab73eaa

Merge "Fix for error condition in IKeystoreService"

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 9b4590e..240ec1f 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -636,10 +636,14 @@
             size_t outSize = 0;
             int32_t ret = sign(name, (const uint8_t*) in, (size_t) inSize, (uint8_t**) &out, &outSize);
             reply->writeNoException();
-            reply->writeInt32(outSize);
-            void* buf = reply->writeInplace(outSize);
-            memcpy(buf, out, outSize);
-            free(out);
+            if (outSize > 0 && out != NULL) {
+                reply->writeInt32(outSize);
+                void* buf = reply->writeInplace(outSize);
+                memcpy(buf, out, outSize);
+                free(out);
+            } else {
+                reply->writeInt32(0);
+            }
             reply->writeInt32(ret);
             return NO_ERROR;
         } break;
@@ -675,13 +679,17 @@
             size_t outSize = 0;
             int32_t ret = get_pubkey(name, (unsigned char**) &out, &outSize);
             reply->writeNoException();
-            reply->writeInt32(outSize);
-            void* buf = reply->writeInplace(outSize);
-            memcpy(buf, out, outSize);
-            free(out);
+            if (outSize > 0 && out != NULL) {
+                reply->writeInt32(outSize);
+                void* buf = reply->writeInplace(outSize);
+                memcpy(buf, out, outSize);
+                free(out);
+            } else {
+                reply->writeInt32(0);
+            }
             reply->writeInt32(ret);
             return NO_ERROR;
-        }
+        } break;
         case DEL_KEY: {
             CHECK_INTERFACE(IKeystoreService, data, reply);
             String16 name = data.readString16();