Changeset: 6c7f7c09d0a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c7f7c09d0a2
Modified Files:
monetdb5/optimizer/opt_evaluate.c
Branch: Feb2013
Log Message:
OPTevaluateImplementation(): back-ported leak-fix from default
diffs (27 lines):
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -111,6 +111,12 @@ OPTevaluateImplementation(Client cntxt,
if (assigned == NULL)
return 0;
+ alias = (int*)GDKzalloc(mb->vsize * sizeof(int) * 2); /* we introduce
more */
+ if (alias == NULL){
+ GDKfree(assigned);
+ return 0;
+ }
+
limit = mb->stop;
for (i = 1; i < limit; i++) {
p = getInstrPtr(mb, i);
@@ -119,10 +125,6 @@ OPTevaluateImplementation(Client cntxt,
assigned[getArg(p,k)]++;
}
- alias = (int*)GDKzalloc(mb->vsize * sizeof(int) * 2); /* we introduce
more */
- if (alias == NULL)
- return 0;
-
for (i = 1; i < limit; i++) {
p = getInstrPtr(mb, i);
use = assigned[getArg(p,0)] == 1 && !(p->argc == p->retc &&
blockExit(p));
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
