From 5b4ba0b0d692b85d02eeee161cd585dbc0df2caf Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:29:57 +0000 Subject: [PATCH] Remove unnecessary null checks or fix potential null dereferences git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13925 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/ruby.cxx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 0d7de537c..e16bbc9ba 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -206,9 +206,9 @@ private: autodoc_l autodoc_level(String *autodoc) { autodoc_l dlevel = NO_AUTODOC; - if (autodoc) { - char *c = Char(autodoc); - if (c && isdigit(c[0])) { + char *c = Char(autodoc); + if (c) { + if (isdigit(c[0])) { dlevel = (autodoc_l) atoi(c); } else { if (strcmp(c, "extended") == 0) { @@ -495,7 +495,7 @@ private: String* full_name; if ( module ) { full_name = NewString(module); - if (class_name && Len(class_name) > 0) + if (Len(class_name) > 0) Append(full_name, "::"); } else @@ -1283,13 +1283,15 @@ public: } m = Next(m); } - if (feature == 0) { - feature = Copy(last); + if (last) { + if (feature == 0) { + feature = Copy(last); + } + (Char(last))[0] = (char)toupper((Char(last))[0]); + modvar = NewStringf("m%s", last); } - (Char(last))[0] = (char)toupper((Char(last))[0]); - modvar = NewStringf("m%s", last); - Delete(modules); } + Delete(modules); } Delete(mod_name); }