mwalbeck/rtl_433
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor: Fix unaligned address, heap overflow in data array print

Browse source
This commit is contained in:
Christian W. Zuckschwerdt 2023-03-18 21:15:51 +01:00
parent 9cb1472bdf
commit a7c1d0c6a6
2 changed files with 8 additions and 4 deletions
include
data.h
src
data.c

8
include/data.h
View file

@ -58,10 +58,12 @@ typedef struct data_array {
void *values;
} data_array_t;
// Note: Do not unwrap a packed array to data_value_t,
// on 32-bit the union has different size/alignment than a pointer.
typedef union data_value {
int v_int;
double v_dbl;
void *v_ptr;
int v_int; /**< A data value of type int, 4 bytes size/alignment */
double v_dbl; /**< A data value of type double, 8 bytes size/alignment */
void *v_ptr; /**< A data value pointer, 4/8 bytes size/alignment */
} data_value_t;
typedef struct data {

4
src/data.c
View file

@ -409,7 +409,9 @@ R_API void print_array_value(data_output_t *output, data_array_t *array, char co
memcpy(&value, (char *)array->values + element_size * idx, element_size);
print_value(output, array->type, value, format);
} else {
print_value(output, array->type, *(data_value_t*)((char *)array->values + element_size * idx), format);
// Note: on 32-bit data_value_t has different size/alignment than a pointer!
value.v_ptr = *(void **)((char *)array->values + element_size * idx);
print_value(output, array->type, value, format);
}
}