From 7b27de9f0bcadc8f6a1326bd04483515e9dcc794 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Wed, 17 Nov 2010 16:46:19 +0000 Subject: [PATCH] - NULL deref fix, patch by Gustavo --- Zend/zend_language_scanner.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 86949a22f1..481a338b45 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -284,6 +284,10 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) SCNG(script_filtered_size) = SCNG(script_org_size); } else { SCNG(input_filter)(&SCNG(script_filtered), &SCNG(script_filtered_size), SCNG(script_org), SCNG(script_org_size) TSRMLS_CC); + if (SCNG(script_filtered) == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Could not convert the script from the detected " + "encoding \"%s\" to a compatible encoding", LANG_SCNG(script_encoding)->name); + } } SCNG(yy_start) = SCNG(script_filtered) - offset; yy_scan_buffer((char *)SCNG(script_filtered), SCNG(script_filtered_size) TSRMLS_CC); -- 2.40.0