-
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix #73968: Premature failing of XBM reading
-
Fix #73968: Premature failing of XBM reading
We must take into account the line padding, when we're reading XBM files. We deliberately ignore the potential integer overflow here, because that would be caught by gdImageCreate() or even earlier if `bytes==0`, what happens in libgd00094.phpt which we adapt accordingly.
-
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix #70103: Fix bug 70103 when ZTS is enabled
-
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix #70417: PharData::compress() doesn't close temp file
-
Merge branch 'pull-request/2278' into PHP-7.0
* pull-request/2278: Fix #70417: PharData::compress() doesn't close temp file
-
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Revert "Fix #73530: Unsetting result set may reset other result set"
-
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Revert "Fix #73530: Unsetting result set may reset other result set" # Conflicts: # ext/sqlite3/sqlite3.c
-
Revert "Fix #73530: Unsetting result set may reset other result set"
This reverts commit eb57029. That commit caused a regression, so it's probably best to revert it, and to tackle the issue for the next minor release.
-
Fix #73549: Use after free when stream is passed to imagepng
If a stream is passed to imagepng() or other image output functions, opposed to a filename, we must not close this stream.
-
-
Fix #73612: preg_*() may leak memory
We have to make sure that collectible zvals end up in the GC root buffer, to avoid memory leaks.
-
-
-
Fix #73530: Unsetting result set may reset other result set
Calling sqlite3_reset() when a result set object is freed can cause undesired and maybe even hard to track interference with other result sets. Furthermore, there is no need to call sqlite3_reset(), because that is implicitly called on SQLite3Stmt::execute(), and users are encouraged to explicitly call either SQLite3Result::finalize() or SQLite3Stmt::reset() anyway.
-
-
-
Fix #72494: imagecropauto out-of-bounds access
This issue has actually already been fixed with commit 46f2c690. We're adding a regression test and a NEWS entry, and also port the fix in gdImageCropThreshold() from libgd: * <libgd/libgd@b347e03> * <libgd/libgd@46f2c69>
-
-
Merge branch 'PHP-5.6' into PHP-7.0
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
-
Fix #73333: 2147483647 is fetched as string
We return all integers that can be represented as such by PHP as integers, and only those that exceed the possible range as strings. On builds which represent integers with 64 bits, the range check is unnecessary and might cause code checkers to complain, so we skip this special casing via the preprocessor according to <http://git.php.net/?p=php-src.git;a=commit;h=99d087e5>.
-
-
Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf
We make sure to never pass a negative `rlen` as size to memcpy(). Cf. <libgd/libgd@5311087>.