* Merged with tip.

diff --git a/src/vm/string.c b/src/vm/string.c
index 7ba009af5ff5240f9b715f8c209fe8c941d3a0a4..f24e411e021c0c35c86777787ab5dbf063f56f98 100644 (file)
--- a/src/vm/string.c
+++ b/src/vm/string.c
@@ -230,7 +230,8 @@ java_handle_t *javastring_safe_new_from_utf8(const char *text)
        s4 nbytes;
        s4 len;
 
-       assert(text);
+       if (text == NULL)
+               return NULL;
 
        /* Get number of bytes. We need this to completely emulate the messy */
        /* behaviour of the RI. :(                                           */