Fix bug found by warning from recent gcc. patch from Tim Bunce.

adunstan · adunstan · commit 1f98cccb9418 · 2010-01-28T23:06:09.000Z
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.161 2010/01/26 23:11:56 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.162 2010/01/28 23:06:09 adunstan Exp $
  *
  **********************************************************************/
 
@@ -1113,8 +1113,11 @@ plperl_create_sub(plperl_proc_desc *prodesc, char *s, Oid fn_oid)
 
 	if (count == 1) {
 		GV *sub_glob = (GV*)POPs;
-		if (sub_glob && SvTYPE(sub_glob) == SVt_PVGV)
-			subref = newRV_inc((SV*)GvCVu((GV*)sub_glob));
+		if (sub_glob && SvTYPE(sub_glob) == SVt_PVGV) {
+			SV *sv = (SV*)GvCVu((GV*)sub_glob);
+			if (sv)
+				subref = newRV_inc(sv);
+		}
 	}
 
 	PUTBACK;

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.161 2010/01/26 23:11:56 adunstan Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.162 2010/01/28 23:06:09 adunstan Exp $`
`5`	`5`	`*`
`6`	`6`	`**********************************************************************/`
`7`	`7`
`@@ -1113,8 +1113,11 @@ plperl_create_sub(plperl_proc_desc prodesc, char s, Oid fn_oid)`
`1113`	`1113`
`1114`	`1114`	`if (count == 1) {`
`1115`	`1115`	`GV sub_glob = (GV)POPs;`
`1116`		`- if (sub_glob && SvTYPE(sub_glob) == SVt_PVGV)`
`1117`		`- subref = newRV_inc((SV)GvCVu((GV)sub_glob));`
	`1116`	`+ if (sub_glob && SvTYPE(sub_glob) == SVt_PVGV) {`
	`1117`	`+ SV sv = (SV)GvCVu((GV*)sub_glob);`
	`1118`	`+ if (sv)`
	`1119`	`+ subref = newRV_inc(sv);`
	`1120`	`+ }`
`1118`	`1121`	`}`
`1119`	`1122`
`1120`	`1123`	`PUTBACK;`