From 5e85684e405a8ca94ed4f77f18f9210d6a83ea0d Mon Sep 17 00:00:00 2001
From: Steve Pinkham <steve.pinkham@gmail.com>
Date: Fri, 27 Aug 2010 11:47:18 -0400
Subject: [PATCH] 1.60b: Minor sniffer fix to better handle CSV file checks

---
 ChangeLog  | 5 +++++
 Makefile   | 2 +-
 analysis.c | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e20be66..749e94f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Version 1.60b:
+--------------
+
+  - Minor sniffer fix to better handle CSV file checks.
+
 Version 1.59b:
 --------------
 
diff --git a/Makefile b/Makefile
index a80f9fc..6c380b2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 #
 
 PROGNAME   = skipfish
-VERSION    = 1.59b
+VERSION    = 1.60b
 
 OBJFILES   = http_client.c database.c crawler.c analysis.c report.c
 INCFILES   = alloc-inl.h string-inl.h debug.h types.h http_client.h \
diff --git a/analysis.c b/analysis.c
index a95c9fb..6ead0b9 100644
--- a/analysis.c
+++ b/analysis.c
@@ -2462,11 +2462,13 @@ static void check_for_stuff(struct http_request* req,
   if (res->sniff_mime_id == MIME_ASC_GENERIC) {
     u8* cur = res->payload;
     u8  all_delim = 0;
+    u8* eol;
 
     do {
-      u8 *eol = (u8*)strchr((char*)cur, '\n');
       u32 del = strcspn((char*)cur, ",|;\n");
 
+      eol = (u8*)strchr((char*)cur, '\n');
+
       if (!cur[del] || cur[del] == '\n') {
         all_delim = 0;
         break;
@@ -2475,7 +2477,7 @@ static void check_for_stuff(struct http_request* req,
       all_delim = 1;
       cur = eol + 1;
 
-    } while (cur && *cur);
+    } while (eol && cur && *cur);
 
     if (all_delim) {
       problem(PROB_FILE_POI, req, res,