1 files changed, 8 insertions, 12 deletions
diff --git a/lib/flags.ml b/lib/flags.ml
index f9c855d86e..0635ad7c1f 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -112,18 +112,14 @@ let boxed_definitions _ = !boxed_definitions
 
 let subst_command_placeholder s t =
   let buff = Buffer.create (String.length s + String.length t) in
-    if String.length s < 2 then
-      Buffer.add_string buff s
-    else
-      begin
-	let i = ref 0 in
-	  while (!i <= String.length s - 2) do
-	    if s.[!i] = '%' & s.[!i+1] = 's' then (Buffer.add_string buff t;incr i)
-	    else Buffer.add_char buff s.[!i];
-	    incr i
-	  done
-      end;
-    Buffer.contents buff
+  let i = ref 0 in
+  while (!i < String.length s) do
+    if s.[!i] = '%' & !i+1 < String.length s & s.[!i+1] = 's'
+    then (Buffer.add_string buff t;incr i)
+    else Buffer.add_char buff s.[!i];
+    incr i
+  done;
+  Buffer.contents buff
 
 let browser_cmd_fmt =
  try