From ab28a6253f4e6b95490ae50ad5b2c872e01c29ef Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 2 Nov 2011 16:00:13 +0100 Subject: [PATCH] Fix broken fix. Shame on me for committing without testing. --- src/detect-ipproto.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c index 6ec4c65319..45b2815dec 100644 --- a/src/detect-ipproto.c +++ b/src/detect-ipproto.c @@ -354,14 +354,14 @@ static int DetectIPProtoSetup(DetectEngineCtx *de_ctx, Signature *s, char *optst j++; } #endif - } - } else { - for (i = 0; i < (data->proto / 8); i++) { - s->proto.proto[i] = 0; - } - s->proto.proto[data->proto / 8] &= 0xfe << (data->proto % 8); - for (i = (data->proto / 8) + 1; i < (256 / 8); i++) { - s->proto.proto[i] &= 0xff; + } else { + for (i = 0; i < (data->proto / 8); i++) { + s->proto.proto[i] = 0; + } + s->proto.proto[data->proto / 8] &= 0xfe << (data->proto % 8); + for (i = (data->proto / 8) + 1; i < (256 / 8); i++) { + s->proto.proto[i] &= 0xff; + } } } } @@ -474,14 +474,14 @@ static int DetectIPProtoSetup(DetectEngineCtx *de_ctx, Signature *s, char *optst j++; } #endif - } - } else { - for (i = 0; i < (data->proto / 8); i++) { - s->proto.proto[i] &= 0xFF; - } - s->proto.proto[data->proto / 8] &= ~(0xff << (data->proto % 8)); - for (i = (data->proto / 8) + 1; i < (256 / 8); i++) { - s->proto.proto[i] = 0; + } else { + for (i = 0; i < (data->proto / 8); i++) { + s->proto.proto[i] &= 0xFF; + } + s->proto.proto[data->proto / 8] &= ~(0xff << (data->proto % 8)); + for (i = (data->proto / 8) + 1; i < (256 / 8); i++) { + s->proto.proto[i] = 0; + } } } }