Changeset: 6d809fe7d23c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d809fe7d23c
Modified Files:
monetdb5/mal/mal_parser.mx
Branch: Mar2011
Log Message:
ensure that parseCommandPattern() always returns 0 (NULL) on error
diffs (24 lines):
diff --git a/monetdb5/mal/mal_parser.mx b/monetdb5/mal/mal_parser.mx
--- a/monetdb5/mal/mal_parser.mx
+++ b/monetdb5/mal/mal_parser.mx
@@ -1330,14 +1330,17 @@
setModuleScope(curInstr,
findModule(cntxt->nspace,
putName(modnme,strlen(modnme))) );
curInstr->fcn = getAddress(cntxt->srcFile, modnme, nme,TRUE);
- if (curInstr->fcn == NULL)
- return (MalBlkPtr) parseError(cntxt, "<address> not
found\n");
+ if (curInstr->fcn == NULL) {
+ parseError(cntxt, "<address> not found\n");
+ return 0;
+ }
curBlk->binding = nme;
if( cntxt->nspace->isAtomModule)
malAtomProperty(curBlk, curInstr);
skipSpace(cntxt);
} else {
- return (MalBlkPtr) parseError(cntxt,"'address' expected\n");
+ parseError(cntxt,"'address' expected\n");
+ return 0;
}
@:helpInfo(curBlk->help)@
showErrors(cntxt);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
