From: Pierre Joye <pajoye@php.net>
Date: Wed, 17 Nov 2010 16:46:19 +0000 (+0000)
Subject: - NULL deref fix, patch by Gustavo
X-Git-Tag: php-5.3.4RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b27de9f0bcadc8f6a1326bd04483515e9dcc794;p=php

- NULL deref fix, patch by Gustavo
---

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);