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

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Sep 17 23:49:12 2010
New Revision: 49112
URL: https://trac.parrot.org/parrot/changeset/49112

Log:
avoid segfaults in the build

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:58 2010	(r49111)
+++ branches/gc_massacre/src/packfile/pf_items.c	Fri Sep 17 23:49:12 2010	(r49112)
@@ -1341,7 +1341,7 @@
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
                     "Invalid encoding number '%d' specified", encoding_nr);
 
-    if (size || (!STRING_IS_NULL(s) && s->encoding != CONST_STRING(interp, "")->encoding))
+    if (size || (encoding != CONST_STRING(interp, "")->encoding->num))
         s = Parrot_str_new_init(interp, (const char *)*cursor, size,
                 encoding, flags);
     else