php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

catch up with libmagic.orig

Browse Source
This commit is contained in:
Anatol Belski
2015-03-29 17:57:22 +02:00
parent a935c02210
commit 5e773b4ce5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/fileinfo/libmagic/softmagic.c
+4 -3
View File
@@ -1637,7 +1637,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
break;
case FILE_REGEX:
if (OFFSET_OOB(nbytes, offset, 0))
if (nbytes < offset)
return 0;
break;
@@ -1646,7 +1646,8 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
offset += CAST(uint32_t, o);
if (offset == 0)
return 0;
if (OFFSET_OOB(nbytes, offset, 0))
if (nbytes < offset)
return 0;
if ((pb = file_push_buffer(ms)) == NULL)
@@ -1677,7 +1678,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
return rv;
case FILE_USE:
if (OFFSET_OOB(nbytes, offset, 0))
if (nbytes < offset)
return 0;
rbuf = m->value.s;
if (*rbuf == '^') {