folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CARD: Avoid potential truncation warnings when allocating the deck buffer

Browse source 
Card decks will never be excessively large (> uint32) since there never
was a computer room big enough to hold that many cards. :-)

Hopper counts and size are all of type t_addr since they are referenced
relative to uptr->pos which tracks the hopper position.  That state is
managed so position is properly managed across a SAVE/RESTORE.

On some systems that use sim_card, t_addr is 64bits, hence
This commit is contained in:
Mark Pizzolato 2020-01-18 10:44:16 -08:00
parent 0970c067a8
commit 9bc5014787
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sim_card.c
View file

@ -931,9 +931,9 @@ _sim_read_deck(UNIT * uptr, int eof)
if (data->hopper_cards >= data->hopper_size) {
data->hopper_size += DECK_SIZE;
data->images = (uint16 (*)[1][80])realloc(data->images,
data->hopper_size * sizeof(*(data->images)));
(size_t)data->hopper_size * sizeof(*(data->images)));
memset(&data->images[data->hopper_cards], 0,
(data->hopper_size - data->hopper_cards) *
(size_t)(data->hopper_size - data->hopper_cards) *
sizeof(*(data->images)));
}
@ -961,9 +961,9 @@ _sim_read_deck(UNIT * uptr, int eof)
if (data->hopper_cards >= data->hopper_size) {
data->hopper_size += DECK_SIZE;
data->images = (uint16 (*)[1][80])realloc(data->images,
data->hopper_size * sizeof(*(data->images)));
(size_t)data->hopper_size * sizeof(*(data->images)));
memset(&data->images[data->hopper_cards], 0,
(data->hopper_size - data->hopper_cards) *
(size_t)(data->hopper_size - data->hopper_cards) *
sizeof(*(data->images)));
}