cvs: php-src /ext/mysqli mysqli.c
| From: | Antony Dovgal | Date: | Thu, 27 Jul 2006 10:53:03 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39579@lists.php.net to get a copy of this message | ||
tony2001 Thu Jul 27 10:53:03 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
fix leak in php_local_infile_init() handler
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.96&r2=1.97&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.96 php-src/ext/mysqli/mysqli.c:1.97
--- php-src/ext/mysqli/mysqli.c:1.96 Mon Jul 10 13:16:07 2006
+++ php-src/ext/mysqli/mysqli.c Thu Jul 27 10:53:03 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.96 2006/07/10 13:16:07 mike Exp $
+ $Id: mysqli.c,v 1.97 2006/07/27 10:53:03 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1142,11 +1142,15 @@
data= (mysqli_local_infile *)ptr;
- if (!(mysql = data->userdata)) {
+ if (!data || !(mysql = data->userdata)) {
+ if (data) {
+ free(data);
+ }
return;
}
php_stream_close(mysql->li_stream);
+ free(data);
return;
}
/* }}} */