[svn:parrot] r49110 - branches/gc_massacre/src/packfile

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Sep 17 23:48:44 2010
New Revision: 49110
URL: https://trac.parrot.org/parrot/changeset/49110

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

Modified:
   branches/gc_massacre/src/packfile/pf_items.c

Modified: branches/gc_massacre/src/packfile/pf_items.c
==============================================================================
--- branches/gc_massacre/src/packfile/pf_items.c	Fri Sep 17 23:48:29 2010	(r49109)
+++ branches/gc_massacre/src/packfile/pf_items.c	Fri Sep 17 23:48:44 2010	(r49110)
@@ -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