mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
4cf90e06c9
This fixes bug #60097. Before two global variables CG(heredoc) and CG(heredoc_len) were used to track the current heredoc label. In order to support nested heredoc strings the *previous* heredoc label was assigned as the token value of T_START_HEREDOC and the language_parser.y assigned that to CG(heredoc). This created a dependency of the lexer on the parser. Thus the token_get_all() function, which accesses the lexer directly without also running the parser, was not able to tokenize nested heredoc strings (and leaked memory). Same applies for the source-code highlighting functions. The new approach is to maintain a heredoc_label_stack in the lexer, which contains all active heredoc labels. As it is no longer required, T_START_HEREDOC and T_END_HEREDOC now don't carry a token value anymore. In order to make the work with zend_ptr_stack in this context more convenient I added a new function zend_ptr_stack_top(), which retrieves the top element of the stack (similar to zend_stack_top()).
78 lines
2.6 KiB
C
78 lines
2.6 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend Engine |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 2.00 of the Zend license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.zend.com/license/2_00.txt. |
|
|
| If you did not receive a copy of the Zend license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@zend.com so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Andi Gutmans <andi@zend.com> |
|
|
| Zeev Suraski <zeev@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#ifndef ZEND_SCANNER_H
|
|
#define ZEND_SCANNER_H
|
|
|
|
typedef struct _zend_lex_state {
|
|
unsigned int yy_leng;
|
|
unsigned char *yy_start;
|
|
unsigned char *yy_text;
|
|
unsigned char *yy_cursor;
|
|
unsigned char *yy_marker;
|
|
unsigned char *yy_limit;
|
|
int yy_state;
|
|
zend_stack state_stack;
|
|
zend_ptr_stack heredoc_label_stack;
|
|
|
|
zend_file_handle *in;
|
|
uint lineno;
|
|
char *filename;
|
|
|
|
/* original (unfiltered) script */
|
|
unsigned char *script_org;
|
|
size_t script_org_size;
|
|
|
|
/* filtered script */
|
|
unsigned char *script_filtered;
|
|
size_t script_filtered_size;
|
|
|
|
/* input/ouput filters */
|
|
zend_encoding_filter input_filter;
|
|
zend_encoding_filter output_filter;
|
|
const zend_encoding *script_encoding;
|
|
} zend_lex_state;
|
|
|
|
typedef struct _zend_heredoc_label {
|
|
char *label;
|
|
int length;
|
|
} zend_heredoc_label;
|
|
|
|
BEGIN_EXTERN_C()
|
|
int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *fh2);
|
|
ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC);
|
|
ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC);
|
|
ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_DC);
|
|
ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter, const zend_encoding *old_encoding TSRMLS_DC);
|
|
ZEND_API int zend_multibyte_set_filter(const zend_encoding *onetime_encoding TSRMLS_DC);
|
|
|
|
END_EXTERN_C()
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|