From 5799ebdb0cafb2de1dbb18cfe780976c98dbaeac Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Tue, 24 Jul 2012 16:28:49 -0700 Subject: [PATCH 1/4] Fix bug #62654 --- sapi/fpm/fpm/fpm_sockets.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index d24dcccc9af5f..f56b9cfbd1493 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq) #endif -int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* {{{ */ +int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* {{{ */ { int fd; - if (!sun || sun->sun_family != AF_UNIX) { + if (!sock || sock->sun_family != AF_UNIX) { return -1; } @@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* {{{ return -1; } - if (connect(fd, (struct sockaddr *)sun, socklen) == -1) { + if (connect(fd, (struct sockaddr *)sock, socklen) == -1) { return -1; } From 7d890eef82ab054c04458e676d63d2492cf20362 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 24 Jul 2012 17:44:45 -0700 Subject: [PATCH 2/4] update 5.4.5 date --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 407b052813807..7336376c3c091 100644 --- a/NEWS +++ b/NEWS @@ -53,7 +53,7 @@ PHP NEWS . Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression). (Laruence) -?? ??? 2012, PHP 5.4.5 +19 Jul 2012, PHP 5.4.5 - Core: . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed From ccffec74d070e862cae8d8752d716eabb53002b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Thu, 26 Jul 2012 23:37:02 +0200 Subject: [PATCH 3/4] Fix bug #62651: source level BC break Break for C++ extensions that don't wrap the includes of PHP libraries in extern "C" {. --- Zend/zend_string.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zend/zend_string.h b/Zend/zend_string.h index a61d2fb30d2a8..0a4738466d7a8 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -23,12 +23,14 @@ #include "zend.h" +BEGIN_EXTERN_C() ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC); ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D); ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D); void zend_interned_strings_init(TSRMLS_D); void zend_interned_strings_dtor(TSRMLS_D); +END_EXTERN_C() #ifndef ZTS From ef7286a42f0d85cc359f1d64678f859d6c3f832e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 28 Jul 2012 00:50:45 +0800 Subject: [PATCH 4/4] Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK with run-test.php) It's not a big deal, just because lexer will read the char after cursor before leaving --- NEWS | 4 ++++ Zend/zend_language_scanner.c | 4 ++-- Zend/zend_language_scanner.l | 2 +- Zend/zend_language_scanner_defs.h | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 8f5512367a1d9..5aa35d7e20b92 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2012, PHP 5.3.16 +- Core: + . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK + with run-test.php). (Laruence) + - CURL: . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false). (r.hampartsumyan@gmail.com, Laruence) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1d0ada7a64d5f..e3fc576e9102f 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */ +/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -287,7 +287,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) zend_multibyte_set_filter(NULL TSRMLS_CC); if (!SCNG(input_filter)) { - SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1); + SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2); memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1); SCNG(script_filtered_size) = SCNG(script_org_size); } else { diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 9b2e453dd659a..266162747e0d1 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -285,7 +285,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) zend_multibyte_set_filter(NULL TSRMLS_CC); if (!SCNG(input_filter)) { - SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1); + SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2); memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1); SCNG(script_filtered_size) = SCNG(script_org_size); } else { diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index adaedcf1aace8..d1955a88ef89f 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */ +/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE {