From 155619184f5e427797c300d6fe0c01ddcfe5fadc Mon Sep 17 00:00:00 2001 From: Julien Pauli Date: Tue, 21 Jun 2016 13:10:37 +0200 Subject: 5.5.38 now --- NEWS | 6 +++++- configure.in | 2 +- main/php_version.h | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 11ba902041..b7d514b05a 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,11 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ** PHP 5.5 is in security-only mode , please do not commit to this branch ** -?? ?? 2016, PHP 5.5.37 +?? ?? 2016, PHP 5.5.38 + + + +23 Jun 2016, PHP 5.5.37 - Core: . Fixed bug #72268 (Integer Overflow in nl2br()). (Stas) diff --git a/configure.in b/configure.in index 96d04bef0d..d98ad00574 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=37 +PHP_RELEASE_VERSION=38 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 4000601799..e85d525365 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 37 +#define PHP_RELEASE_VERSION 38 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.37-dev" -#define PHP_VERSION_ID 50537 +#define PHP_VERSION "5.5.38-dev" +#define PHP_VERSION_ID 50538 -- cgit v1.2.1 From 25bd11cf271f801efa346195d540f3d8e3bcb0ef Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 27 Jun 2016 12:30:42 -0700 Subject: Fix the fix for #72403 on nl2br --- ext/standard/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index acb6a01087..d141b76012 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4267,7 +4267,7 @@ PHP_FUNCTION(nl2br) { /* in brief this inserts
or
before matched regexp \n\r?|\r\n? */ char *tmp, *str; - int new_length; + size_t new_length; char *end, *target; int repl_cnt = 0; int str_len; -- cgit v1.2.1