Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 585fb14c: am 940da983: Merge change 23585 into eclair

Browse Source 
Merge commit '585fb14c56bd6cdce1f84246bad40e144dd1db61'

* commit '585fb14c56bd6cdce1f84246bad40e144dd1db61':
  Print error message if the buffer size is too small.
This commit is contained in:
Chung-yih Wang
2009-09-02 13:32:45 -07:00
committed by Android Git Automerger
parent b21e2e1197 585fb14c56
commit a2e87dcfb4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystore/jni/cert.c
View File

@@ -241,7 +241,10 @@ int pop_pkcs12_certs_stack(PKCS12_KEYSTORE *p12store, char *buf, int size)
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);
}