pajoye          Mon Oct  9 00:04:10 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/openssl        openssl.c 
  Log:
  - fix possible segfault (see test 004) always exists and returns NULL on
    error
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.21&r2=1.98.2.5.2.22&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.21 
php-src/ext/openssl/openssl.c:1.98.2.5.2.22
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.21 Sat Sep 16 12:05:12 2006
+++ php-src/ext/openssl/openssl.c       Mon Oct  9 00:04:10 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.21 2006/09/16 12:05:12 nlopess Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.22 2006/10/09 00:04:10 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1890,8 +1890,8 @@
 #define TMP_CLEAN \
        if (Z_TYPE(tmp) == IS_STRING) {\
                zval_dtor(&tmp); \
-               return NULL; \
-       }
+       } \
+       return NULL;
 
        if (resourceval) {
                *resourceval = -1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to