aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coverity - detect-engine-sigorder.c - remove some dummy null checks

Browse Source
remotes/origin/master-1.0.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent f54330bc8b
commit d3d4eacfb4
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File

23
src/detect-engine-sigorder.c
Unescape Escape View File

@ -321,8 +321,6 @@ static void SCSigOrderByAction(DetectEngineCtx *de_ctx,
} }
/* set the min signature for this keyword, for the next ordering function */ /* set the min signature for this keyword, for the next ordering function */
if (sw == NULL)
return;
min = sw; min = sw;
while (min != NULL && min != sw->min) { while (min != NULL && min != sw->min) {
if (min->sig->action != sw->sig->action) if (min->sig->action != sw->sig->action)
@ -333,8 +331,6 @@ static void SCSigOrderByAction(DetectEngineCtx *de_ctx,
sw->min = min; sw->min = min;
/* set the max signature for this keyword + 1, for the next ordering func */ /* set the max signature for this keyword + 1, for the next ordering func */
if (sw == NULL)
return;
max = sw; max = sw;
while (max != NULL && max != sw->max) { while (max != NULL && max != sw->max) {
if (max->sig->action != sw->sig->action) if (max->sig->action != sw->sig->action)
@ -426,8 +422,6 @@ static void SCSigOrderByFlowbits(DetectEngineCtx *de_ctx,
} }
/* set the min signature for this keyword, for the next ordering function */ /* set the min signature for this keyword, for the next ordering function */
if (sw == NULL)
return;
min = sw; min = sw;
while (min != NULL && min != sw->min) { while (min != NULL && min != sw->min) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWBITS])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWBITS])) !=
@ -439,8 +433,6 @@ static void SCSigOrderByFlowbits(DetectEngineCtx *de_ctx,
sw->min = min; sw->min = min;
/* set the max signature for this keyword + 1, for the next ordering func */ /* set the max signature for this keyword + 1, for the next ordering func */
if (sw == NULL)
return;
max = sw; max = sw;
while (max!= NULL && max != sw->max) { while (max!= NULL && max != sw->max) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWBITS])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWBITS])) !=
@ -534,8 +526,6 @@ static void SCSigOrderByFlowvar(DetectEngineCtx *de_ctx,
} }
/* set the min signature for this keyword, for the next ordering function */ /* set the min signature for this keyword, for the next ordering function */
if (sw == NULL)
return;
min = sw; min = sw;
while (min != NULL && min != sw->min) { while (min != NULL && min != sw->min) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWVAR])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWVAR])) !=
@ -547,8 +537,6 @@ static void SCSigOrderByFlowvar(DetectEngineCtx *de_ctx,
sw->min = min; sw->min = min;
/* set the max signature for this keyword + 1, for the next ordering func */ /* set the max signature for this keyword + 1, for the next ordering func */
if (sw == NULL)
return;
max = sw; max = sw;
while (max != NULL && max != sw->max) { while (max != NULL && max != sw->max) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWVAR])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_FLOWVAR])) !=
@ -640,9 +628,6 @@ static void SCSigOrderByPktvar(DetectEngineCtx *de_ctx,
} }
/* set the min signature for this keyword, for the next ordering function */ /* set the min signature for this keyword, for the next ordering function */
if (sw == NULL)
return;
min = sw; min = sw;
while (min != NULL && min != sw->min) { while (min != NULL && min != sw->min) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_PKTVAR])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_PKTVAR])) !=
@ -654,8 +639,6 @@ static void SCSigOrderByPktvar(DetectEngineCtx *de_ctx,
sw->min = min; sw->min = min;
/* set the max signature for this keyword + 1, for the next ordering func */ /* set the max signature for this keyword + 1, for the next ordering func */
if (sw == NULL)
return;
max = sw; max = sw;
while (max != NULL && max != sw->max) { while (max != NULL && max != sw->max) {
if ( *((int *)(sw->user[SC_RADIX_USER_DATA_PKTVAR])) != if ( *((int *)(sw->user[SC_RADIX_USER_DATA_PKTVAR])) !=
@ -747,9 +730,6 @@ static void SCSigOrderByPriority(DetectEngineCtx *de_ctx,
} }
/* set the min signature for this keyword, for the next ordering function */ /* set the min signature for this keyword, for the next ordering function */
if (sw == NULL)
return;
min = sw; min = sw;
while (min != NULL && min != sw->min) { while (min != NULL && min != sw->min) {
if (min->sig->prio != sw->sig->prio) if (min->sig->prio != sw->sig->prio)
@ -760,9 +740,6 @@ static void SCSigOrderByPriority(DetectEngineCtx *de_ctx,
sw->min = min; sw->min = min;
/* set the max signature for this keyword + 1, for the next ordering func */ /* set the max signature for this keyword + 1, for the next ordering func */
if (sw == NULL)
return;
max = sw; max = sw;
while (max != NULL && max != sw->max) { while (max != NULL && max != sw->max) {
if (max->sig->prio != sw->sig->prio) if (max->sig->prio != sw->sig->prio)

Write Preview
Loading…
Cancel
Save