com php-src: more after patch fixes: ext/fileinfo/libmagic/softmagic.c
| From: | Anatol Belski | Date: | Sun, 08 Mar 2015 18:47:50 +0000 |
| Subject: | com php-src: more after patch fixes: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85335@lists.php.net to get a copy of this message | ||
Commit: f54cf1ec572a6948b275b180c8aa9933e8bf1f59
Author: Anatol Belski <ab@php.net> Fri, 6 Mar 2015 09:28:34 +0100
Parents: 1ebe527757b830819f19648bda14b6e344476443
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f54cf1ec572a6948b275b180c8aa9933e8bf1f59
Log:
more after patch fixes
Changed paths:
M ext/fileinfo/libmagic/softmagic.c
Diff:
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 3ba4e5e..3ff6f57 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