Remove unnecessary null checks or fix potential null dereferences

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13924 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Source/Modules/modula3.cxx

@@ -2096,7 +2096,7 @@ MODULA3():
 	  stem += Len(pat.prefix);
 	}
 	String *newname;
-	if (Strcmp(srcstyle, "underscore") == 0) {
+	if (srcstyle && Strcmp(srcstyle, "underscore") == 0) {
 	  if (newprefix != NIL) {
 	    String *newstem = nameToModula3(stem, true);
 	    newname = NewStringf("%s%s", newprefix, newstem);
@@ -2214,6 +2214,7 @@ MODULA3():
     List *baselist = Getattr(n, "bases");
     if (baselist != NIL) {
       Iterator base = First(baselist);
+      if (base.item) {
 	c_baseclassname = Getattr(base.item, "name");
 	baseclass = Copy(getProxyName(c_baseclassname));
 	if (baseclass) {
@@ -2226,6 +2227,7 @@ MODULA3():
 	      name, Getattr(base.item, "name"));
 	}
       }
+    }
 
     bool derived = baseclass && getProxyName(c_baseclassname);
     if (!baseclass)
@@ -2460,15 +2462,17 @@ MODULA3():
 	    /* Look for the first (principal?) base class -
 	       Modula 3 does not support multiple inheritance */
 	    Iterator base = First(baselist);
+	    if (base.item) {
 	      Append(baseclassname, Getattr(base.item, "sym:name"));
 	      base = Next(base);
-	    if (base.item != NIL) {
+	      if (base.item) {
 		Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
 		    "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n",
 		    proxy_class_name, Getattr(base.item, "name"));
 	      }
 	    }
 	  }
+	}
 
 	/* the private class of the base class and only this
 	   need a pointer to the C++ object */

Source/Modules/ocaml.cxx

@@ -1256,12 +1256,11 @@ public:
       Printv(qtype, name, NIL);
     }
 
-    if (const_enum && name && !Getattr(seen_enumvalues, name)) {
+    if (const_enum && qtype && name && !Getattr(seen_enumvalues, name)) {
       Setattr(seen_enumvalues, name, "true");
       SetFlag(n, "feature:immutable");
       Setattr(n, "feature:enumvalue", "1");	// this does not appear to be used
 
-      if (qtype)
       Setattr(n, "qualified:name", SwigType_namestr(qtype));
 
       String *evname = SwigType_manglestr(qtype);

Source/Modules/perl5.cxx

@@ -1638,9 +1638,9 @@ public:
 	      while (fgets(buffer, 4095, f)) {
 		Printf(pragma_include, "%s", buffer);
 	      }
-	    }
 	      fclose(f);
 	    }
+	  }
 	} else {
 	  Swig_error(input_file, line_number, "Unrecognized pragma.\n");
 	}

Source/Modules/python.cxx

@@ -1163,9 +1163,9 @@ public:
 
   autodoc_l autodoc_level(String *autodoc) {
     autodoc_l dlevel = NO_AUTODOC;
-    if (autodoc) {
     char *c = Char(autodoc);
-      if (c && isdigit(c[0])) {
+    if (c) {
+      if (isdigit(c[0])) {
 	dlevel = (autodoc_l) atoi(c);
       } else {
 	if (strcmp(c, "extended") == 0) {

Source/Modules/r.cxx

@@ -1609,7 +1609,6 @@ void R::dispatchFunction(Node *n) {
 
 	String *tmcheck = Swig_typemap_lookup("rtypecheck", p, "", 0);
 	if (tmcheck) {
-
 	  String *tmp = NewString("");
 	  Printf(tmp, "argv[[%d]]", j+1);
 	  Replaceall(tmcheck, "$arg", tmp);
@@ -1627,17 +1626,18 @@ void R::dispatchFunction(Node *n) {
 	  p = Getattr(p, "tmap:in:next");
 	  continue;
 	}
-	if (DohStrcmp(tm,"numeric")==0) {
+	if (tm) {
+	  if (Strcmp(tm,"numeric")==0) {
 	    Printf(f->code, "%sis.numeric(argv[[%d]])",
 		j == 0 ? "" : " && ",
 		j+1);
 	  }
-	  else if (DohStrcmp(tm,"integer")==0) {
+	  else if (Strcmp(tm,"integer")==0) {
 	    Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))",
 		j == 0 ? "" : " && ",
 		j+1, j+1);
 	  }
-	  else if (DohStrcmp(tm,"character")==0) {
+	  else if (Strcmp(tm,"character")==0) {
 	    Printf(f->code, "%sis.character(argv[[%d]])",
 		j == 0 ? "" : " && ",
 		j+1);
@@ -1648,6 +1648,7 @@ void R::dispatchFunction(Node *n) {
 		j+1,
 		tm);
 	  }
+	}
 	if (!SwigType_ispointer(Getattr(p, "type"))) {
 	  Printf(f->code, " && length(argv[[%d]]) == 1",
 	      j+1);
@@ -1845,9 +1846,10 @@ int R::functionWrapper(Node *n) {
     String   *lname  = Getattr(p,"lname");
 
     // R keyword renaming
-    if (name && Swig_name_warning(p, 0, name, 0))
+    if (name) {
+      if (Swig_name_warning(p, 0, name, 0)) {
 	name = 0;
-
+      } else {
 	/* If we have a :: in the parameter name because we are accessing a static member of a class, say, then
 	   we need to remove that prefix. */
 	while (Strstr(name, "::")) {
@@ -1856,7 +1858,9 @@ int R::functionWrapper(Node *n) {
 	  if (debugMode)
 	    Printf(stdout, "+++  parameter name with :: in it %s\n", name);
 	}
-    if (Len(name) == 0)
+      }
+    }
+    if (!name || Len(name) == 0)
       name = NewStringf("s_arg%d", i+1);
 
     name = replaceInitialDash(name);