diff options
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 2 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/cdf_time.c | 2 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/print.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index eb1562e46..6844bf5d3 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -2070,11 +2070,11 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, } mm = emalloc((size_t)st.sb.st_size); + ret = 1; if (php_stream_read(stream, mm, (size_t)st.sb.st_size) != (size_t)st.sb.st_size) { file_badread(ms); goto error1; } - ret = 1; php_stream_close(stream); stream = NULL; diff --git a/ext/fileinfo/libmagic/cdf_time.c b/ext/fileinfo/libmagic/cdf_time.c index 36372966a..750c5986a 100644 --- a/ext/fileinfo/libmagic/cdf_time.c +++ b/ext/fileinfo/libmagic/cdf_time.c @@ -117,7 +117,7 @@ cdf_timestamp_to_timespec(struct timeval *ts, cdf_timestamp_t t) tm.tm_hour = t % 24; t /= 24; - // XXX: Approx + /* XXX: Approx */ tm.tm_year = CDF_BASE_YEAR + (t / 365); rdays = cdf_getdays(tm.tm_year); diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c index fd10126b1..851045375 100644 --- a/ext/fileinfo/libmagic/print.c +++ b/ext/fileinfo/libmagic/print.c @@ -30,6 +30,7 @@ */ #include "php.h" +#include "main/snprintf.h" #include "file.h" |