From c7d2a24438b8088284087a8f4e0b0aff6247eae9 Mon Sep 17 00:00:00 2001 From: Steve Pinkham Date: Tue, 9 Aug 2011 16:08:08 -0400 Subject: [PATCH] 2.02b: Fixed a minor NULL pointer crash in -Y mode --- ChangeLog | 5 +++++ Makefile | 2 +- config.h | 2 +- crawler.c | 6 +++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a15d811..bc669de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Version 2.02b: +-------------- + + - Fixed a minor NULL pointer crash in -Y mode. + Version 2.01b: -------------- diff --git a/Makefile b/Makefile index 5bcb41c..005c852 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # PROGNAME = skipfish -VERSION = 2.01b +VERSION = 2.02b 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/config.h b/config.h index ab2fe35..616ae08 100644 --- a/config.h +++ b/config.h @@ -111,7 +111,7 @@ #ifdef QUEUE_FILO #define DICT_BATCH 100 /* Brute-force queue block */ #else -#define DICT_BATCH 600 /* Brute-force queue block */ +#define DICT_BATCH 300 /* Brute-force queue block */ #endif /* ^QUEUE_FILO */ /* Single query for IPS detection - Evil Query of Doom (tm). */ diff --git a/crawler.c b/crawler.c index 8b8d3bb..6f67d6f 100644 --- a/crawler.c +++ b/crawler.c @@ -642,7 +642,11 @@ static void secondary_ext_start(struct pivot_desc* pv, struct http_request* req, /* Avoid foo.bar.bar. */ - if (!strcasecmp((char*)lpos + 1, (char*)ex)){ i++; ck_free(tmp); continue; } + if (lpos && !strcasecmp((char*)lpos + 1, (char*)ex)) { + i++; + ck_free(tmp); + continue; + } sprintf((char*)tmp, "%s.%s", base_name, ex);