From 237d452abaf85bce93648d9034bb4b7a3087cab8 Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Fri, 13 Jan 2006 21:52:13 +0000 Subject: [PATCH] Added check for nil object being passed to SWIG_AsCharPtrAndSize. If a nil object is passed in then an error is returned. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8416 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Lib/ruby/rubystrings.swg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SWIG/Lib/ruby/rubystrings.swg b/SWIG/Lib/ruby/rubystrings.swg index e7b0330ba..ad42bee60 100644 --- a/SWIG/Lib/ruby/rubystrings.swg +++ b/SWIG/Lib/ruby/rubystrings.swg @@ -6,7 +6,10 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) { - if (TYPE(obj) == T_STRING) { + /* Check for nil object first */ + if (obj == Qnil) { + return SWIG_BADOBJ; + } else if (TYPE(obj) == T_STRING) { char *cstr = rb_string_value_ptr(&(obj)); size_t size = RSTRING(obj)->len + 1; if (cptr) {