diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index f11c01a..01bc065 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2611,7 +2611,7 @@
     if (depth > 4)
 	return -1;
 
-    for (;;)
+    while (state != NULL)
     {
 	switch (state->c)
 	{
@@ -2810,7 +2810,7 @@
 	state = state->out;
     }
 
-    /* unrecognized */
+    /* unrecognized, "cannot happen" */
     return -1;
 }
 
diff --git a/src/version.c b/src/version.c
index 9a484dd..1bc2bae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1224,
+/**/
     1223,
 /**/
     1222,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 209ede4..e19874a 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -722,7 +722,7 @@
       while ((length < 0 || p < length) && (c = getc(fp)) != EOF)
 	{
 	  if (fprintf(fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X",
-		(p % cols) ? ", " : ",\n  "+2*!p,  c) < 0)
+		(p % cols) ? ", " : &",\n  "[2*!p],  c) < 0)
 	    die(3);
 	  p++;
 	}
@@ -731,7 +731,7 @@
 
       if (p && fputs("\n", fpo) == EOF)
 	die(3);
-      if (fputs("};\n" + 3 * (fp == stdin), fpo) == EOF)
+      if (fputs(&"};\n"[3 * (fp == stdin)], fpo) == EOF)
 	die(3);
 
       if (fp != stdin)