From: Anatol Belski <ab@php.net>
Date: Fri, 6 Mar 2015 08:28:34 +0000 (+0100)
Subject: more after patch fixes
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~762^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f54cf1ec572a6948b275b180c8aa9933e8bf1f59;p=php

more after patch fixes
---

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