From 487ed2cde6ed4ff98cfbd701d56831e67881cd20 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 27 May 2011 11:40:39 +0200
Subject: [PATCH] Fix potential crash in classtype parsing code.

---
 src/stream-tcp-reassemble.c      | 4 ++++
 src/util-classification-config.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index cdde995fcc..09ac0acf7f 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -449,6 +449,10 @@ static int ReassembleInsertSegment(TcpStream *stream, TcpSegment *seg, Packet *p
     int ret_value = 0;
     char return_seg = FALSE;
 
+    if (seg == NULL) {
+        goto end;
+    }
+
     if (list_seg == NULL) {
         SCLogDebug("empty list, inserting seg %p seq %" PRIu32 ", "
                    "len %" PRIu32 "", seg, seg->seq, seg->payload_len);
diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 85e5add416..72bcae36f1 100644
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -236,6 +236,9 @@ int SCClassConfAddClasstype(char *rawstr, uint8_t index, DetectEngineCtx *de_ctx
         SCLogInfo("pcre_get_substring() failed");
         goto error;
     }
+    if (ct_priority_str == NULL) {
+        goto error;
+    }
 
     ct_priority = atoi(ct_priority_str);