Fix a few places that were checking for the return value of palloc() to be

Neil Conway · Neil Conway · commit a323ede28029 · 2006-03-19T22:22:56.000Z
non-NULL: palloc() ereports on OOM, so we can safely assume it returns a
valid pointer.
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
@@ -4,7 +4,7 @@
  * darcy@druid.net
  * http://www.druid.net/darcy/
  *
- * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.14 2005/10/15 02:49:04 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.15 2006/03/19 22:22:55 neilc Exp $
  * best viewed with tabs set to 4
  */
 
@@ -108,11 +108,9 @@ chkpass_out(PG_FUNCTION_ARGS)
 	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
 	char	   *result;
 
-	if ((result = (char *) palloc(16)) != NULL)
-	{
-		result[0] = ':';
-		strcpy(result + 1, password->password);
-	}
+	result = (char *) palloc(16);
+	result[0] = ':';
+	strcpy(result + 1, password->password);
 
 	PG_RETURN_CSTRING(result);
 }
@@ -129,11 +127,9 @@ chkpass_rout(PG_FUNCTION_ARGS)
 	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
 	text	   *result;
 
-	if ((result = (text *) palloc(VARHDRSZ + 16)) != NULL)
-	{
-		result->vl_len = VARHDRSZ + strlen(password->password);
-		memcpy(result->vl_dat, password->password, strlen(password->password));
-	}
+	result = (text *) palloc(VARHDRSZ + 16);
+	result->vl_len = VARHDRSZ + strlen(password->password);
+	memcpy(result->vl_dat, password->password, strlen(password->password));
 
 	PG_RETURN_TEXT_P(result);
 }
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -5,7 +5,7 @@
  *
  * Joe Conway <mail@joeconway.com>
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.19 2006/03/11 04:38:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.20 2006/03/19 22:22:56 neilc Exp $
  * Copyright (c) 2001-2006, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -347,14 +347,10 @@ _metaphone(
 	if (max_phonemes == 0)
 	{							/* Assume largest possible */
 		*phoned_word = palloc(sizeof(char) * strlen(word) +1);
-		if (!*phoned_word)
-			return META_ERROR;
 	}
 	else
 	{
 		*phoned_word = palloc(sizeof(char) * max_phonemes + 1);
-		if (!*phoned_word)
-			return META_ERROR;
 	}
 
 	/*-- The first phoneme has to be processed specially. --*/
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
@@ -9,7 +9,7 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.66 2005/10/15 02:49:28 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.67 2006/03/19 22:22:56 neilc Exp $
  */
 
 #include "postgres.h"
@@ -291,10 +291,7 @@ cash_out(PG_FUNCTION_ARGS)
 	/* see if we need to signify negative amount */
 	if (minus)
 	{
-		if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol))))
-			ereport(ERROR,
-					(errcode(ERRCODE_OUT_OF_MEMORY),
-					 errmsg("out of memory")));
+		result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol));
 
 		/* Position code of 0 means use parens */
 		if (convention == 0)
@@ -306,11 +303,7 @@ cash_out(PG_FUNCTION_ARGS)
 	}
 	else
 	{
-		if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count)))
-			ereport(ERROR,
-					(errcode(ERRCODE_OUT_OF_MEMORY),
-					 errmsg("out of memory")));
-
+		result = palloc(CASH_BUFSZ + 2 - count);
 		strcpy(result, buf + count);
 	}
 
diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
@@ -151,8 +151,6 @@ spi_spi_prepare(query, ...)
 		if (items < 1) 
 			Perl_croak(aTHX_ "Usage: spi_prepare(query, ...)");
 		argv = ( SV**) palloc(( items - 1) * sizeof(SV*));
-		if ( argv == NULL) 
-			Perl_croak(aTHX_ "spi_prepare: not enough memory");
 		for ( i = 1; i < items; i++) 
 			argv[i - 1] = ST(i);
 		RETVAL = plperl_spi_prepare(query, items - 1, argv);
@@ -179,8 +177,6 @@ spi_spi_exec_prepared(query, ...)
 		}
 		argc = items - offset;
 		argv = ( SV**) palloc( argc * sizeof(SV*));
-		if ( argv == NULL) 
-			Perl_croak(aTHX_ "spi_exec_prepared: not enough memory");
 		for ( i = 0; offset < items; offset++, i++) 
 			argv[i] = ST(offset);
 		ret_hash = plperl_spi_exec_prepared(query, attr, argc, argv);
@@ -199,8 +195,6 @@ spi_spi_query_prepared(query, ...)
 			Perl_croak(aTHX_ "Usage: spi_query_prepared(query, "
 					   "[\\@bind_values])");
 		argv = ( SV**) palloc(( items - 1) * sizeof(SV*));
-		if ( argv == NULL) 
-			Perl_croak(aTHX_ "spi_query_prepared: not enough memory");
 		for ( i = 1; i < items; i++) 
 			argv[i - 1] = ST(i);
 		RETVAL = plperl_spi_query_prepared(query, items - 1, argv);
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plperl.c - perl as a procedural language for PostgreSQL
  *
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.106 2006/03/14 22:48:23 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.107 2006/03/19 22:22:56 neilc Exp $
  *
  **********************************************************************/
 
@@ -2122,8 +2122,6 @@ plperl_spi_exec_prepared(char* query, HV * attr, int argc, SV ** argv)
 		{
 			nulls = (char *)palloc( argc);
 			argvalues = (Datum *) palloc(argc * sizeof(Datum));
-			if ( nulls == NULL || argvalues == NULL) 
-				elog(ERROR, "spi_exec_prepared: not enough memory");
 		} 
 		else 
 		{
@@ -2253,8 +2251,6 @@ plperl_spi_query_prepared(char* query, int argc, SV ** argv)
 		{
 			nulls = (char *)palloc( argc);
 			argvalues = (Datum *) palloc(argc * sizeof(Datum));
-			if ( nulls == NULL || argvalues == NULL) 
-				elog(ERROR, "spi_query_prepared: not enough memory");
 		} 
 		else 
 		{

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Joe Conway <mail@joeconway.com>`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.19 2006/03/11 04:38:29 momjian Exp $`
	`8`	`+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.20 2006/03/19 22:22:56 neilc Exp $`
`9`	`9`	`* Copyright (c) 2001-2006, PostgreSQL Global Development Group`
`10`	`10`	`* ALL RIGHTS RESERVED;`
`11`	`11`	`*`
`@@ -347,14 +347,10 @@ _metaphone(`
`347`	`347`	`if (max_phonemes == 0)`
`348`	`348`	`{ /* Assume largest possible */`
`349`	`349`	`phoned_word = palloc(sizeof(char) strlen(word) +1);`
`350`		`- if (!*phoned_word)`
`351`		`- return META_ERROR;`
`352`	`350`	`}`
`353`	`351`	`else`
`354`	`352`	`{`
`355`	`353`	`phoned_word = palloc(sizeof(char) max_phonemes + 1);`
`356`		`- if (!*phoned_word)`
`357`		`- return META_ERROR;`
`358`	`354`	`}`
`359`	`355`
`360`	`356`	`/-- The first phoneme has to be processed specially. --/`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* workings can be found in the book "Software Solutions in C" by`
`10`	`10`	`* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.`
`11`	`11`	`*`
`12`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.66 2005/10/15 02:49:28 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.67 2006/03/19 22:22:56 neilc Exp $`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`#include "postgres.h"`
`@@ -291,10 +291,7 @@ cash_out(PG_FUNCTION_ARGS)`
`291`	`291`	`/* see if we need to signify negative amount */`
`292`	`292`	`if (minus)`
`293`	`293`	`{`
`294`		`- if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol))))`
`295`		`- ereport(ERROR,`
`296`		`- (errcode(ERRCODE_OUT_OF_MEMORY),`
`297`		`- errmsg("out of memory")));`
	`294`	`+ result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol));`
`298`	`295`
`299`	`296`	`/* Position code of 0 means use parens */`
`300`	`297`	`if (convention == 0)`
`@@ -306,11 +303,7 @@ cash_out(PG_FUNCTION_ARGS)`
`306`	`303`	`}`
`307`	`304`	`else`
`308`	`305`	`{`
`309`		`- if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count)))`
`310`		`- ereport(ERROR,`
`311`		`- (errcode(ERRCODE_OUT_OF_MEMORY),`
`312`		`- errmsg("out of memory")));`
`313`		`-`
	`306`	`+ result = palloc(CASH_BUFSZ + 2 - count);`
`314`	`307`	`strcpy(result, buf + count);`
`315`	`308`	`}`
`316`	`309`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**********************************************************************`
`2`	`2`	`* plperl.c - perl as a procedural language for PostgreSQL`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.106 2006/03/14 22:48:23 tgl Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.107 2006/03/19 22:22:56 neilc Exp $`
`5`	`5`	`*`
`6`	`6`	`**********************************************************************/`
`7`	`7`
`@@ -2122,8 +2122,6 @@ plperl_spi_exec_prepared(char* query, HV * attr, int argc, SV ** argv)`
`2122`	`2122`	`{`
`2123`	`2123`	`nulls = (char *)palloc( argc);`
`2124`	`2124`	`argvalues = (Datum ) palloc(argc sizeof(Datum));`
`2125`		`- if ( nulls == NULL \|\| argvalues == NULL)`
`2126`		`- elog(ERROR, "spi_exec_prepared: not enough memory");`
`2127`	`2125`	`}`
`2128`	`2126`	`else`
`2129`	`2127`	`{`
`@@ -2253,8 +2251,6 @@ plperl_spi_query_prepared(char* query, int argc, SV ** argv)`
`2253`	`2251`	`{`
`2254`	`2252`	`nulls = (char *)palloc( argc);`
`2255`	`2253`	`argvalues = (Datum ) palloc(argc sizeof(Datum));`
`2256`		`- if ( nulls == NULL \|\| argvalues == NULL)`
`2257`		`- elog(ERROR, "spi_query_prepared: not enough memory");`
`2258`	`2254`	`}`
`2259`	`2255`	`else`
`2260`	`2256`	`{`