Index: src/bin/psql/describe.c
===================================================================
--- src/bin/psql/describe.c
+++ src/bin/psql/describe.c	2008-12-25 20:10:07.900149623 +0100
@@ -1291,7 +1291,7 @@
 									 footers, &count_footers, tmpbuf, false))
 				{
 					appendPQExpBuffer(&buf, ", ");
-					appendPQExpBuffer(&buf, tmpbuf.data);
+					appendPQExpBuffer(&buf, "%s", tmpbuf.data);
 
 					count_footers -= 2;
 				}
Index: src/backend/commands/trigger.c
===================================================================
--- src/backend/commands/trigger.c
+++ src/backend/commands/trigger.c	2008-12-25 20:04:19.366148900 +0100
@@ -600,7 +600,7 @@
 		ereport(NOTICE,
 		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
 				constr_name, buf.data),
-		 errdetail(funcdescr[funcnum])));
+		 errdetail("%s", funcdescr[funcnum])));
 		oldContext = MemoryContextSwitchTo(TopMemoryContext);
 		info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
 		info->args = copyObject(stmt->args);
@@ -616,7 +616,7 @@
 		ereport(NOTICE,
 		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
 				constr_name, buf.data),
-		 errdetail(funcdescr[funcnum])));
+		 errdetail("%s", funcdescr[funcnum])));
 	}
 	else
 	{
@@ -628,7 +628,7 @@
 		ereport(NOTICE,
 				(errmsg("converting trigger group into constraint \"%s\" %s",
 						constr_name, buf.data),
-				 errdetail(funcdescr[funcnum])));
+				 errdetail("%s", funcdescr[funcnum])));
 		if (funcnum == 2)
 		{
 			/* This trigger is on the FK table */
Index: src/backend/utils/misc/guc.c
===================================================================
--- src/backend/utils/misc/guc.c
+++ src/backend/utils/misc/guc.c	2008-12-25 20:08:39.853148918 +0100
@@ -4425,7 +4425,7 @@
 								(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("invalid value for parameter \"%s\": \"%s\"",
 								name, value),
-								 hintmsg ? errhint(hintmsg) : 0));
+								 hintmsg ? errhint("%s", hintmsg) : 0));
 						return false;
 					}
 					if (newval < conf->min || newval > conf->max)
Index: src/backend/tcop/utility.c
===================================================================
--- src/backend/tcop/utility.c
+++ src/backend/tcop/utility.c	2008-12-25 20:05:57.923149023 +0100
@@ -129,7 +129,7 @@
 	ereport(ERROR,
 			(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 			 errmsg(rentry->nota_msg, relname),
-			 (wentry->kind != '\0') ? errhint(wentry->drophint_msg) : 0));
+			 (wentry->kind != '\0') ? errhint("%s", wentry->drophint_msg) : 0));
 }
 
 /*
Index: contrib/xml2/xpath.c
===================================================================
--- contrib/xml2/xpath.c
+++ contrib/xml2/xpath.c	2008-12-25 20:24:03.187149123 +0100
@@ -129,7 +129,7 @@
 		if (pgxml_errorMsg == NULL)
 		{
 			ereport(level, (errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
-							errmsg(explain)));
+							errmsg("%s", explain)));
 		}
 		else
 		{