svn: /php/php-src/trunk/ext/mbstring/ mbstring.c

scottmac Thu, 27 Jan 2011 11:47:31 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307779 Log: Fix crash with mbstring, this probably isn't the correct behaviour but 272/276 of the tests pass after this. When mbstring.language is unset, it ends up being mbfl_no_language_neutral and there is no default when setting the encoding. internal_encoding and current_internal_encoding then end up being null. Changed paths: U php/php-src/trunk/ext/mbstring/mbstring.c Modified: php/php-src/trunk/ext/mbstring/mbstring.c =================================================================== --- php/php-src/trunk/ext/mbstring/mbstring.c 2011-01-27 11:47:24 UTC (rev 307778) +++ php/php-src/trunk/ext/mbstring/mbstring.c 2011-01-27 11:47:31 UTC (rev 307779) @@ -1252,7 +1252,7 @@ encoding = mbfl_no2encoding(mbfl_no_encoding_8859_9); break; default: - encoding = NULL; + encoding = mbfl_no2encoding(mbfl_no_encoding_8859_1); break; } }