Changeset: 7de1390dd07f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7de1390dd07f
Modified Files:
monetdb5/mal/mal_atom.mx
Branch: Mar2011
Log Message:
malAtomProperty: add defensive assert for pci->fcn
pci->fcn is cast to a pointer and dereferenced everywhere, this will,
however, crash when pci->fcn = NULL, as happens to be the case on
Darwin, which is why mserver5 crashes there right upon startup
currently.
diffs (11 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
@@ -141,6 +141,7 @@
tpe = getTypeIndex(getModuleId(pci), (int)strlen(getModuleId(pci)),
TYPE_any);
if (tpe < 0 || tpe >= GDKatomcnt)
return 0;
+ assert(pci->fcn != NULL);
switch (name[0]) {
case 'd':
if (idcmp("del", name) == 0 && pci->argc == 1) {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
