Skip to content

Commit 22f71a6

Browse files
committed
Sync one more upstream libmagic piece
1 parent fab72d7 commit 22f71a6

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

ext/fileinfo/libmagic/softmagic.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -657,15 +657,12 @@ mprint(struct magic_set *ms, struct magic *m)
657657
t = ms->offset + sizeof(double);
658658
break;
659659

660+
case FILE_SEARCH:
660661
case FILE_REGEX: {
661662
char *cp;
662663
int rval;
663664

664665
cp = estrndup((const char *)ms->search.s, ms->search.rm_len);
665-
if (cp == NULL) {
666-
file_oomem(ms, ms->search.rm_len);
667-
return -1;
668-
}
669666
rval = file_printf(ms, F(ms, m, "%s"),
670667
file_printable(sbuf, sizeof(sbuf), cp));
671668
efree(cp);
@@ -680,15 +677,6 @@ mprint(struct magic_set *ms, struct magic *m)
680677
break;
681678
}
682679

683-
case FILE_SEARCH:
684-
if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1)
685-
return -1;
686-
if ((m->str_flags & REGEX_OFFSET_START))
687-
t = ms->search.offset;
688-
else
689-
t = ms->search.offset + m->vallen;
690-
break;
691-
692680
case FILE_DEFAULT:
693681
case FILE_CLEAR:
694682
if (file_printf(ms, "%s", m->desc) == -1)

0 commit comments

Comments
 (0)