Access hash entry before freeing it, not after.

tglsfdc · tglsfdc · commit 64b9c850e9c4 · 2010-01-06T22:27:09.000Z
diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.1 2010/01/05 21:53:59 rhaas Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.2 2010/01/06 22:27:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,11 +54,13 @@ InvalidateTableSpaceCacheCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
 	hash_seq_init(&status, TableSpaceCacheHash);
 	while ((spc = (TableSpace *) hash_seq_search(&status)) != NULL)
 	{
-		if (hash_search(TableSpaceCacheHash, (void *) &spc->oid, HASH_REMOVE,
-						NULL) == NULL)
-			elog(ERROR, "hash table corrupted");
 		if (spc->opts)
 			pfree(spc->opts);
+		if (hash_search(TableSpaceCacheHash,
+						(void *) &spc->oid,
+						HASH_REMOVE,
+						NULL) == NULL)
+			elog(ERROR, "hash table corrupted");
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.1 2010/01/05 21:53:59 rhaas Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.2 2010/01/06 22:27:09 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -54,11 +54,13 @@ InvalidateTableSpaceCacheCallback(Datum arg, int cacheid, ItemPointer tuplePtr)`
`54`	`54`	`hash_seq_init(&status, TableSpaceCacheHash);`
`55`	`55`	`while ((spc = (TableSpace *) hash_seq_search(&status)) != NULL)`
`56`	`56`	`{`
`57`		`- if (hash_search(TableSpaceCacheHash, (void *) &spc->oid, HASH_REMOVE,`
`58`		`- NULL) == NULL)`
`59`		`- elog(ERROR, "hash table corrupted");`
`60`	`57`	`if (spc->opts)`
`61`	`58`	`pfree(spc->opts);`
	`59`	`+ if (hash_search(TableSpaceCacheHash,`
	`60`	`+ (void *) &spc->oid,`
	`61`	`+ HASH_REMOVE,`
	`62`	`+ NULL) == NULL)`
	`63`	`+ elog(ERROR, "hash table corrupted");`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`