commit 940da9836aa6ce72cd025aedd1cf78c3dd277240
author Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 23:49:42 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 23:49:42 2009 -0700
tree ec68fcc6e40fce190dec5624269c77bd01f1f13b
parent 9c64d59027a09699ec5ef1f0fedd88910ee7ae27
parent 60c821c8eeca28d34fb02cf5e35dadf168e1312e

Merge change 23585 into eclair

* changes:
  Print error message if the buffer size is too small.

keystore/jni/cert.c

diff --git a/keystore/jni/cert.c b/keystore/jni/cert.c
index d5d57f7..91114d6 100644
--- a/keystore/jni/cert.c
+++ b/keystore/jni/cert.c
@@ -241,7 +241,10 @@
     if ((p12store != NULL) && (p12store->certs != NULL)) {
         while (((cert = sk_X509_pop(p12store->certs)) != NULL) && (len < size)) {
             int s = convert_to_pem((void*)cert, 1, buf + len, size - len);
-            if (s == 0) return -1;
+            if (s == 0) {
+                LOGE("buffer size is too small. len=%d size=%d\n", len, size);
+                return -1;
+            }
             len += s;
             X509_free(cert);
         }