com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic.patch
| From: | Anatol Belski | Date: | Mon, 10 Mar 2014 13:14:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic.patch | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76421@lists.php.net to get a copy of this message | ||
Commit: 6dd80946a2f9641e0271856711cd0f0c7b636964
Author: Anatol Belski <ab@php.net> Mon, 10 Mar 2014 14:14:01 +0100
Parents: c8033ac2076bf4b4d66f8d350b4afc232a863419 c17fd651650203a106b904e1cb6f82a3a7a37330
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6dd80946a2f9641e0271856711cd0f0c7b636964
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch
Changed paths:
MM ext/fileinfo/libmagic.patch
Diff:
diff --cc ext/fileinfo/libmagic.patch
index 3fc5b07,ae8b57f..b146372
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@@ -3003,11 -3242,88 +3003,12 @@@ diff -u libmagic.orig/softmagic.c libma
}
}
- /* Verify we have enough data to match magic type */
- switch (m->type) {
- case FILE_BYTE:
-- if (nbytes < (offset + 1)) /* should alway be true */
-+ if (OFFSET_OOB(nbytes, offset, 1))
- return 0;
- break;
-
- case FILE_SHORT:
- case FILE_BESHORT:
- case FILE_LESHORT:
-- if (nbytes < (offset + 2))
-+ if (OFFSET_OOB(nbytes, offset, 2))
- return 0;
- break;
-
-@@ -1679,38 +1658,40 @@
- case FILE_FLOAT:
- case FILE_BEFLOAT:
- case FILE_LEFLOAT:
-- if (nbytes < (offset + 4))
-+ if (OFFSET_OOB(nbytes, offset, 4))
- return 0;
- break;
-
- case FILE_DOUBLE:
- case FILE_BEDOUBLE:
- case FILE_LEDOUBLE:
-- if (nbytes < (offset + 8))
-+ if (OFFSET_OOB(nbytes, offset, 8))
- return 0;
- break;
-
- case FILE_STRING:
- case FILE_PSTRING:
- case FILE_SEARCH:
-- if (nbytes < (offset + m->vallen))
-+ if (OFFSET_OOB(nbytes, offset, m->vallen))
- return 0;
- break;
-
- case FILE_REGEX:
-- if (nbytes < offset)
-+ if (OFFSET_OOB(nbytes, offset, 0))
- return 0;
- break;
-
- case FILE_INDIRECT:
-- if (nbytes < offset)
-+ if (offset == 0)
-+ return 0;
-+ if (OFFSET_OOB(nbytes, offset, 0))
- return 0;
- sbuf = ms->o.buf;
- soffset = ms->offset;
- ms->o.buf = NULL;
- ms->offset = 0;
- rv = file_softmagic(ms, s + offset, nbytes - offset,
-- BINTEST, text);
-+ recursion_level, BINTEST, text);
- if ((ms->flags & MAGIC_DEBUG) != 0)
- fprintf(stderr, "indirect @offs=%u[%d]\n", offset, rv);
- rbuf = ms->o.buf;
-@@ -1718,16 +1699,26 @@
- ms->offset = soffset;
- if (rv == 1) {
- if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
-- file_printf(ms, m->desc, offset) == -1)
-+ file_printf(ms, m->desc, offset) == -1) {
-+ if (rbuf) {
-+ efree(rbuf);
-+ }
+@@ -1759,7 +1737,9 @@
return -1;
-- if (file_printf(ms, "%s", rbuf) == -1)
-+ }
-+ if (file_printf(ms, "%s", rbuf) == -1) {
-+ if (rbuf) {
-+ efree(rbuf);
-+ }
+ if (file_printf(ms, "%s", rbuf) == -1)
return -1;
- free(rbuf);
+ + }
+ }
+ if (rbuf) {
+ efree(rbuf);