MonetDB: Oct2010 - Allocate the correct amount of memory.

[Sjoerd Mullender]

Changeset: 0e326a2708d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e326a2708d9
Modified Files:
        MonetDB5/src/optimizer/opt_macro.mx
Branch: Oct2010
Log Message:

Allocate the correct amount of memory.


diffs (29 lines):

diff -r c8532004665e -r 0e326a2708d9 MonetDB5/src/optimizer/opt_macro.mx
--- a/MonetDB5/src/optimizer/opt_macro.mx       Mon Oct 11 14:20:38 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_macro.mx       Mon Oct 11 14:28:50 2010 +0200
@@ -194,10 +194,10 @@
        if (mb->stop - pc < mc->stop - 2)
                return 0;
 
-       cvar = (int *) GDKmalloc(mc->vtop * mc->maxarg);
+       cvar = (int *) GDKmalloc(mc->vtop * mc->maxarg * sizeof(*cvar));
        if (cvar == NULL)
                return 0;
-       mvar = (int *) GDKmalloc(mb->vtop * mc->maxarg);
+       mvar = (int *) GDKmalloc(mb->vtop * mc->maxarg * sizeof(*mvar));
        if (mvar == NULL){
                GDKfree(cvar);
                return 0;
@@ -467,10 +467,10 @@
        int ctop = 0, mtop = 0;
 
        /* collect variable map */
-       cvar = (int *) GDKmalloc(mc->vtop * mc->maxarg);
+       cvar = (int *) GDKmalloc(mc->vtop * mc->maxarg * sizeof(*cvar));
        if (cvar == NULL)
                return -1;
-       mvar = (int *) GDKmalloc(mb->vtop * mc->maxarg);
+       mvar = (int *) GDKmalloc(mb->vtop * mc->maxarg * sizeof(*mvar));
        if (mvar == NULL){
                GDKfree(cvar);
                return -1;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list