felipe          Sat Sep 20 22:06:19 2008 UTC

  Modified files:              
    /php-src/ext/unicode        collator.c 
  Log:
  - Fixed bug #46067 (Collator methods - Segfault)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/collator.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/unicode/collator.c
diff -u php-src/ext/unicode/collator.c:1.17 php-src/ext/unicode/collator.c:1.18
--- php-src/ext/unicode/collator.c:1.17 Tue Mar  4 23:39:15 2008
+++ php-src/ext/unicode/collator.c      Sat Sep 20 22:06:18 2008
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: collator.c,v 1.17 2008/03/04 23:39:15 felipe Exp $ */
+/* $Id: collator.c,v 1.18 2008/09/20 22:06:18 felipe Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_array.h"
@@ -180,10 +180,14 @@
        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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to