Skip to content

Commit ef7286a

Browse files
committed
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
1 parent 5799ebd commit ef7286a

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2012, PHP 5.3.16
44

5+
- Core:
6+
. Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
7+
with run-test.php). (Laruence)
8+
59
- CURL:
610
. Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
711
([email protected], Laruence)

Zend/zend_language_scanner.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */
1+
/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
22
#line 1 "Zend/zend_language_scanner.l"
33
/*
44
+----------------------------------------------------------------------+
@@ -287,7 +287,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
287287
zend_multibyte_set_filter(NULL TSRMLS_CC);
288288

289289
if (!SCNG(input_filter)) {
290-
SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1);
290+
SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2);
291291
memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1);
292292
SCNG(script_filtered_size) = SCNG(script_org_size);
293293
} else {

Zend/zend_language_scanner.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
285285
zend_multibyte_set_filter(NULL TSRMLS_CC);
286286

287287
if (!SCNG(input_filter)) {
288-
SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1);
288+
SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2);
289289
memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1);
290290
SCNG(script_filtered_size) = SCNG(script_org_size);
291291
} else {

Zend/zend_language_scanner_defs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */
1+
/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
22
#line 3 "Zend/zend_language_scanner_defs.h"
33

44
enum YYCONDTYPE {

0 commit comments

Comments
 (0)