Fix our version of strdup() to adhere to the standard semantics for

tglsfdc · tglsfdc · commit 3772975f308c · 2005-09-27T04:53:23.000Z
out-of-memory --- that is, return NULL rather than dumping core.
Noted by Qingqing Zhou.
diff --git a/src/port/strdup.c b/src/port/strdup.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.7 2005/07/28 04:03:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.8 2005/09/27 04:53:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,10 +19,12 @@
 
 
 char *
-strdup(char const * string)
+strdup(const char *string)
 {
 	char	   *nstr;
 
-	nstr = strcpy((char *) malloc(strlen(string) + 1), string);
+	nstr = (char *) malloc(strlen(string) + 1);
+	if (nstr)
+		strcpy(nstr, string);
 	return nstr;
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/strdup.c,v 1.7 2005/07/28 04:03:14 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/strdup.c,v 1.8 2005/09/27 04:53:23 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -19,10 +19,12 @@`
`19`	`19`
`20`	`20`
`21`	`21`	`char *`
`22`		`-strdup(char const * string)`
	`22`	`+strdup(const char *string)`
`23`	`23`	`{`
`24`	`24`	`char *nstr;`
`25`	`25`
`26`		`- nstr = strcpy((char *) malloc(strlen(string) + 1), string);`
	`26`	`+ nstr = (char *) malloc(strlen(string) + 1);`
	`27`	`+ if (nstr)`
	`28`	`+ strcpy(nstr, string);`
`27`	`29`	`return nstr;`
`28`	`30`	`}`