From cc9e74dfeca5265ad725acc926ef0b8d2a18ee70 Mon Sep 17 00:00:00 2001 From: Christos Zoulas <christos@zoulas.com> Date: Wed, 12 Feb 2014 23:20:53 +0000 Subject: [PATCH] count indirect recursion as recursion. --- src/ascmagic.c | 4 ++-- src/file.h | 4 ++-- src/funcs.c | 4 ++-- src/softmagic.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ascmagic.c b/src/ascmagic.c index 7455a2e..38e490d 100644 --- a/src/ascmagic.c +++ b/src/ascmagic.c @@ -147,7 +147,7 @@ == NULL) goto done; if ((rv = file_softmagic(ms, utf8_buf, - (size_t)(utf8_end - utf8_buf), TEXTTEST, text)) == 0) + (size_t)(utf8_end - utf8_buf), 0, TEXTTEST, text)) == 0) rv = -1; } diff --git a/src/file.h b/src/file.h index ba6f05d..65509ab 100644 --- a/src/file.h +++ b/src/file.h @@ -439,7 +439,7 @@ protected int file_encoding(struct magic_set *, const unsigned char *, size_t, unichar **, size_t *, const char **, const char **, const char **); protected int file_is_tar(struct magic_set *, const unsigned char *, size_t); protected int file_softmagic(struct magic_set *, const unsigned char *, size_t, - int, int); + size_t, int, int); protected int file_apprentice(struct magic_set *, const char *, int); protected int file_magicfind(struct magic_set *, const char *, struct mlist *); protected uint64_t file_signextend(struct magic_set *, struct magic *, diff --git a/src/funcs.c b/src/funcs.c index 7f45bb9..6dcbf34 100644 --- a/src/funcs.c +++ b/src/funcs.c @@ -230,7 +230,7 @@ /* try soft magic tests */ if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0) - if ((m = file_softmagic(ms, ubuf, nb, BINTEST, + if ((m = file_softmagic(ms, ubuf, nb, 0, BINTEST, looks_text)) != 0) { if ((ms->flags & MAGIC_DEBUG) != 0) (void)fprintf(stderr, "softmagic %d\n", m); diff --git a/src/softmagic.c b/src/softmagic.c index e0db1c7..286bd15 100644 --- a/src/softmagic.c +++ b/src/softmagic.c @@ -79,13 +79,13 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int, /*ARGSUSED1*/ /* nbytes passed for regularity, maybe need later */ protected int file_softmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes, - int mode, int text) + size_t level, int mode, int text) { struct mlist *ml; int rv, printed_something = 0, need_separator = 0; for (ml = ms->mlist[0]->next; ml != ms->mlist[0]; ml = ml->next) if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, 0, mode, - text, 0, 0, &printed_something, &need_separator, + text, 0, level, &printed_something, &need_separator, NULL)) != 0) return rv; @@ -1747,7 +1747,7 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int, ms->o.buf = NULL; ms->offset = 0; rv = file_softmagic(ms, s + offset, nbytes - offset, - BINTEST, text); + recursion_level, BINTEST, text); if ((ms->flags & MAGIC_DEBUG) != 0) fprintf(stderr, "indirect @offs=%u[%d]\n", offset, rv); rbuf = ms->o.buf; -- 1.8.5.1