iliaa           Thu Feb 16 16:03:28 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/mysqli mysqli.c 
    /php-src    NEWS 
  Log:
  Fixed bug #36420 (segfault when access result->num_rows after calling 
  result->close())
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.8&r2=1.72.2.9&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.8 
php-src/ext/mysqli/mysqli.c:1.72.2.9
--- php-src/ext/mysqli/mysqli.c:1.72.2.8        Sat Jan 14 14:15:41 2006
+++ php-src/ext/mysqli/mysqli.c Thu Feb 16 16:03:27 2006
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.8 2006/01/14 14:15:41 georg Exp $ 
+  $Id: mysqli.c,v 1.72.2.9 2006/02/16 16:03:27 iliaa Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -198,6 +198,11 @@
 
        ret = FAILURE;
        obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
+       /* object was already destroyed */
+       if (!obj->ptr) {
+               retval = EG(uninitialized_zval_ptr);
+               return(retval);
+       }
 
        if (member->type != IS_STRING) {
                tmp_member = *member;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.417&r2=1.2027.2.418&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.417 php-src/NEWS:1.2027.2.418
--- php-src/NEWS:1.2027.2.417   Wed Feb 15 20:44:55 2006
+++ php-src/NEWS        Thu Feb 16 16:03:27 2006
@@ -22,6 +22,8 @@
 - Added ReflectionClass::newInstanceArgs($args). (Marcus)
 - Added imap_savebody() that allows message body to be written to a file.
   (Mike)
+- Fixed bug #36420 (segfault when access result->num_rows after calling 
+  result->close()). (Ilia)
 - Fixed bug #36403 (oci_execute() no longer supports OCI_DESCRIBE_ONLY). 
   (Tony)
 - Fixed bug #36400 (Custom 5xx error does not return correct HTTP response 

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

Reply via email to