From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 26 Mar 2014 00:01:12 +0000 (-0700)
Subject: Fix bugs.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=0d0055509b9dd578262b6c6dfc8d72481ffb2d38;p=users%2Frhaas%2Fpostgres.git

Fix bugs.
---

diff --git a/src/backend/utils/mmgr/sb_alloc.c b/src/backend/utils/mmgr/sb_alloc.c
index 954992fb63..9935d0d806 100644
--- a/src/backend/utils/mmgr/sb_alloc.c
+++ b/src/backend/utils/mmgr/sb_alloc.c
@@ -390,6 +390,7 @@ sb_alloc_from_heap(char *base, sb_heap *heap, Size obsize)
 		result = superblock + active_sb->ninitialized * obsize;
 		++active_sb->ninitialized;
 	}
+	++active_sb->nused;
 
 	/* If it's now full, move it to the highest-numbered fullness class. */
 	if (active_sb->nused == nmax)
diff --git a/src/backend/utils/mmgr/sb_map.c b/src/backend/utils/mmgr/sb_map.c
index e66c2c076b..ef21993c05 100644
--- a/src/backend/utils/mmgr/sb_map.c
+++ b/src/backend/utils/mmgr/sb_map.c
@@ -106,7 +106,7 @@ void
 sb_map_set(sb_map *m, Size pageno, void *ptr)
 {
 	char   *base = sb_map_base(m);
-	Assert(pageno < m->npages);
+	Assert(base == NULL || pageno < m->npages);
 
 	if (m->use64)
 		((sb_map64 *) m)->map[pageno] = (uint64) (((char *) ptr) - base);