cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c

tony2001 Thu Jul 27 10:53:15 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mysqli mysqli.c Log: MFH: fix leak in php_local_infile_init() handler http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.10&r2=1.72.2.16.2.11&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.10 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.11 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.10 Wed Jul 12 09:33:37 2006 +++ php-src/ext/mysqli/mysqli.c Thu Jul 27 10:53:15 2006 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.72.2.16.2.10 2006/07/12 09:33:37 tony2001 Exp $ + $Id: mysqli.c,v 1.72.2.16.2.11 2006/07/27 10:53:15 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -1149,11 +1149,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; } /* }}} */