clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store errors in openssl_x509_export

Browse Source
This commit is contained in:
Jakub Zelenka 2016-01-20 20:31:09 +00:00
parent 63f8ef6ee1
commit 555126e90b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/openssl/openssl.c
View File

@ -1890,8 +1890,12 @@ PHP_FUNCTION(openssl_x509_export)
}
bio_out = BIO_new(BIO_s_mem());
if (!notext) {
X509_print(bio_out, cert);
if (!bio_out) {
php_openssl_store_errors();
goto cleanup;
}
if (!notext && !X509_print(bio_out, cert)) {
php_openssl_store_errors();
}
if (PEM_write_bio_X509(bio_out, cert)) {
BUF_MEM *bio_buf;
@ -1901,12 +1905,16 @@ PHP_FUNCTION(openssl_x509_export)
ZVAL_STRINGL(zout, bio_buf->data, bio_buf->length);
RETVAL_TRUE;
} else {
php_openssl_store_errors();
}
if (certresource == NULL && cert) {
BIO_free(bio_out);
cleanup:
if (certresource == NULL && cert != NULL) {
X509_free(cert);
}
BIO_free(bio_out);
}
/* }}} */