cvs: php-src /ext/mysqli mysqli.c
| From: | Antony Dovgal | Date: | Tue, 13 Sep 2005 09:20:01 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33929@lists.php.net to get a copy of this message | ||
tony2001 Tue Sep 13 05:20:01 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
fix #34450 (Segfault when calling mysqli_close() in destructor)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.73&r2=1.74&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.73 php-src/ext/mysqli/mysqli.c:1.74
--- php-src/ext/mysqli/mysqli.c:1.73 Fri Aug 12 10:08:23 2005
+++ php-src/ext/mysqli/mysqli.c Tue Sep 13 05:19:58 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.73 2005/08/12 14:08:23 sebastian Exp $
+ $Id: mysqli.c,v 1.74 2005/09/13 09:19:58 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -133,9 +133,11 @@
static void mysqli_objects_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
- MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
+ MYSQLI_RESOURCE *my_res;
zend_objects_destroy_object(object, handle TSRMLS_CC);
+
+ my_res = (MYSQLI_RESOURCE *)intern->ptr;
/* link object */
if (instanceof_function(intern->zo.ce, mysqli_link_class_entry TSRMLS_CC)) {