rasmus                                   Sun, 26 Jul 2009 15:53:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286362

Log:
Please review this one.  It seems pretty fundamental.
When $str is a binary string and you do: $str[4]=0;
there should be no unicode conversion.

Changed paths:
    U   php/php-src/trunk/Zend/zend_execute.c

Modified: php/php-src/trunk/Zend/zend_execute.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute.c       2009-07-26 15:52:50 UTC (rev 
286361)
+++ php/php-src/trunk/Zend/zend_execute.c       2009-07-26 15:53:36 UTC (rev 
286362)
@@ -649,7 +649,7 @@

 static inline int zend_assign_to_string_offset(const temp_variable *T, const 
zval *value, int value_type TSRMLS_DC) /* {{{ */
 {
-       if (Z_TYPE_P(T->str_offset.str) == IS_STRING && Z_TYPE_P(value) != 
IS_STRING) {
+       if (Z_TYPE_P(T->str_offset.str) == IS_STRING && Z_TYPE_P(value) == 
IS_UNICODE) {
                convert_to_unicode(T->str_offset.str);
        }


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

Reply via email to