OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

boot_serial: Fix `incompatible-pointer-types` warning 

The variable `rc` was declared as int and then implicitly casted to
`size_t` when passed to `base64_decode`, which on 64 bit architectures
is wrong.

Signed-off-by: Lluis Campos <lluis.campos@northern.tech>
(cherry picked from commit dd4d6541c8)
This commit is contained in:
Lluis Campos 2024-08-20 14:37:54 +02:00 committed by Jamie McCrae
parent 60ac682a12
commit 157547c889
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/boot_serial/src/boot_serial.c
View File

@ -1133,7 +1133,7 @@ boot_serial_output(void)
static int static int
boot_serial_in_dec(char *in, int inlen, char *out, int *out_off, int maxout) boot_serial_in_dec(char *in, int inlen, char *out, int *out_off, int maxout)
{ {
int rc; size_t rc;
uint16_t crc; uint16_t crc;
uint16_t len; uint16_t len;
@ -1145,7 +1145,7 @@ boot_serial_in_dec(char *in, int inlen, char *out, int *out_off, int maxout)
} }
#elif __ESPRESSIF__ #elif __ESPRESSIF__
int err; int err;
err = base64_decode((unsigned char *)&out[*out_off], maxout - *out_off, (size_t *)&rc, (unsigned char *)in, inlen); err = base64_decode((unsigned char *)&out[*out_off], maxout - *out_off, &rc, (unsigned char *)in, inlen);
if (err) { if (err) {
return -1; return -1;
} }