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

DISK: Fix a few Coverity issues

Browse source
This commit is contained in:
Mark Pizzolato 2022-03-10 16:44:57 -08:00
parent 9b2f13d443
commit 6ad8a528d7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim_disk.c
View file

@ -2257,7 +2257,7 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
memset (f->CreationTime, 0, sizeof (f->CreationTime)); memset (f->CreationTime, 0, sizeof (f->CreationTime));
strlcpy ((char*)f->CreationTime, ctime (&creation_time), sizeof (f->CreationTime)); strlcpy ((char*)f->CreationTime, ctime (&creation_time), sizeof (f->CreationTime));
container_size = sim_vhd_disk_size (uptr->fileref); container_size = sim_vhd_disk_size (uptr->fileref);
if ((f->SectorCount != 0) && (NtoHl (f->SectorSize) <= 65536)) /* Range check for Coverity sake */ if ((f->SectorSize != 0) && (NtoHl (f->SectorSize) <= 65536)) /* Range check for Coverity sake */
f->SectorCount = NtoHl ((uint32)(container_size / NtoHl (f->SectorSize))); f->SectorCount = NtoHl ((uint32)(container_size / NtoHl (f->SectorSize)));
container_size += sizeof (*f); /* Adjust since it is removed below */ container_size += sizeof (*f); /* Adjust since it is removed below */
f->AccessFormat = DKUF_F_VHD; f->AccessFormat = DKUF_F_VHD;
@ -6165,7 +6165,7 @@ while (BytesToWrite && (r == SCPE_OK)) {
if (BlockNumber >= NtoHl(hVHD->Dynamic.MaxTableEntries)) { if (BlockNumber >= NtoHl(hVHD->Dynamic.MaxTableEntries)) {
return SCPE_EOF; return SCPE_EOF;
} }
if (BlockNumber != (Offset + BytesToWrite) / NtoHl (hVHD->Dynamic.BlockSize)) if (BlockNumber != (Offset + BytesToWrite) / DynamicBlockSize)
BytesInWrite = (uint32)(((BlockNumber + 1) * DynamicBlockSize) - Offset); BytesInWrite = (uint32)(((BlockNumber + 1) * DynamicBlockSize) - Offset);
if (hVHD->BAT[BlockNumber] == VHD_BAT_FREE_ENTRY) { if (hVHD->BAT[BlockNumber] == VHD_BAT_FREE_ENTRY) {
uint8 *BitMap = NULL; uint8 *BitMap = NULL;
@ -6528,7 +6528,7 @@ if (info->flag == 0) {
get_disk_footer (uptr); get_disk_footer (uptr);
f = ctx->footer; f = ctx->footer;
if (f) { if (f) {
t_offset highwater_sector = ((((t_offset)NtoHl (f->Highwater[0])) << 32) | ((t_offset)NtoHl (f->Highwater[1]))) / NtoHl(f->SectorSize); t_offset highwater_sector = (f->SectorSize == 0) ? (t_offset)-1 : ((((t_offset)NtoHl (f->Highwater[0])) << 32) | ((t_offset)NtoHl (f->Highwater[1]))) / NtoHl(f->SectorSize);
sim_printf ("Container: %s\n" sim_printf ("Container: %s\n"
" Simulator: %s\n" " Simulator: %s\n"