cvs: php-src(PHP_5_0) /ext/openssl openssl.c

From: Date: Tue, 26 Oct 2004 09:28:33 +0000
Subject: cvs: php-src(PHP_5_0) /ext/openssl openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-29028@lists.php.net to get a copy of this message
wez Tue Oct 26 05:28:33 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/openssl openssl.c Log: Fix for Bug #29418 (double free when openssl_csr_new fails). Also hook up MSHUTDOWN function which appears to have never been enabled. Patch by Kamesh Jayachandran http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.89.2.2&r2=1.89.2.3&ty=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.89.2.2 php-src/ext/openssl/openssl.c:1.89.2.3 --- php-src/ext/openssl/openssl.c:1.89.2.2 Mon Sep 13 14:31:51 2004 +++ php-src/ext/openssl/openssl.c Tue Oct 26 05:28:33 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.89.2.2 2004/09/13 18:31:51 magnus Exp $ */ +/* $Id: openssl.c,v 1.89.2.3 2004/10/26 09:28:33 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -135,7 +135,7 @@ "openssl", openssl_functions, PHP_MINIT(openssl), - NULL, + PHP_MSHUTDOWN(openssl), NULL, NULL, PHP_MINFO(openssl), @@ -1675,6 +1675,12 @@ } } } + else { + if (!we_made_the_key) { + /* if we have not made the key we are not supposed to zap it by calling dispose! */ + req.priv_key = NULL; + } + } } } }

« previous php.cvs (#29028) next »