diff options
| author | Anatol Belski <ab@php.net> | 2016-03-31 01:36:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-31 01:36:47 +0200 |
| commit | a00c2b1bf54fb09015321e3677d89da552938306 (patch) | |
| tree | c0c20723f56a11d22f47389a735cc26c2e78b2d5 /ext/fileinfo/libmagic/funcs.c | |
| parent | ed707a521738fa7269b1992a6738bfef44662f46 (diff) | |
| parent | 4b0b1cec00d5c261a5eb4032862da917f93e87b7 (diff) | |
| download | php-git-a00c2b1bf54fb09015321e3677d89da552938306.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix borked mainstream patch
5.5.35 now
Diffstat (limited to 'ext/fileinfo/libmagic/funcs.c')
| -rw-r--r-- | ext/fileinfo/libmagic/funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index e3249c19e2..16cf30afce 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)); |