summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-01 13:38:24 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-01 13:38:24 +0200
commit62794d0091481e4df6b332087a7d6708123970a5 (patch)
tree5f28812dc115c703d6eb4f35d5d3af1324ebcb3f
parent8e47909a5980226fca3425db3f0bac3b756cdf04 (diff)
php 5.4: update patch
-rw-r--r--bug71527.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/bug71527.patch b/bug71527.patch
index 45ba6b6..2c3cc3c 100644
--- a/bug71527.patch
+++ b/bug71527.patch
@@ -62,3 +62,25 @@ index 0000000..f5b1d86
+
+Warning: finfo_file() expects parameter 1 to be resource, boolean given in %sbug71527.php on line %d
+bool(false)
+From 4b0b1cec00d5c261a5eb4032862da917f93e87b7 Mon Sep 17 00:00:00 2001
+From: Anatol Belski <ab@php.net>
+Date: Thu, 31 Mar 2016 01:33:38 +0200
+Subject: [PATCH] fix borked mainstream patch
+
+---
+ ext/fileinfo/libmagic/funcs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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));