MonetDB: Mar2011 - first assert on pci, then use pci

[Fabian Groffen]

Changeset: 1e50414cd912 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e50414cd912
Modified Files:
        monetdb5/mal/mal_atom.mx
Branch: Mar2011
Log Message:

first assert on pci, then use pci
(transplanted from dfab3b8f7be53da77310c14b3646022ca8702388)


diffs (21 lines):

diff --git a/monetdb5/mal/mal_atom.mx b/monetdb5/mal/mal_atom.mx
--- a/monetdb5/mal/mal_atom.mx
+++ b/monetdb5/mal/mal_atom.mx
@@ -131,12 +131,14 @@
 }
 
 int malAtomProperty(MalBlkPtr mb, InstrPtr pci){
-       str name= getFunctionId(pci);
-       int tpe = getTypeIndex(getModuleId(pci), (int) 
strlen(getModuleId(pci)), TYPE_any);
+       str name;
+       int tpe;
        (void) mb; /* fool compilers */
+       assert(pci != 0);
+       name = getFunctionId(pci);
+       tpe = getTypeIndex(getModuleId(pci), (int) strlen(getModuleId(pci)), 
TYPE_any);
        if( tpe<0 || tpe>= GDKatomcnt)
                return 0;
-       assert(pci != 0);
        switch(name[0]){
        case 'd': 
                if( idcmp("del",name)==0 && pci->argc==1){
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list