mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #71459 - Integer overflow in iptcembed()

Browse Source
This commit is contained in:
Stanislav Malyshev 2016-01-26 17:26:52 -08:00
parent 6297a117d7
commit 54c210d2ea
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/standard/iptc.c
View File

@ -195,6 +195,11 @@ PHP_FUNCTION(iptcembed)
RETURN_FALSE;
}
if ((size_t)iptcdata_len >= SIZE_MAX - sizeof(psheader) - 1025) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "IPTC data too large");
RETURN_FALSE;
}
if ((fp = VCWD_FOPEN(jpeg_file, "rb")) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open %s", jpeg_file);
RETURN_FALSE;
@ -203,7 +208,7 @@ PHP_FUNCTION(iptcembed)
if (spool < 2) {
fstat(fileno(fp), &sb);
poi = spoolbuf = safe_emalloc(1, iptcdata_len + sizeof(psheader) + sb.st_size + 1024, 1);
poi = spoolbuf = safe_emalloc(1, (size_t)iptcdata_len + sizeof(psheader) + 1024 + 1, sb.st_size);
memset(poi, 0, iptcdata_len + sizeof(psheader) + sb.st_size + 1024 + 1);
}