]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Fri, 4 Nov 2016 05:54:12 +0000 (22:54 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 4 Nov 2016 05:54:12 +0000 (22:54 -0700)
* PHP-7.1:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes

1  2 
ext/standard/exec.c
ext/xmlrpc/libxmlrpc/base64.c
ext/xmlrpc/libxmlrpc/simplestring.c

Simple merge
Simple merge
index 98901845c1014803f60b09fb8eaae409b600c41e,98b5c81e4236f6f2d4895ac0b46370693edd731e..745f71ef024bb9014a488565a8eb4929a3d577d8
@@@ -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 *