diff options
| author | Remi Collet <remi@php.net> | 2014-02-18 13:54:33 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-02-18 13:54:33 +0100 |
| commit | 89f864c547014646e71862df3664e3ff33d7143d (patch) | |
| tree | 741e028e0b24f2a2fc5f86f8e5f8fc32202749f2 /ext/fileinfo/libmagic/funcs.c | |
| parent | c612440e0f50eea166bb8dfd375d5f848f8711f7 (diff) | |
| download | php-git-89f864c547014646e71862df3664e3ff33d7143d.tar.gz | |
Fixed Bug #66731 file: infinite recursion
Upstream commit (available in file-5.17)
https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
Diffstat (limited to 'ext/fileinfo/libmagic/funcs.c')
| -rw-r--r-- | ext/fileinfo/libmagic/funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index 9c0d2bdb7c..011ca42757 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -235,7 +235,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const /* 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); |