Changeset: 333adec18b50 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=333adec18b50
Modified Files:
monetdb5/mal/mal_interpreter.c
monetdb5/modules/mal/mal_io.c
Branch: Jul2015
Log Message:
Coverity-inspired fixes.
diffs (32 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -798,7 +798,8 @@ str runMALsequence(Client cntxt, MalBlkP
stk->stk[getArg(pci,
i)].val.bval != 0) {
b =
BBPquickdesc(abs(stk->stk[getArg(pci, i)].val.bval), FALSE);
if (b == NULL) {
- ret =
createException(MAL, "mal.propertyCheck", RUNTIME_OBJECT_MISSING);
+ if (ret ==
MAL_SUCCEED)
+ ret =
createException(MAL, "mal.propertyCheck", RUNTIME_OBJECT_MISSING);
continue;
}
if (b->batStamp <=
stamp) {
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -319,6 +319,7 @@ IOprintf_(str *res, str format, ...)
} else if (type == TYPE_hge) {
/* Does this happen?
* If so, what do we have TODO ? */
+ va_end(ap);
return_error(type_error);
#endif
} else if (type == TYPE_int) {
@@ -357,6 +358,7 @@ IOprintf_(str *res, str format, ...)
} else if (type == TYPE_hge) {
/* Does this happen?
* If so, what do we have TODO ? */
+ va_end(ap);
return_error(type_error);
#endif
} else {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
