[svn:parrot] r48992 - trunk/src/packfile

[bacek at svn.parrot.org]

Author: bacek
Date: Tue Sep 14 05:59:22 2010
New Revision: 48992
URL: https://trac.parrot.org/parrot/changeset/48992

Log:
Don't coerse all empty string into CONST_STRING. Closes #1791

Modified:
   trunk/src/packfile/pf_items.c

Modified: trunk/src/packfile/pf_items.c
==============================================================================
--- trunk/src/packfile/pf_items.c	Tue Sep 14 05:57:34 2010	(r48991)
+++ trunk/src/packfile/pf_items.c	Tue Sep 14 05:59:22 2010	(r48992)
@@ -1341,7 +1341,7 @@
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
                     "Invalid encoding number '%d' specified", encoding_nr);
 
-    if (size)
+    if (size || (!STRING_IS_NULL(s) && s->encoding != CONST_STRING(interp, "")->encoding))
         s = Parrot_str_new_init(interp, (const char *)*cursor, size,
                 encoding, flags);
     else