pajoye          Mon Oct  9 00:06:40 2006 UTC

  Modified files:              
    /php-src/ext/openssl        openssl.c 
  Log:
  - MFB: fix possible segfault (see test 004) always exists and returns NULL 
    on error (thx Bjori for the head up)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.125&r2=1.126&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.125 php-src/ext/openssl/openssl.c:1.126
--- php-src/ext/openssl/openssl.c:1.125 Sun Oct  8 13:34:23 2006
+++ php-src/ext/openssl/openssl.c       Mon Oct  9 00:06:40 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.125 2006/10/08 13:34:23 bjori Exp $ */
+/* $Id: openssl.c,v 1.126 2006/10/09 00:06:40 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1801,8 +1801,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