MonetDB: Apr2011 - Added nil test to geom.mbr() call.

[Sjoerd Mullender]

Changeset: 802e11e14bd5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=802e11e14bd5
Modified Files:
        geom/monetdb5/geom.mx
Branch: Apr2011
Log Message:

Added nil test to geom.mbr() call.
This fixes bug 2814.


diffs (19 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -946,9 +946,12 @@
 )
 {
        *res = (mbr*)GDKmalloc(sizeof(mbr));
-       if (*res && getMbrGeom(*res, *geom))
-       {
-               return MAL_SUCCEED;
+       if (*res != NULL) {
+               if (wkb_isnil(*geom)) {
+                       **res = *mbrNULL();
+                       return MAL_SUCCEED;
+               } else if (getMbrGeom(*res, *geom))
+                       return MAL_SUCCEED;
        }
        throw(MAL, "geom.mbr", "Failed to create mbr");
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list