From: Felipe Pena <felipe@php.net>
Date: Sat, 20 Sep 2008 22:06:18 +0000 (+0000)
Subject: - Fixed bug #46067 (Collator methods - Segfault)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~351
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c14338f5a90d81afdac3f8b4811daacda4b47f6e;p=php

- Fixed bug #46067 (Collator methods - Segfault)
---

diff --git a/ext/unicode/collator.c b/ext/unicode/collator.c
index 1535be7ea3..13acaf995c 100644
--- a/ext/unicode/collator.c
+++ b/ext/unicode/collator.c
@@ -180,10 +180,14 @@ PHP_FUNCTION(collator_create)
 	int               collator_name_len;
 	zval 			 *object;
 	UCollator		 *ucoll;
+	zend_error_handling error_handling;
+
+	zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &collator_name, &collator_name_len) == FAILURE) {
 		RETURN_FALSE;
 	}
+	zend_restore_error_handling(&error_handling TSRMLS_CC);
 
 	if ((object = getThis()) == NULL) {
 		object = return_value;