From 709d20f8c62e03c308279004c1fa93a0ba007b72 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 11 Jan 2017 14:55:34 +0100 Subject: [PATCH] smb/dcerpc: suppress scan-build warnings --- src/app-layer-dcerpc.c | 26 ++++++++++++++++++++++++++ src/app-layer-smb.c | 3 +++ 2 files changed, 29 insertions(+) diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c index 5ba04d9749..407ed819f1 100644 --- a/src/app-layer-dcerpc.c +++ b/src/app-layer-dcerpc.c @@ -1553,7 +1553,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) (dcerpc->dcerpchdr.type == BIND) ? "BIND" : "ALTER_CONTEXT"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1579,7 +1581,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) //parsed -= input_len; SCLogDebug("Error Parsing CTX Item %u\n", parsed); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ dcerpc->dcerpcbindbindack.numctxitemsleft = 0; DCERPCResetParsingState(dcerpc); SCReturnInt(0); @@ -1606,7 +1610,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else { SCLogDebug("Error Parsing DCERPC"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1633,7 +1639,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) (dcerpc->dcerpchdr.type == BIND_ACK) ? "BIND_ACK" : "ALTER_CONTEXT_RESP"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1652,7 +1660,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else if (input_len) { SCLogDebug("Error parsing Secondary Address"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1679,7 +1689,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else if (input_len) { SCLogDebug("Error parsing DCERPC Padding"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1698,7 +1710,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else if (input_len) { SCLogDebug("Error parsing CTX Items"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1721,7 +1735,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else if (input_len) { SCLogDebug("Error parsing CTX Items"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ dcerpc->dcerpcbindbindack.numctxitemsleft = 0; DCERPCResetParsingState(dcerpc); SCReturnInt(0); @@ -1759,7 +1775,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else { SCLogDebug("Error Parsing DCERPC"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1783,8 +1801,10 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) SCLogDebug("Error parsing DCERPC %s", (dcerpc->dcerpchdr.type == REQUEST) ? "REQUEST" : "RESPONSE"); parsed = 0; + (void)parsed; /* for scan-build */ dcerpc->padleft = 0; input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1800,7 +1820,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else if (input_len) { SCLogDebug("Error parsing DCERPC Stub Data"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1842,7 +1864,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else { SCLogDebug("Error Parsing DCERPC"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } @@ -1875,7 +1899,9 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len) } else { SCLogDebug("Error Parsing DCERPC"); parsed = 0; + (void)parsed; /* for scan-build */ input_len = 0; + (void)input_len; /* for scan-build */ DCERPCResetParsingState(dcerpc); SCReturnInt(0); } diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c index 1c2c7063d7..8e23f0e5dd 100644 --- a/src/app-layer-smb.c +++ b/src/app-layer-smb.c @@ -678,6 +678,7 @@ static int32_t DataParser(void *smb_state, AppLayerParserState *pstate, sstate->bytesprocessed += parsed; sstate->bytecount.bytecountleft -= parsed; input_len -= parsed; + (void)input_len; /* for scan-build */ } } SCReturnInt(parsed); @@ -833,7 +834,9 @@ static uint32_t SMBParseByteCount(Flow *f, void *smb_state, sres = DataParser(sstate, pstate, input + parsed, input_len); if (sres != -1 && sres <= (int32_t)input_len) { parsed += (uint32_t)sres; + (void)parsed; /* for scan-build */ input_len -= (uint32_t)sres; + (void)input_len; /* for scan-build */ } else { /* Did not Validate as DCERPC over SMB */ while (sstate->bytecount.bytecountleft-- && input_len--) { SCLogDebug("0x%02x bytecount %"PRIu16"/%"PRIu16" input_len %"PRIu32, *p,