archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #47038 (Memory leak in include)

Browse source
This commit is contained in:
Dmitry Stogov 2009-03-25 15:23:58 +00:00
parent 4a4d739e49
commit bcd9099b28
6 changed files with 400 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -2,6 +2,7 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, PHP 5.3.0 RC 2
- Fixed bug #47699 (autoload and late static binding). (Dmitry)
- Fixed bug #47038 (Memory leak in include). (Dmitry)
- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()).
(matteo at beccati dot com)
- Fixed bug #42362 - (HTTP status codes 204 and 304 should not be gzipped).

2
Zend/zend_globals.h
View file

@ -292,8 +292,6 @@ struct _zend_php_scanner_globals {
int yy_state;
zend_stack state_stack;
zend_llist used_state_stacks;
#ifdef ZEND_MULTIBYTE
/* original (unfiltered) script */
unsigned char *script_org;

790
Zend/zend_language_scanner.c
View file

File diff suppressed because it is too large Load diff

20
Zend/zend_language_scanner.l
View file

@ -143,9 +143,7 @@ void startup_scanner(TSRMLS_D)
CG(heredoc_len) = 0;
CG(doc_comment) = NULL;
CG(doc_comment_len) = 0;
zend_llist_init(&SCNG(used_state_stacks), sizeof(zend_stack), (llist_dtor_func_t) zend_stack_destroy, 0);
zend_stack_init(&SCNG(state_stack));
zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
}
void shutdown_scanner(TSRMLS_D)
@ -154,15 +152,10 @@ void shutdown_scanner(TSRMLS_D)
efree(CG(heredoc));
CG(heredoc_len)=0;
}
zend_llist_destroy(&SCNG(used_state_stacks));
zend_stack_destroy(&SCNG(state_stack));
RESET_DOC_COMMENT();
}
static int compare_stacks(zend_stack *stack1, zend_stack *stack2)
{
return (stack1 == stack2);
}
ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
{
lex_state->yy_leng = SCNG(yy_leng);
@ -174,7 +167,6 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
lex_state->state_stack = SCNG(state_stack);
zend_stack_init(&SCNG(state_stack));
zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
lex_state->in = SCNG(yy_in);
lex_state->yy_state = YYSTATE;
@ -202,7 +194,7 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
SCNG(yy_marker) = lex_state->yy_marker;
SCNG(yy_limit) = lex_state->yy_limit;
zend_llist_del_element(&SCNG(used_state_stacks), &SCNG(state_stack), (int (*)(void *, void *)) compare_stacks);
zend_stack_destroy(&SCNG(state_stack));
SCNG(state_stack) = lex_state->state_stack;
SCNG(yy_in) = lex_state->in;
@ -361,9 +353,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
retval = NULL;
}
}
if (compilation_successful) {
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
}
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return retval;
}
@ -526,8 +516,8 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
zend_release_labels(TSRMLS_C);
retval = op_array;
}
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
}
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
zval_dtor(&tmp);
CG(in_compilation) = original_in_compilation;
return retval;
@ -547,6 +537,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) {
zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC);
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
zend_highlight(syntax_highlighter_ini TSRMLS_CC);
@ -574,6 +565,7 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_
zval_copy_ctor(str);
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE) {
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
BEGIN(INITIAL);

2
Zend/zend_language_scanner_defs.h
View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Fri Mar 13 00:13:18 2009 */
/* Generated by re2c 0.13.5 on Wed Mar 25 18:23:22 2009 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {

5
ext/tokenizer/tokenizer.c
View file

@ -171,6 +171,7 @@ PHP_FUNCTION(token_get_all)
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(&source_z, "" TSRMLS_CC) == FAILURE) {
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
RETURN_EMPTY_STRING();
}
@ -178,10 +179,6 @@ PHP_FUNCTION(token_get_all)
tokenize(return_value TSRMLS_CC);
while (!zend_stack_is_empty(&LANG_SCNG(state_stack))) {
zend_stack_del_top(&LANG_SCNG(state_stack));
}
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
zval_dtor(&source_z);
}