Improve message for errors in compiling anonymous PL/Python blocks

petere · petere · commit 719461b7a28c · 2011-01-19T00:04:46.000+02:00
The previous code would try to print out a null pointer.

Jan Urbański
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
@@ -1625,7 +1625,11 @@ PLy_procedure_compile(PLyProcedure *proc, const char *src)
 			return;
 	}
 
-	PLy_elog(ERROR, "could not compile PL/Python function \"%s\"", proc->proname);
+	if (proc->proname)
+		PLy_elog(ERROR, "could not compile PL/Python function \"%s\"",
+				 proc->proname);
+	else
+		PLy_elog(ERROR, "could not compile anonymous PL/Python code block");
 }
 
 static char *

Original file line number	Diff line number	Diff line change
`@@ -1625,7 +1625,11 @@ PLy_procedure_compile(PLyProcedure proc, const char src)`
`1625`	`1625`	`return;`
`1626`	`1626`	`}`
`1627`	`1627`
`1628`		`- PLy_elog(ERROR, "could not compile PL/Python function \"%s\"", proc->proname);`
	`1628`	`+ if (proc->proname)`
	`1629`	`+ PLy_elog(ERROR, "could not compile PL/Python function \"%s\"",`
	`1630`	`+ proc->proname);`
	`1631`	`+ else`
	`1632`	`+ PLy_elog(ERROR, "could not compile anonymous PL/Python code block");`
`1629`	`1633`	`}`
`1630`	`1634`
`1631`	`1635`	`static char *`