com php-src: fixed leak introduced after CVE/upgrade: ext/fileinfo/libmagic/softmagic.c
| From: | Anatol Belski | Date: | Thu, 20 Feb 2014 17:53:53 +0000 |
| Subject: | com php-src: fixed leak introduced after CVE/upgrade: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76136@lists.php.net to get a copy of this message | ||
Commit: 10eb0070700382f966bf260e44135e1f724a15d2
Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 18:53:53 +0100
Parents: afa03a470ef90a53f2b59a8175f77afdb6b5a651
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Log:
fixed leak introduced after CVE/upgrade
Changed paths:
M ext/fileinfo/libmagic/softmagic.c
Diff:
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 7c5f628..33970e5 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -1701,6 +1701,8 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
return -1;
if (file_printf(ms, "%s", rbuf) == -1)
return -1;
+ }
+ if (rbuf) {
efree(rbuf);
}
return rv;