src: remove direct calls to abort

use BUG_ON macros instead

Ticket: 1484

diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 1b223da8a8bad63659d844af48cdd9fe713883cb..11aae4dc46714ee3b5e96cc90e75b4dad0301c7b 100644 (file)
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -96,10 +96,8 @@ static void RegisterInternal(const char *name, int direction, int priority,
 
     BUG_ON(tx_min_progress >= 48);
 
-    if (PrefilterRegister == PrefilterGenericMpmRegister && GetData == NULL) {
-        // must register GetData with PrefilterGenericMpmRegister
-        abort();
-    }
+    // must register GetData with PrefilterGenericMpmRegister
+    BUG_ON(PrefilterRegister == PrefilterGenericMpmRegister && GetData == NULL);
 
     DetectBufferTypeSupportsMpm(name);
     DetectBufferTypeSupportsTransformations(name);
@@ -557,10 +555,8 @@ void DetectPktMpmRegister(const char *name, int priority,
     SCLogDebug("registering %s/%d/%p/%p", name, priority,
             PrefilterRegister, GetData);
 
-    if (PrefilterRegister == PrefilterGenericMpmPktRegister && GetData == NULL) {
-        // must register GetData with PrefilterGenericMpmRegister
-        abort();
-    }
+    // must register GetData with PrefilterGenericMpmRegister
+    BUG_ON(PrefilterRegister == PrefilterGenericMpmPktRegister && GetData == NULL);
 
     DetectBufferTypeSupportsMpm(name);
     DetectBufferTypeSupportsTransformations(name);
@@ -2156,8 +2152,7 @@ static void PrepareMpms(DetectEngineCtx *de_ctx, SigGroupHead *sh)
                 break;
             }
             default:
-                abort();
-                break;
+                BUG_ON(1);
         }
     }
 

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 5dc47308a67cdc9e4f57714cb40759e3f45f983e..6b57b2f2c381526642a78c8fae109e968dbe44ec 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -865,11 +865,9 @@ int DetectEngineAppInspectionEngine2Signature(DetectEngineCtx *de_ctx, Signature
      */
     if (s->init_data->buffer_index == 0 && s->init_data->hook.type == SIGNATURE_HOOK_TYPE_APP) {
         uint8_t dir = 0;
-        if ((s->flags & (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT)) ==
-                (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT))
-            abort();
-        if ((s->flags & (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT)) == 0)
-            abort();
+        BUG_ON((s->flags & (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT)) ==
+                (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT));
+        BUG_ON((s->flags & (SIG_FLAG_TOSERVER | SIG_FLAG_TOCLIENT)) == 0);
         if (s->flags & SIG_FLAG_TOSERVER)
             dir = 0;
         else if (s->flags & SIG_FLAG_TOCLIENT)

diff --git a/src/output-tx.c b/src/output-tx.c
index 34ca6ee6bb8dcecfc0022d18b77363b99b7e51a4..c64589fb098b940cf3bb80497f08bd4a6291e524 100644 (file)
--- a/src/output-tx.c
+++ b/src/output-tx.c
@@ -158,7 +158,7 @@ static inline void OutputTxLogFiles(ThreadVars *tv, OutputFileLoggerThreadData *
         packet_dir_ready = eof | tc_ready | tc_eof;
         opposing_tx_ready = ts_ready;
     } else {
-        abort();
+        DEBUG_VALIDATE_BUG_ON(1);
     }
 
     SCLogDebug("eof %d ts_ready %d ts_eof %d", eof, ts_ready, ts_eof);

diff --git a/src/tm-threads.c b/src/tm-threads.c
index dd65de620e7ad154bc58884517834e08979a1b34..03daa0a4af02b14371ecdfd9d43a1a3ffd704ba5 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -1501,7 +1501,7 @@ static void TmThreadDebugValidateNoMorePackets(void)
         if (ThreadStillHasPackets(tv)) {
             SCMutexUnlock(&tv_root_lock);
             TmThreadDumpThreads();
-            abort();
+            DEBUG_VALIDATE_BUG_ON(1);
         }
     }
     SCMutexUnlock(&tv_root_lock);

diff --git a/src/util-radix6-tree.c b/src/util-radix6-tree.c
index 725ffbae1409e5fb5da01d7497d47212c424d4e6..27e917e8a13ad8965ec693a11a207375bb85ccc7 100644 (file)
--- a/src/util-radix6-tree.c
+++ b/src/util-radix6-tree.c
@@ -240,7 +240,7 @@ static void SCRadix6ValidateIPv6Key(uint8_t *key, const uint8_t netmask)
         PrintInet(AF_INET6, (void *)&address, ostr, sizeof(ostr));
         PrintInet(AF_INET6, (void *)&masked, nstr, sizeof(nstr));
         SCLogNotice("input %s/%u != expected %s/%u", ostr, netmask, nstr, netmask);
-        abort();
+        DEBUG_VALIDATE_BUG_ON(1);
     }
 }
 #endif