diff options
| author | Anatol Belski <ab@php.net> | 2015-01-22 10:17:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-22 10:17:45 +0100 |
| commit | f9d672f7d4c9d2fdae3c871fd91e49f717cfa4c2 (patch) | |
| tree | 7f9f83385eff0d7fa5d056e62e636fde918032c2 /ext/fileinfo/libmagic/apprentice.c | |
| parent | b2c39c1d2930d7c68cc090193ea8765201d61f0c (diff) | |
| parent | 60c2621b2a9a82f0a31988aa58a3be9192184bdf (diff) | |
| download | php-git-f9d672f7d4c9d2fdae3c871fd91e49f717cfa4c2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
simplify error handling for dirs as magic
Diffstat (limited to 'ext/fileinfo/libmagic/apprentice.c')
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 688bfab00c..0061753095 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -2621,7 +2621,7 @@ apprentice_map(struct magic_set *ms, const char *fn) return to give apprentice_load() a chance. */ if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) { if (st.sb.st_mode & S_IFDIR) { - goto error; + return NULL; } } #endif |