From 4363588f2f3d8b73e72c9f4aea005eaa438c970e Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 3 Jun 2018 12:14:42 +0200 Subject: [PATCH] Align the ported place with libmagic --- ext/fileinfo/libmagic/softmagic.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 816482bc2d..b25f48f1e4 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -732,15 +732,12 @@ mprint(struct magic_set *ms, struct magic *m, const struct buffer *b) 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, desc, "%s"), file_printable(sbuf, sizeof(sbuf), cp)); efree(cp); @@ -755,15 +752,6 @@ mprint(struct magic_set *ms, struct magic *m, const struct buffer *b) break; } - case FILE_SEARCH: - if (file_printf(ms, F(ms, desc, "%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) -- 2.50.0