MonetDB: Jan2014 - Avoid overwrite of msg variable

[Martin Kersten]

Changeset: a0ca33b75637 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0ca33b75637
Modified Files:
        sql/backends/monet5/sql.c
Branch: Jan2014
Log Message:

Avoid overwrite of msg variable


diffs (15 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4626,9 +4626,9 @@ RAstatement(Client cntxt, MalBlkPtr mb, 
                if (!msg) {
                        resetMalBlk(cntxt->curprg->def, oldstop);
                        freeVariables(cntxt, cntxt->curprg->def, NULL, oldvtop);
+                       if( !(cntxt->glb == 0 || cntxt->glb == oldglb))
+                               msg= createException(MAL,"sql","global stack 
leakage"); /* detect leak */
                }
-               if( !(cntxt->glb == 0 || cntxt->glb == oldglb))
-                       msg= createException(MAL,"sql","global stack leakage"); 
/* detect leak */
                cntxt->glb = oldglb;
        }
        return msg;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list