com php-src: Merge branch 'PHP-7.1': ext/standard/exec.c ext/xmlrpc/libxmlrpc/base64.c ext/xmlrpc/libxmlrpc/simplestring.c

Commit: dab757f322c2ef76a1eee4c6cf8db2d94476be50 Author: Stanislav Malyshev <stas@php.net> Thu, 3 Nov 2016 22:54:12 -0700 Parents: 5aad73a698f46eec19936436da9fb13760ab6b0b 25d04ad8e3e4b415645f982178a274f7a36eeef6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dab757f322c2ef76a1eee4c6cf8db2d94476be50 Log: Merge branch 'PHP-7.1' * PHP-7.1: Add length check for bzcompress too - fix for bug #73356 More string length checks & fixes More string length checks & fixes Bugs: https://bugs.php.net/73356 Changed paths: MM ext/standard/exec.c MM ext/xmlrpc/libxmlrpc/base64.c MM ext/xmlrpc/libxmlrpc/simplestring.c Diff: diff --cc ext/xmlrpc/libxmlrpc/simplestring.c index 9890184,98b5c81..745f71e --- a/ext/xmlrpc/libxmlrpc/simplestring.c +++ b/ext/xmlrpc/libxmlrpc/simplestring.c @@@ -81,9 -80,10 +81,10 @@@ static const char rcsid[] = "#(@) $Id$" #include <stdlib.h> #include <string.h> + #include <limits.h> #include "simplestring.h" -#define my_free(thing) if(thing) {free(thing); thing = 0;} +#define my_free(thing) if(thing) {efree(thing); thing = 0;} /*----------------------** * Begin String Functions *