more after patch fixes

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 3ba4e5eddc7eea42dd8bc053a8b44df141106552..3ff6f57faf08c34ec2509583694d29611b5bb2a0 100644 (file)
--- 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