jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bunch of minor bugs found by Coverity scanner

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9889 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
John Lenz 2007-08-10 02:55:27 +00:00
commit fb51964d01
16 changed files with 99 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/CParse/templ.c
View file

@ -50,9 +50,9 @@ void Swig_cparse_debug_templates(int x) {
static int cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) { static int cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) {
static int expanded = 0; static int expanded = 0;
int ret; int ret;
String *nodeType = nodeType(n);
if (!n) if (!n)
return 0; return 0;
String *nodeType = nodeType(n);
if (Getattr(n, "error")) if (Getattr(n, "error"))
return 0; return 0;

4
Source/Modules/allegrocl.cxx
View file

@ -2500,6 +2500,7 @@ int ALLEGROCL::emit_defun(Node *n, File *f_cl) {
Delete(result_type); Delete(result_type);
Delete(mangled_name); Delete(mangled_name);
Delete(pl); Delete(pl);
DelWrapper(wrap);
#ifdef ALLEGROCL_WRAP_DEBUG #ifdef ALLEGROCL_WRAP_DEBUG
Printf(stderr, "emit_defun: EXIT\n"); Printf(stderr, "emit_defun: EXIT\n");
@ -2556,6 +2557,7 @@ int ALLEGROCL::functionWrapper(Node *n) {
emit_buffered_defuns(n); emit_buffered_defuns(n);
emit_dispatch_defun(n); emit_dispatch_defun(n);
} }
DelWrapper(wrap);
return SWIG_OK; return SWIG_OK;
} }
} }
@ -2649,6 +2651,8 @@ int ALLEGROCL::functionWrapper(Node *n) {
} }
} }
DelWrapper(wrap);
return SWIG_OK; return SWIG_OK;
} }

7
Source/Modules/cffi.cxx
View file

@ -259,7 +259,7 @@ void CFFI::emit_defmethod(Node *n) {
else else
Printf(args_placeholder, "%s", argname); Printf(args_placeholder, "%s", argname);
if (Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0) if (ffitype && Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0)
Printf(args_call, " (ff-pointer %s)", argname); Printf(args_call, " (ff-pointer %s)", argname);
else else
Printf(args_call, " %s", argname); Printf(args_call, " %s", argname);
@ -373,8 +373,10 @@ int CFFI::functionWrapper(Node *n) {
if (Getattr(n, "sym:overloaded")) { if (Getattr(n, "sym:overloaded")) {
overname = Getattr(n, "sym:overname"); overname = Getattr(n, "sym:overname");
} else { } else {
if (!addSymbol(iname, n)) if (!addSymbol(iname, n)) {
DelWrapper(wrap);
return SWIG_ERROR; return SWIG_ERROR;
}
} }
String *wname = Swig_name_wrapper(iname); String *wname = Swig_name_wrapper(iname);
@ -479,6 +481,7 @@ int CFFI::functionWrapper(Node *n) {
// } // }
Delete(wname); Delete(wname);
DelWrapper(wrap);
return SWIG_OK; return SWIG_OK;
} }

11
Source/Modules/csharp.cxx
View file

@ -280,6 +280,11 @@ public:
String *outfile = Getattr(n, "outfile"); String *outfile = Getattr(n, "outfile");
String *outfile_h = Getattr(n, "outfile_h"); String *outfile_h = Getattr(n, "outfile_h");
if (!outfile) {
Printf(stderr, "Unable to determine outfile\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime = NewFile(outfile, "w"); f_runtime = NewFile(outfile, "w");
if (!f_runtime) { if (!f_runtime) {
FileErrorDisplay(outfile); FileErrorDisplay(outfile);
@ -287,6 +292,10 @@ public:
} }
if (directorsEnabled()) { if (directorsEnabled()) {
if (!outfile_h) {
Printf(stderr, "Unable to determine outfile_h\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime_h = NewFile(outfile_h, "w"); f_runtime_h = NewFile(outfile_h, "w");
if (!f_runtime_h) { if (!f_runtime_h) {
FileErrorDisplay(outfile_h); FileErrorDisplay(outfile_h);
@ -1540,7 +1549,7 @@ public:
destruct_methodname = Getattr(attributes, "tmap:csdestruct:methodname"); destruct_methodname = Getattr(attributes, "tmap:csdestruct:methodname");
destruct_methodmodifiers = Getattr(attributes, "tmap:csdestruct:methodmodifiers"); destruct_methodmodifiers = Getattr(attributes, "tmap:csdestruct:methodmodifiers");
} }
if (*Char(tm)) { if (tm && *Char(tm)) {
if (!destruct_methodname) { if (!destruct_methodname) {
Swig_error(input_file, line_number, "No methodname attribute defined in csdestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name); Swig_error(input_file, line_number, "No methodname attribute defined in csdestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name);
} }

5
Source/Modules/guile.cxx
View file

@ -672,8 +672,10 @@ public:
overname = Getattr(n, "sym:overname"); overname = Getattr(n, "sym:overname");
args_passed_as_array = 1; args_passed_as_array = 1;
} else { } else {
if (!addSymbol(iname, n)) if (!addSymbol(iname, n)) {
DelWrapper(f);
return SWIG_ERROR; return SWIG_ERROR;
}
} }
if (overname) { if (overname) {
Append(wname, overname); Append(wname, overname);
@ -1371,6 +1373,7 @@ public:
if ((SwigType_type(nctype) == T_USER) && (!is_a_pointer(nctype))) { if ((SwigType_type(nctype) == T_USER) && (!is_a_pointer(nctype))) {
Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n"); Swig_warning(WARN_TYPEMAP_CONST_UNDEF, input_file, line_number, "Unsupported constant value.\n");
Delete(var_name); Delete(var_name);
DelWrapper(f);
return SWIG_NOWRAP; return SWIG_NOWRAP;
} }
// See if there's a typemap // See if there's a typemap

11
Source/Modules/java.cxx
View file

@ -287,6 +287,11 @@ public:
String *outfile = Getattr(n, "outfile"); String *outfile = Getattr(n, "outfile");
String *outfile_h = Getattr(n, "outfile_h"); String *outfile_h = Getattr(n, "outfile_h");
if (!outfile) {
Printf(stderr, "Unable to determine outfile\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime = NewFile(outfile, "w"); f_runtime = NewFile(outfile, "w");
if (!f_runtime) { if (!f_runtime) {
FileErrorDisplay(outfile); FileErrorDisplay(outfile);
@ -294,6 +299,10 @@ public:
} }
if (directorsEnabled()) { if (directorsEnabled()) {
if (!outfile_h) {
Printf(stderr, "Unable to determine outfile_h\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime_h = NewFile(outfile_h, "w"); f_runtime_h = NewFile(outfile_h, "w");
if (!f_runtime_h) { if (!f_runtime_h) {
FileErrorDisplay(outfile_h); FileErrorDisplay(outfile_h);
@ -1608,7 +1617,7 @@ public:
destruct_methodname = Getattr(attributes, "tmap:javadestruct:methodname"); destruct_methodname = Getattr(attributes, "tmap:javadestruct:methodname");
destruct_methodmodifiers = Getattr(attributes, "tmap:javadestruct:methodmodifiers"); destruct_methodmodifiers = Getattr(attributes, "tmap:javadestruct:methodmodifiers");
} }
if (*Char(tm)) { if (tm && *Char(tm)) {
if (!destruct_methodname) { if (!destruct_methodname) {
Swig_error(input_file, line_number, Swig_error(input_file, line_number,
"No methodname attribute defined in javadestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name); "No methodname attribute defined in javadestruct%s typemap for %s\n", (derived ? "_derived" : ""), proxy_class_name);

8
Source/Modules/main.cxx
View file

@ -397,7 +397,9 @@ void SWIG_getoptions(int argc, char *argv[]) {
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strncmp(argv[i], "-I", 2) == 0) { } else if (strncmp(argv[i], "-I", 2) == 0) {
// Add a new directory search path // Add a new directory search path
Swig_add_directory((DOH *) Swig_copy_string(argv[i] + 2)); char *a = Swig_copy_string(argv[i] + 2);
Swig_add_directory((DOH *) a);
free(a);
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strncmp(argv[i], "-D", 2) == 0) { } else if (strncmp(argv[i], "-D", 2) == 0) {
String *d = NewString(argv[i] + 2); String *d = NewString(argv[i] + 2);
@ -1064,10 +1066,10 @@ int SWIG_main(int argc, char *argv[], Language *l) {
if (dump_top) { if (dump_top) {
Swig_print_tree(top); Swig_print_tree(top);
} }
if (dump_module) { if (dump_module && top) {
Swig_print_tree(Getattr(top, "module")); Swig_print_tree(Getattr(top, "module"));
} }
if (dump_xml) { if (dump_xml && top) {
Swig_print_xml(top, xmlout); Swig_print_xml(top, xmlout);
} }
Delete(top); Delete(top);

4
Source/Modules/mzscheme.cxx
View file

@ -248,8 +248,10 @@ public:
if (Getattr(n, "sym:overloaded")) { if (Getattr(n, "sym:overloaded")) {
overname = Getattr(n, "sym:overname"); overname = Getattr(n, "sym:overname");
} else { } else {
if (!addSymbol(iname, n)) if (!addSymbol(iname, n)) {
DelWrapper(f);
return SWIG_ERROR; return SWIG_ERROR;
}
} }
if (overname) { if (overname) {
Append(wname, overname); Append(wname, overname);

10
Source/Modules/ocaml.cxx
View file

@ -446,8 +446,10 @@ public:
if (isOverloaded) { if (isOverloaded) {
overname = Getattr(n, "sym:overname"); overname = Getattr(n, "sym:overname");
} else { } else {
if (!addSymbol(iname, n)) if (!addSymbol(iname, n)) {
DelWrapper(f);
return SWIG_ERROR; return SWIG_ERROR;
}
} }
if (overname) { if (overname) {
Append(wname, overname); Append(wname, overname);
@ -1094,6 +1096,10 @@ public:
int classHandler(Node *n) { int classHandler(Node *n) {
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
if (!name)
return SWIG_OK;
String *mangled_sym_name = mangleNameForCaml(name); String *mangled_sym_name = mangleNameForCaml(name);
String *this_class_def = NewString(f_classtemplate); String *this_class_def = NewString(f_classtemplate);
String *name_normalized = normalizeTemplatedClassName(name); String *name_normalized = normalizeTemplatedClassName(name);
@ -1102,8 +1108,6 @@ public:
f_class_ctors = NewString(""); f_class_ctors = NewString("");
bool sizeof_feature = generate_sizeof && isSimpleType(name); bool sizeof_feature = generate_sizeof && isSimpleType(name);
if (!name)
return SWIG_OK;
classname = mangled_sym_name; classname = mangled_sym_name;
classmode = true; classmode = true;

3
Source/Modules/perl5.cxx
View file

@ -819,6 +819,8 @@ public:
addfail = emit_action_code(n, getf, tm); addfail = emit_action_code(n, getf, tm);
} else { } else {
Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0)); Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number, "Unable to read variable of type %s\n", SwigType_str(t, 0));
DelWrapper(setf);
DelWrapper(getf);
return SWIG_NOWRAP; return SWIG_NOWRAP;
} }
Printf(getf->code, " return 1;\n"); Printf(getf->code, " return 1;\n");
@ -1529,6 +1531,7 @@ public:
Printf(pragma_include, "%s", buffer); Printf(pragma_include, "%s", buffer);
} }
} }
fclose(f);
} }
} else { } else {
Printf(stderr, "%s : Line %d. Unrecognized pragma.\n", input_file, line_number); Printf(stderr, "%s : Line %d. Unrecognized pragma.\n", input_file, line_number);

10
Source/Modules/php4.cxx
View file

@ -1305,8 +1305,10 @@ public:
Delete(wname); Delete(wname);
wname = NULL; wname = NULL;
if (!(shadow && php_version == 5)) if (!(shadow && php_version == 5)) {
DelWrapper(f);
return SWIG_OK; return SWIG_OK;
}
// Handle getters and setters. // Handle getters and setters.
if (wrapperType == membervar) { if (wrapperType == membervar) {
@ -1841,8 +1843,11 @@ public:
Printf(output, "\t}\n"); Printf(output, "\t}\n");
Delete(prepare); Delete(prepare);
Delete(invoke); Delete(invoke);
free(arg_values);
} }
DelWrapper(f);
return SWIG_OK; return SWIG_OK;
} }
@ -2521,6 +2526,7 @@ public:
Delete(class_iname); Delete(class_iname);
Delete(mget); Delete(mget);
Delete(mset); Delete(mset);
DelWrapper(f);
return SWIG_OK; return SWIG_OK;
} }
@ -2644,7 +2650,7 @@ public:
char *iname = GetChar(n, "sym:name"); char *iname = GetChar(n, "sym:name");
if (shadow && php_version == 4) { if (shadow && php_version == 4) {
if (strcmp(iname, Char(shadow_classname)) == 0) { if (iname && strcmp(iname, Char(shadow_classname)) == 0) {
native_constructor = NATIVE_CONSTRUCTOR; native_constructor = NATIVE_CONSTRUCTOR;
} else { } else {
native_constructor = ALTERNATIVE_CONSTRUCTOR; native_constructor = ALTERNATIVE_CONSTRUCTOR;

7
Source/Modules/r.cxx
View file

@ -1600,6 +1600,7 @@ void R::dispatchFunction(Node *n) {
Printv(f->code, "\n}", NIL); Printv(f->code, "\n}", NIL);
Wrapper_print(f, sfile); Wrapper_print(f, sfile);
Printv(sfile, "# Dispatch function\n", NIL); Printv(sfile, "# Dispatch function\n", NIL);
DelWrapper(f);
} }
/****************************************************************** /******************************************************************
@ -2398,8 +2399,10 @@ int R::classDeclaration(Node *n) {
// OutputArrayMethod(name, class_member_functions, sfile); // OutputArrayMethod(name, class_member_functions, sfile);
OutputMemberReferenceMethod(name, 0, class_member_functions, sfile); if (class_member_functions)
OutputMemberReferenceMethod(name, 1, class_member_set_functions, sfile); OutputMemberReferenceMethod(name, 0, class_member_functions, sfile);
if (class_member_set_functions)
OutputMemberReferenceMethod(name, 1, class_member_set_functions, sfile);
if(class_member_functions) { if(class_member_functions) {
Delete(class_member_functions); Delete(class_member_functions);

9
Source/Modules/ruby.cxx
View file

@ -987,6 +987,11 @@ public:
String *outfile = Getattr(n, "outfile"); String *outfile = Getattr(n, "outfile");
String *outfile_h = Getattr(n, "outfile_h"); String *outfile_h = Getattr(n, "outfile_h");
if (!outfile) {
Printf(stderr, "Unable to determine outfile\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime = NewFile(outfile, "w"); f_runtime = NewFile(outfile, "w");
if (!f_runtime) { if (!f_runtime) {
FileErrorDisplay(outfile); FileErrorDisplay(outfile);
@ -994,6 +999,10 @@ public:
} }
if (directorsEnabled()) { if (directorsEnabled()) {
if (!outfile_h) {
Printf(stderr, "Unable to determine outfile_h\n");
SWIG_exit(EXIT_FAILURE);
}
f_runtime_h = NewFile(outfile_h, "w"); f_runtime_h = NewFile(outfile_h, "w");
if (!f_runtime_h) { if (!f_runtime_h) {
FileErrorDisplay(outfile_h); FileErrorDisplay(outfile_h);

1
Source/Modules/s-exp.cxx
View file

@ -375,6 +375,7 @@ public:
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
emit_attach_parmmaps(l, f); emit_attach_parmmaps(l, f);
Setattr(n, "wrap:parms", l); Setattr(n, "wrap:parms", l);
DelWrapper(f);
return SWIG_OK; return SWIG_OK;
} }

43
Source/Modules/tcl8.cxx
View file

@ -593,30 +593,31 @@ public:
setf = NewWrapper(); setf = NewWrapper();
setname = Swig_name_set(iname); setname = Swig_name_set(iname);
setfname = Swig_name_wrapper(setname); setfname = Swig_name_wrapper(setname);
Printv(setf->def, "SWIGINTERN const char *", setfname, if (setf) {
Printv(setf->def, "SWIGINTERN const char *", setfname,
"(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, char *name1, char *name2 SWIGUNUSED, int flags) {", NIL); "(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, char *name1, char *name2 SWIGUNUSED, int flags) {", NIL);
Wrapper_add_local(setf, "value", "Tcl_Obj *value = 0"); Wrapper_add_local(setf, "value", "Tcl_Obj *value = 0");
Wrapper_add_local(setf, "name1o", "Tcl_Obj *name1o = 0"); Wrapper_add_local(setf, "name1o", "Tcl_Obj *name1o = 0");
if ((tm = Swig_typemap_lookup_new("varin", n, name, 0))) { if ((tm = Swig_typemap_lookup_new("varin", n, name, 0))) {
Replaceall(tm, "$source", "value"); Replaceall(tm, "$source", "value");
Replaceall(tm, "$target", name); Replaceall(tm, "$target", name);
Replaceall(tm, "$input", "value"); Replaceall(tm, "$input", "value");
Printf(setf->code, "name1o = Tcl_NewStringObj(name1,-1);\n"); Printf(setf->code, "name1o = Tcl_NewStringObj(name1,-1);\n");
Printf(setf->code, "value = Tcl_ObjGetVar2(interp, name1o, 0, flags);\n"); Printf(setf->code, "value = Tcl_ObjGetVar2(interp, name1o, 0, flags);\n");
Printf(setf->code, "Tcl_DecrRefCount(name1o);\n"); Printf(setf->code, "Tcl_DecrRefCount(name1o);\n");
Printf(setf->code, "if (!value) SWIG_fail;\n"); Printf(setf->code, "if (!value) SWIG_fail;\n");
/* Printf(setf->code,"%s\n", tm); */ /* Printf(setf->code,"%s\n", tm); */
emit_action_code(n, setf, tm); emit_action_code(n, setf, tm);
Printf(setf->code, "return NULL;\n"); Printf(setf->code, "return NULL;\n");
Printf(setf->code, "fail:\n"); Printf(setf->code, "fail:\n");
Printf(setf->code, "return \"%s\";\n", iname); Printf(setf->code, "return \"%s\";\n", iname);
Printf(setf->code, "}\n"); Printf(setf->code, "}\n");
if (setf)
Wrapper_print(setf, f_wrappers); Wrapper_print(setf, f_wrappers);
} else { } else {
Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0)); Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0));
readonly = 1; readonly = 1;
}
} }
DelWrapper(setf); DelWrapper(setf);
} else { } else {

2
Source/Swig/typemap.c
View file

@ -1250,7 +1250,7 @@ String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const Stri
char *cop = Char(op); char *cop = Char(op);
/* special case, we need to check for 'ref' call /* special case, we need to check for 'ref' call
and set the default code 'sdef' */ and set the default code 'sdef' */
if (Cmp(op, "newfree") == 0) { if (node && Cmp(op, "newfree") == 0) {
sdef = Swig_ref_call(node, lname); sdef = Swig_ref_call(node, lname);
} }