com php-src: Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong memory access: ext/fileinfo/libmagic/softmagic.c

Commit: 753fa0c593aa9be8ca749b2dc8b8999f587f5784 Author: Dmitry Stogov <dmitry@zend.com> Tue, 14 Apr 2015 15:35:33 +0300 Parents: 5db1a56705d6f3f4f09daa8f922dcfbc36afbc0f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=753fa0c593aa9be8ca749b2dc8b8999f587f5784 Log: Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong memory access Changed paths: M ext/fileinfo/libmagic/softmagic.c Diff: diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index e08d167..3fd30ff 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -624,7 +624,6 @@ mprint(struct magic_set *ms, struct magic *m) t = ms->offset + sizeof(double); break; - case FILE_SEARCH: case FILE_REGEX: { char *cp; int rval; @@ -648,6 +647,15 @@ mprint(struct magic_set *ms, struct magic *m) break; } + case FILE_SEARCH: + if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1) + return -1; + if ((m->str_flags & REGEX_OFFSET_START)) + t = ms->search.offset; + else + t = ms->search.offset + m->vallen; + break; + case FILE_DEFAULT: case FILE_CLEAR: if (file_printf(ms, "%s", m->desc) == -1)