Fix occasional segfault when query cache is enabled.

Per bug 263.

diff --git a/src/query_cache/pool_memqcache.c b/src/query_cache/pool_memqcache.c
index 338d9b8ebf178551c18021edd6a069748a78eea5..8940747e8bd14587927aac77e133e3d6ba43a505 100644 (file)
--- a/src/query_cache/pool_memqcache.c
+++ b/src/query_cache/pool_memqcache.c
@@ -3071,6 +3071,8 @@ static void pool_check_and_discard_cache_buffer(int num_oids, int *oids)
                        continue;
 
                soids = (int *)pool_get_buffer(cache->oids, &len);
+               if (!soids || !len)
+                       continue;
 
                for(j=0;j<cache->num_oids;j++)
                {

diff --git a/src/utils/mmgr/mcxt.c b/src/utils/mmgr/mcxt.c
index a1a490f367326d0703635f50b6ca3653c8330200..0eae52012b2577ce5e26a40e9dc14cc91a9b6125 100644 (file)
--- a/src/utils/mmgr/mcxt.c
+++ b/src/utils/mmgr/mcxt.c
@@ -703,6 +703,9 @@ pfree(void *pointer)
        Assert(pointer != NULL);
        Assert(pointer == (void *) MAXALIGN(pointer));
 
+       if (pointer == NULL)
+               return;
+
        /*
         * OK, it's probably safe to look at the chunk header.
         */