[Pkg-php-commits] [php/debian-sid] Fix NULL dereference in Zend language scanner

[Ondřej Surý]

---
 ...x-for-NULL-deref-in-zend_language_scanner.patch |   13 +++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/fix-for-NULL-deref-in-zend_language_scanner.patch

diff --git a/debian/patches/fix-for-NULL-deref-in-zend_language_scanner.patch b/debian/patches/fix-for-NULL-deref-in-zend_language_scanner.patch
new file mode 100644
index 0000000..e79e4c6
--- /dev/null
+++ b/debian/patches/fix-for-NULL-deref-in-zend_language_scanner.patch
@@ -0,0 +1,13 @@
+--- a/Zend/zend_language_scanner.l
++++ b/Zend/zend_language_scanner.l
+@@ -284,6 +284,10 @@ ZEND_API int open_file_for_scanning(zend
+ 			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);
diff --git a/debian/patches/series b/debian/patches/series
index 50f19b4..3f98b4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -79,3 +79,4 @@ fix-infinite-loop-with-x87-cpu.patch
 do-not-overwrite-GLOBALS-and-this.patch
 fix-crash-if-aa-steps-are-invalid.patch
 fix-crash-with-entity-declarations-in-simplexml.patch
+fix-for-NULL-deref-in-zend_language_scanner.patch
-- 
1.7.1