From d3675d519701f6a2835109628b1979f44e727c98 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sat, 28 Jan 2023 11:28:23 +0100 Subject: [PATCH] detect/krb5.cname: update buffer initialization logic --- src/detect-krb5-cname.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c index eef48d0c6c..d6ca24f519 100644 --- a/src/detect-krb5-cname.c +++ b/src/detect-krb5-cname.c @@ -56,9 +56,8 @@ static int DetectKrb5CNameSetup(DetectEngineCtx *de_ctx, Signature *s, const cha } static InspectionBuffer *GetKrb5CNameData(DetectEngineThreadCtx *det_ctx, - const DetectEngineTransforms *transforms, - Flow *_f, const struct Krb5PrincipalNameDataArgs *cbdata, - int list_id, bool first) + const DetectEngineTransforms *transforms, Flow *_f, + const struct Krb5PrincipalNameDataArgs *cbdata, int list_id) { SCEnter(); @@ -66,7 +65,7 @@ static InspectionBuffer *GetKrb5CNameData(DetectEngineThreadCtx *det_ctx, InspectionBufferMultipleForListGet(det_ctx, list_id, cbdata->local_id); if (buffer == NULL) return NULL; - if (!first && buffer->inspect != NULL) + if (buffer->initialized) return buffer; uint32_t b_len = 0; @@ -95,8 +94,8 @@ static uint8_t DetectEngineInspectKrb5CName(DetectEngineCtx *de_ctx, DetectEngin while (1) { struct Krb5PrincipalNameDataArgs cbdata = { local_id, txv, }; - InspectionBuffer *buffer = GetKrb5CNameData(det_ctx, - transforms, f, &cbdata, engine->sm_list, false); + InspectionBuffer *buffer = + GetKrb5CNameData(det_ctx, transforms, f, &cbdata, engine->sm_list); if (buffer == NULL || buffer->inspect == NULL) break; @@ -149,8 +148,7 @@ static void PrefilterTxKrb5CName(DetectEngineThreadCtx *det_ctx, const void *pec // loop until we get a NULL struct Krb5PrincipalNameDataArgs cbdata = { local_id, txv }; - InspectionBuffer *buffer = GetKrb5CNameData(det_ctx, ctx->transforms, - f, &cbdata, list_id, true); + InspectionBuffer *buffer = GetKrb5CNameData(det_ctx, ctx->transforms, f, &cbdata, list_id); if (buffer == NULL) break;