[Pkg-php-commits] [php/debian-sid] Cherry-pick fix for bug #53070 (Calling enchant_broker_get_dict_path before set_path crashes php)

[Ondřej Surý]

---
 debian/patches/bug53070.patch |   20 ++++++++++++++++++++
 debian/patches/series         |    1 +
 2 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/bug53070.patch

diff --git a/debian/patches/bug53070.patch b/debian/patches/bug53070.patch
new file mode 100644
index 0000000..056dfd5
--- /dev/null
+++ b/debian/patches/bug53070.patch
@@ -0,0 +1,20 @@
+--- a/ext/enchant/enchant.c	2010/10/16 17:30:27	304446
++++ b/ext/enchant/enchant.c	2010/10/16 17:52:01	304447
+@@ -433,6 +433,8 @@
+ 	if (!value_len) {
+ 		RETURN_FALSE;
+ 	}
++	
++	PHP_ENCHANT_GET_BROKER;
+ 
+ 	switch (dict_type) {
+ 		case PHP_ENCHANT_MYSPELL:
+@@ -466,6 +468,8 @@
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &broker, &dict_type) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
++	
++	PHP_ENCHANT_GET_BROKER;
+ 
+ 	switch (dict_type) {
+ 		case PHP_ENCHANT_MYSPELL:
diff --git a/debian/patches/series b/debian/patches/series
index 751a01e..d94badf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,3 +67,4 @@ bug52843.patch
 CVE-2010-3436.patch
 bug52947.patch
 fix_crash_in_GC.patch
+bug53070.patch
-- 
1.7.1