From: Stanislav Malyshev <stas@php.net>
Date: Fri, 4 Nov 2016 05:54:12 +0000 (-0700)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~986
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dab757f322c2ef76a1eee4c6cf8db2d94476be50;p=php

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
---

dab757f322c2ef76a1eee4c6cf8db2d94476be50
diff --cc ext/xmlrpc/libxmlrpc/simplestring.c
index 98901845c1,98b5c81e42..745f71ef02
--- 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 *