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

[plobsing at svn.parrot.org]

Author: plobsing
Date: Tue Sep 14 06:15:46 2010
New Revision: 48994
URL: https://trac.parrot.org/parrot/changeset/48994

Log:
avoid segfaults in the build

Modified:
   trunk/src/packfile/pf_items.c

Modified: trunk/src/packfile/pf_items.c
==============================================================================
--- trunk/src/packfile/pf_items.c	Tue Sep 14 06:01:09 2010	(r48993)
+++ trunk/src/packfile/pf_items.c	Tue Sep 14 06:15:46 2010	(r48994)
@@ -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