From 45d92a330c8d23ce20f98b0627ecba40400f8b7a Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 17 Mar 2023 14:54:30 +0100 Subject: [PATCH] detect/isdataat: use list util in tests; cleanups --- src/detect-isdataat.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c index 6695bb8238..a032b69368 100644 --- a/src/detect-isdataat.c +++ b/src/detect-isdataat.c @@ -400,28 +400,26 @@ static int DetectIsdataatTestParse03 (void) static int DetectIsdataatTestParse04(void) { Signature *s = SigAlloc(); - int result = 1; + FAIL_IF_NULL(s); - if (DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0) { - SigFree(NULL, s); - return 0; - } + FAIL_IF(DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0); - result &= (DetectIsdataatSetup(NULL, s, "30") == 0); - result &= (s->sm_lists[g_dce_stub_data_buffer_id] == NULL && s->sm_lists[DETECT_SM_LIST_PMATCH] != NULL); + FAIL_IF_NOT(DetectIsdataatSetup(NULL, s, "30") == 0); + SigMatch *sm = DetectBufferGetFirstSigMatch(s, g_dce_stub_data_buffer_id); + FAIL_IF_NOT_NULL(sm); + FAIL_IF_NULL(s->init_data->smlists[DETECT_SM_LIST_PMATCH]); SigFree(NULL, s); s = SigAlloc(); - if (DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0) { - SigFree(NULL, s); - return 0; - } - /* failure since we have no preceding content/pcre/bytejump */ - result &= (DetectIsdataatSetup(NULL, s, "30,relative") == 0); - result &= (s->sm_lists[g_dce_stub_data_buffer_id] == NULL && s->sm_lists[DETECT_SM_LIST_PMATCH] != NULL); + FAIL_IF_NULL(s); + FAIL_IF(DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0); + /* relative w/o preceeding match defaults to "pmatch" */ + FAIL_IF_NOT(DetectIsdataatSetup(NULL, s, "30,relative") == 0); + sm = DetectBufferGetFirstSigMatch(s, g_dce_stub_data_buffer_id); + FAIL_IF_NOT_NULL(sm); + FAIL_IF_NULL(s->init_data->smlists[DETECT_SM_LIST_PMATCH]); SigFree(NULL, s); - FAIL_IF(result == 0); PASS; } -- 2.47.2