diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-16 10:20:57 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-16 10:20:57 +0100 |
commit | 8bd5310a1e13e169d2d39f0a6701694ef6a5daf0 (patch) | |
tree | 8023ac0b17db447ca190aaf097de7747e4addfe7 | |
parent | cfe2b36a6db6ed2b1af7a574ed36abadfa18285f (diff) | |
parent | f6bd3dfdbcc0d8f4f7733560034e735865083c1a (diff) | |
download | php-git-8bd5310a1e13e169d2d39f0a6701694ef6a5daf0.tar.gz |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80523
-rw-r--r-- | Zend/zend_language_scanner.l | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 0c2b10ae82..c381d50a28 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -177,7 +177,7 @@ static void yy_pop_state(void) zend_stack_del_top(&SCNG(state_stack)); } -static void yy_scan_buffer(char *str, unsigned int len) +static void yy_scan_buffer(char *str, size_t len) { YYCURSOR = (YYCTYPE*)str; YYLIMIT = YYCURSOR + len; @@ -571,7 +571,7 @@ ZEND_API zend_result open_file_for_scanning(zend_file_handle *file_handle) } } SCNG(yy_start) = (unsigned char *)buf; - yy_scan_buffer(buf, (unsigned int)size); + yy_scan_buffer(buf, size); } else { zend_error_noreturn(E_COMPILE_ERROR, "zend_stream_mmap() failed"); } @@ -772,7 +772,7 @@ ZEND_API void zend_prepare_string_for_scanning(zval *str, const char *filename) } } - yy_scan_buffer(buf, (unsigned int)size); + yy_scan_buffer(buf, size); new_compiled_filename = zend_string_init(filename, strlen(filename), 0); zend_set_compiled_filename(new_compiled_filename); |