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

Merge change 23585 into eclair

Browse Source 
* changes:
  Print error message if the buffer size is too small.
This commit is contained in:
Android (Google) Code Review
2009-09-01 23:49:42 -07:00
parent 9c64d59027 60c821c8ee
commit 940da9836a
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)) { if ((p12store != NULL) && (p12store->certs != NULL)) {
while (((cert = sk_X509_pop(p12store->certs)) != NULL) && (len < size)) { while (((cert = sk_X509_pop(p12store->certs)) != NULL) && (len < size)) {
int s = convert_to_pem((void*)cert, 1, buf + len, size - len); 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; len += s;
X509_free(cert); X509_free(cert);
} }