Fixed buffer overflow reported in #670

diff --git a/coders/sfw.c b/coders/sfw.c
index 5d2cc60c261a0f89efdb030afb93366996185ffd..4a778ea2285b22e5acd48f6124102d6447154d17 100644 (file)
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -126,16 +126,15 @@ static unsigned char *SFWScan(const unsigned char *p,const unsigned char *q,
   register ssize_t
     i;
 
-  if ((p+length) < q)
-    while (p < q)
-    {
-      for (i=0; i < (ssize_t) length; i++)
-        if (p[i] != target[i])
-          break;
-      if (i == (ssize_t) length)
-        return((unsigned char *) p);
-      p++;
-    }
+  while ((p+length) < q)
+  {
+    for (i=0; i < (ssize_t) length; i++)
+      if (p[i] != target[i])
+        break;
+    if (i == (ssize_t) length)
+      return((unsigned char *) p);
+    p++;
+  }
   return((unsigned char *) NULL);
 }