mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 04:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a stat on a null when the internal database is used.

Browse Source
This commit is contained in:
Scott MacVicar 2008-10-22 16:34:17 +00:00
parent be09b491da
commit 6978fff657
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/fileinfo/libmagic/apprentice.c
View File

@ -251,9 +251,12 @@ apprentice_1(struct magic_set *ms, const char *fn, int action,
}
if ((rv = apprentice_map(ms, &magic, &nmagic, fn)) == -1) {
if (ms->flags & MAGIC_CHECK)
file_magwarn(ms, "using regular magic file `%s'", fn);
rv = apprentice_load(ms, &magic, &nmagic, fn, action);
if (fn) {
if (ms->flags & MAGIC_CHECK)
file_magwarn(ms, "using regular magic file `%s'", fn);
rv = apprentice_load(ms, &magic, &nmagic, fn, action);
}
if (rv != 0)
return -1;
}