1 files changed, 3 insertions, 0 deletions
diff --git a/string.c b/string.c
index 49b44fa850..77794d9849 100644
--- a/string.c
+++ b/string.c
@@ -80,6 +80,9 @@ VALUE
 rb_str_new2(ptr)
     const char *ptr;
 {
+    if (!ptr) {
+	rb_raise(rb_eArgError, "NULL pointer given");
+    }
     return rb_str_new(ptr, strlen(ptr));
 }