com php-src: fix borked mainstream patch: ext/fileinfo/libmagic/funcs.c
| From: | Anatol Belski | Date: | Wed, 30 Mar 2016 23:33:38 +0000 |
| Subject: | com php-src: fix borked mainstream patch: ext/fileinfo/libmagic/funcs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91564@lists.php.net to get a copy of this message | ||
Commit: 4b0b1cec00d5c261a5eb4032862da917f93e87b7
Author: Anatol Belski <ab@php.net> Thu, 31 Mar 2016 01:33:38 +0200
Parents: f0120ff8787ce5efc509a8365fd815d1144c366e
Branches: PHP-5.5 PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b0b1cec00d5c261a5eb4032862da917f93e87b7
Log:
fix borked mainstream patch
Changed paths:
M ext/fileinfo/libmagic/funcs.c
Diff:
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c
index def2f7b..b976ac9 100644
--- a/ext/fileinfo/libmagic/funcs.c
+++ b/ext/fileinfo/libmagic/funcs.c
@@ -414,7 +414,7 @@ file_check_mem(struct magic_set *ms, unsigned int level)
size_t len;
if (level >= ms->c.len) {
- len = (ms->c.len += 20 + level) * sizeof(*ms->c.li);
+ len = (ms->c.len = 20 + level) * sizeof(*ms->c..li);
ms->c.li = CAST(struct level_info *, (ms->c.li == NULL) ?
emalloc(len) :
erealloc(ms->c.li, len));