signed unsigned comparision fix for 64 bit

remotes/origin/master-1.0.x
Kirby Kuehl 16 years ago committed by Victor Julien
parent 7099da431b
commit a8c3718b56

@ -88,7 +88,7 @@ typedef struct dcerpc_hdr_ {
uint32_t call_id; /* 12:04 call identifier */ uint32_t call_id; /* 12:04 call identifier */
}DCERPCHdr; }DCERPCHdr;
#define DCERPC_HDR_LEN 16U #define DCERPC_HDR_LEN 16
struct uuid_entry { struct uuid_entry {
uint16_t ctxid; uint16_t ctxid;

@ -41,6 +41,6 @@ typedef struct nbss_hdr_ {
uint8_t flags; uint8_t flags;
uint32_t length; uint32_t length;
}NBSSHdr; }NBSSHdr;
#define NBSS_HDR_LEN 4U #define NBSS_HDR_LEN 4
#endif /* APPLAYERNBSS_H_ */ #endif /* APPLAYERNBSS_H_ */

@ -508,17 +508,17 @@ static uint32_t PaddingParser(void *smb_state, AppLayerParserState *pstate,
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
uint8_t *p = input; uint8_t *p = input;
/* Check for validity of dataoffset */ /* Check for validity of dataoffset */
if ((sstate->bytesprocessed - NBSS_HDR_LEN) > sstate->andx.dataoffset) { if ((uint32_t)(sstate->bytesprocessed - NBSS_HDR_LEN) > sstate->andx.dataoffset) {
sstate->andx.paddingparsed = 1; sstate->andx.paddingparsed = 1;
SCReturnUInt((uint32_t)(p - input)); SCReturnUInt((uint32_t)(p - input));
} }
while (((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input)) while (((uint32_t)(sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
< sstate->andx.dataoffset && sstate->bytecount.bytecountleft-- < sstate->andx.dataoffset && sstate->bytecount.bytecountleft--
&& input_len--) { && input_len--) {
SCLogDebug("0x%02x ", *p); SCLogDebug("0x%02x ", *p);
p++; p++;
} }
if (((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input)) if (((uint32_t)(sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
== sstate->andx.dataoffset) { == sstate->andx.dataoffset) {
sstate->andx.paddingparsed = 1; sstate->andx.paddingparsed = 1;
} }

@ -29,9 +29,9 @@ typedef struct smb_hdr_ {
uint16_t uid; uint16_t uid;
uint16_t mid; uint16_t mid;
}SMBHdr; }SMBHdr;
#define SMB_HDR_LEN 32U #define SMB_HDR_LEN 32
#define MINIMUM_SMB_LEN 35U #define MINIMUM_SMB_LEN 35
#define NBSS_SMB_HDRS_LEN 36U #define NBSS_SMB_HDRS_LEN 36
typedef struct wordcount_ { typedef struct wordcount_ {
uint8_t wordcount; uint8_t wordcount;

Loading…
Cancel
Save