From f54cf1ec572a6948b275b180c8aa9933e8bf1f59 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 6 Mar 2015 09:28:34 +0100 Subject: [PATCH] more after patch fixes --- ext/fileinfo/libmagic/softmagic.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 3ba4e5eddc..3ff6f57faf 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -1089,13 +1089,8 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir, return 0; } - if (m->str_flags & REGEX_LINE_COUNT) { - linecnt = m->str_range; - bytecnt = linecnt * 80; - } else { - linecnt = 0; - bytecnt = m->str_range; - } + linecnt = m->str_range; + bytecnt = linecnt * 80; /* XXX bytecnt_max is to be kept for PHP, see cve-2014-3538. PCRE might stuck if the input buffer is too big. To ensure -- 2.50.1