]> granicus.if.org Git - php/commitdiff
- Fixed memory leak in openssl_pkcs12_export_to_file()
authorFelipe Pena <felipe@php.net>
Tue, 27 Oct 2009 21:37:03 +0000 (21:37 +0000)
committerFelipe Pena <felipe@php.net>
Tue, 27 Oct 2009 21:37:03 +0000 (21:37 +0000)
ext/openssl/openssl.c

index 402a5f5e8dc69a12a0cf030058f87d54e10e421c..25462608e0bdc5f3958e5a20c0c8b127a79c0a01 100644 (file)
@@ -1738,18 +1738,18 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file)
        int filename_len;
        char * pass;
        int pass_len;
-       zval *zcert = NULL, *zpkey = NULL, *args = NULL;
+       zval **zcert = NULL, *zpkey = NULL, *args = NULL;
        EVP_PKEY *priv_key = NULL;
        long certresource, keyresource;
        zval ** item;
        STACK_OF(X509) *ca = NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zszs|a", &zcert, &filename, &filename_len, &zpkey, &pass, &pass_len, &args) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zszs|a", &zcert, &filename, &filename_len, &zpkey, &pass, &pass_len, &args) == FAILURE)
                return;
 
        RETVAL_FALSE;
        
-       cert = php_openssl_x509_from_zval(&zcert, 0, &certresource TSRMLS_CC);
+       cert = php_openssl_x509_from_zval(zcert, 0, &certresource TSRMLS_CC);
        if (cert == NULL) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot get cert from parameter 1");
                return;