com php-src: restore good patch parts: ext/fileinfo/libmagic/softmagic.c
| From: | Anatol Belski | Date: | Sun, 08 Mar 2015 18:47:48 +0000 |
| Subject: | com php-src: restore good patch parts: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85340@lists.php.net to get a copy of this message | ||
Commit: 1ebe527757b830819f19648bda14b6e344476443
Author: Anatol Belski <ab@php.net> Thu, 5 Mar 2015 22:43:41 +0100
Parents: 75a1392fb5753a6408c165c80f205c22f80386d9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ebe527757b830819f19648bda14b6e344476443
Log:
restore good patch parts
Changed paths:
M ext/fileinfo/libmagic/softmagic.c
Diff:
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 3e157ff..3ba4e5e 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -629,7 +629,7 @@ mprint(struct magic_set *ms, struct magic *m)
char *cp;
int rval;
- cp = zend_strndup((const char *)ms->search.s, ms->search.rm_len);
+ cp = estrndup((const char *)ms->search.s, ms->search.rm_len);
if (cp == NULL) {
file_oomem(ms, ms->search.rm_len);
return -1;
@@ -1642,7 +1642,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
break;
case FILE_REGEX:
- if (nbytes < offset)
+ if (OFFSET_OOB(nbytes, offset, 0))
return 0;
break;
@@ -1651,8 +1651,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
offset += CAST(uint32_t, o);
if (offset == 0)
return 0;
-
- if (nbytes < offset)
+ if (OFFSET_OOB(nbytes, offset, 0))
return 0;
if ((pb = file_push_buffer(ms)) == NULL)
@@ -1683,7 +1682,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
return rv;
case FILE_USE:
- if (nbytes < offset)
+ if (OFFSET_OOB(nbytes, offset, 0))
return 0;
rbuf = m->value.s;
if (*rbuf == '^') {
@@ -1907,6 +1906,7 @@ magiccheck(struct magic_set *ms, struct magic *m)
break;
default:
+ matched = 0;
file_magerror(ms, "cannot happen with float: invalid relation `%c'",
m->reln);
return -1;
@@ -1940,6 +1940,7 @@ magiccheck(struct magic_set *ms, struct magic *m)
break;
default:
+ matched = 0;
file_magerror(ms, "cannot happen with double: invalid relation `%c'",
m->reln);
return -1;
}
@@ -2188,6 +2189,7 @@ magiccheck(struct magic_set *ms, struct magic *m)
break;
default:
+ matched = 0;
file_magerror(ms, "cannot happen: invalid relation `%c'",
m->reln);
return -1;