Remove hash_destroy calls in hash_create's failure paths. As noted by

tglsfdc · tglsfdc · commit c859294ca2ea · 2006-08-14T12:39:55.000Z
a Coverity warning, these are risky since the hashtable isn't necessarily
fully set up yet.  They're unnecessary anyway: a deletable hashtable
should be in a memory context that will be cleared following elog(ERROR).
Per report from Martijn van Oosterhout.
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.70 2006/07/22 23:04:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.71 2006/08/14 12:39:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -392,10 +392,7 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
 
 	/* Build the hash directory structure */
 	if (!init_htab(hashp, nelem))
-	{
-		hash_destroy(hashp);
 		elog(ERROR, "failed to initialize hash table");
-	}
 
 	/*
 	 * For a shared hash table, preallocate the requested number of elements.
@@ -409,12 +406,9 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
 		nelem < hctl->nelem_alloc)
 	{
 		if (!element_alloc(hashp, (int) nelem))
-		{
-			hash_destroy(hashp);
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
-		}
 	}
 
 	return hashp;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`*`
`28`	`28`	`* IDENTIFICATION`
`29`		`- * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.70 2006/07/22 23:04:39 tgl Exp $`
	`29`	`+ * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.71 2006/08/14 12:39:55 tgl Exp $`
`30`	`30`	`*`
`31`	`31`	`*-------------------------------------------------------------------------`
`32`	`32`	`*/`
`@@ -392,10 +392,7 @@ hash_create(const char tabname, long nelem, HASHCTL info, int flags)`
`392`	`392`
`393`	`393`	`/* Build the hash directory structure */`
`394`	`394`	`if (!init_htab(hashp, nelem))`
`395`		`- {`
`396`		`- hash_destroy(hashp);`
`397`	`395`	`elog(ERROR, "failed to initialize hash table");`
`398`		`- }`
`399`	`396`
`400`	`397`	`/*`
`401`	`398`	`* For a shared hash table, preallocate the requested number of elements.`
`@@ -409,12 +406,9 @@ hash_create(const char tabname, long nelem, HASHCTL info, int flags)`
`409`	`406`	`nelem < hctl->nelem_alloc)`
`410`	`407`	`{`
`411`	`408`	`if (!element_alloc(hashp, (int) nelem))`
`412`		`- {`
`413`		`- hash_destroy(hashp);`
`414`	`409`	`ereport(ERROR,`
`415`	`410`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`416`	`411`	`errmsg("out of memory")));`
`417`		`- }`
`418`	`412`	`}`
`419`	`413`
`420`	`414`	`return hashp;`