diff options
| author | Anatol Belski <ab@php.net> | 2018-11-10 00:18:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-11-10 00:19:42 +0100 |
| commit | 22f71a66ece2aff0c9e74632cd4c571d2559393c (patch) | |
| tree | 40ce2d61f81760792005b2e9aec23366e690ecb0 /ext/fileinfo/libmagic | |
| parent | fab72d7571cd82ac722044490eb91c1c2d580f73 (diff) | |
| download | php-git-22f71a66ece2aff0c9e74632cd4c571d2559393c.tar.gz | |
Sync one more upstream libmagic piece
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 4b10e84664..5894a1b763 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -657,15 +657,12 @@ mprint(struct magic_set *ms, struct magic *m) t = ms->offset + sizeof(double); break; + case FILE_SEARCH: case FILE_REGEX: { char *cp; int rval; cp = estrndup((const char *)ms->search.s, ms->search.rm_len); - if (cp == NULL) { - file_oomem(ms, ms->search.rm_len); - return -1; - } rval = file_printf(ms, F(ms, m, "%s"), file_printable(sbuf, sizeof(sbuf), cp)); efree(cp); @@ -680,15 +677,6 @@ 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) |