felipe Tue, 22 Nov 2011 15:04:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319683
Log:
- Fixed possible memory leak in finfo_open()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
U php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-11-22 14:22:28 UTC (rev 319682)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-11-22 15:04:19 UTC (rev 319683)
@@ -27,6 +27,9 @@
- EXIF:
. Fixed bug #60150 (Integer overflow during the parsing of invalid exif
header). (Stas, flolechaud at gmail dot com)
+
+- Fileinfo:
+ . Fixed possible memory leak in finfo_open(). (Felipe)
- Intl:
. Fixed bug #60192 (SegFault when Collator not constructed
Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
2011-11-22 14:22:28 UTC (rev 319682)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
2011-11-22 15:04:19 UTC (rev 319683)
@@ -2137,7 +2137,7 @@
php_stream_close(stream);
}
- if (mm && ret == 1) {
+ if (mm) {
efree(mm);
} else {
*magicp = NULL;
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-11-22 14:22:28 UTC (rev 319682)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-11-22 15:04:19 UTC (rev 319683)
@@ -31,6 +31,9 @@
- BCmath:
. Fixed bug #60377 (bcscale related crashes on 64bits platforms) (shm)
+- Fileinfo:
+ . Fixed possible memory leak in finfo_open(). (Felipe)
+
- Intl:
. Fixed memory leak in several Intl locale functions. (Felipe)
Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
2011-11-22 14:22:28 UTC (rev 319682)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
2011-11-22 15:04:19 UTC (rev 319683)
@@ -2137,7 +2137,7 @@
php_stream_close(stream);
}
- if (mm && ret == 1) {
+ if (mm) {
efree(mm);
} else {
*magicp = NULL;
Modified: php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c 2011-11-22
14:22:28 UTC (rev 319682)
+++ php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c 2011-11-22
15:04:19 UTC (rev 319683)
@@ -2137,7 +2137,7 @@
php_stream_close(stream);
}
- if (mm && ret == 1) {
+ if (mm) {
efree(mm);
} else {
*magicp = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
