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

util: fix integer warnings in mime decoding

Browse Source 
Ticket: #4516
pull/7511/head
Philippe Antoine 3 years ago committed by Victor Julien
parent 9d6e5558f1
commit 7acdece7d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/util-decode-mime.c
Unescape Escape View File

@ -1224,7 +1224,7 @@ static uint8_t ProcessBase64Remainder(
const uint8_t *buf, const uint32_t len, MimeDecParseState *state, int force) const uint8_t *buf, const uint32_t len, MimeDecParseState *state, int force)
{ {
uint8_t buf_consumed = 0; /* consumed bytes from 'buf' */ uint8_t buf_consumed = 0; /* consumed bytes from 'buf' */
uint32_t cnt = 0; uint8_t cnt = 0;
uint8_t block[B64_BLOCK]; uint8_t block[B64_BLOCK];
/* should be impossible, but lets be defensive */ /* should be impossible, but lets be defensive */
@ -1345,7 +1345,7 @@ static int ProcessBase64BodyLine(const uint8_t *buf, uint32_t len,
uint32_t left = len - consumed; uint32_t left = len - consumed;
if (left < B64_BLOCK) { if (left < B64_BLOCK) {
memcpy(state->bvremain, buf + consumed, left); memcpy(state->bvremain, buf + consumed, left);
state->bvr_len = left; state->bvr_len = (uint8_t)left;
return MIME_DEC_OK; return MIME_DEC_OK;
} }
remaining -= consumed; remaining -= consumed;
@ -1408,7 +1408,7 @@ static int ProcessBase64BodyLine(const uint8_t *buf, uint32_t len,
/* If remaining is 4 by this time, we encountered spaces during processing */ /* If remaining is 4 by this time, we encountered spaces during processing */
DEBUG_VALIDATE_BUG_ON(state->bvr_len != 0); DEBUG_VALIDATE_BUG_ON(state->bvr_len != 0);
memcpy(state->bvremain, buf + offset + consumed_bytes, leftover_bytes); memcpy(state->bvremain, buf + offset + consumed_bytes, leftover_bytes);
state->bvr_len = leftover_bytes; state->bvr_len = (uint8_t)leftover_bytes;
return MIME_DEC_OK; return MIME_DEC_OK;
} }

Write Preview
Loading…
Cancel
Save