cvs: php-src(PHP_5_0) /ext/mysqli mysqli.c
| From: | Georg Richter | Date: | Wed, 04 Aug 2004 13:02:40 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28181@lists.php.net to get a copy of this message | ||
georg Wed Aug 4 09:02:40 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli.c
Log:
fixed bug #29522
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.1&r2=1.43.2.2&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.1 php-src/ext/mysqli/mysqli.c:1.43.2.2
--- php-src/ext/mysqli/mysqli.c:1.43.2.1 Mon Jul 26 03:22:01 2004
+++ php-src/ext/mysqli/mysqli.c Wed Aug 4 09:02:40 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.43.2.1 2004/07/26 07:22:01 georg Exp $
+ $Id: mysqli.c,v 1.43.2.2 2004/08/04 13:02:40 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -200,6 +200,13 @@
ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **)
&hnd);
}
if (ret == SUCCESS) {
+ /* check if connection is still valid */
+ if (!obj->ptr ||
+ !((MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->mysql)->thread_id)
{
+ retval = EG(uninitialized_zval_ptr);
+ return(retval);
+ }
+
ret = hnd->read_func(obj, &retval TSRMLS_CC);
if (ret == SUCCESS) {
/* ensure we're creating a temporary variable */