--- diffutils-2.8.7/src/diff3.c
+++ diffutils-2.8.7/src/diff3.c
@@ -1406,7 +1406,7 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff,
 	      line = 0;
 	      do
 		{
-		  fprintf (outputfile, line_prefix);
+		  fprintf (outputfile, "%s", line_prefix);
 		  cp = D_RELNUM (ptr, realfile, line);
 		  length = D_RELLEN (ptr, realfile, line);
 		  fwrite (cp, sizeof (char), length, outputfile);
--- diffutils-2.8.7/src/sdiff.c
+++ diffutils-2.8.7/src/sdiff.c
@@ -906,7 +906,7 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen,
       int cmd0, cmd1;
       bool gotcmd = false;
 
-      cmd1 = 0; /* Pacify `gcc -W'.  */
+      cmd0 = cmd1 = 0; /* Pacify `gcc -W'.  */
 
       while (! gotcmd)
 	{