valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix unsafe memory operations and warnings in the fatDrive class

Browse source 
- Move imageDiskList from pointer to vector of unique_ptr
- Replace string operations with size-limited versions
- Initialize members
- Eliminate unecessary casts
- Eliminate memory-leak on pointer assignment
This commit is contained in:
krcroft 2019-12-07 11:55:38 -08:00 • committed by Patryk Obara
parent e942a02fcb
commit c9198b2944
11 changed files with 219 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/bios_disk.h
View file

@ -19,7 +19,9 @@
#ifndef DOSBOX_BIOS_DISK_H
#define DOSBOX_BIOS_DISK_H
#include <memory>
#include <stdio.h>
#include <vector>
#ifndef DOSBOX_MEM_H
#include "mem.h"
#endif
@ -55,6 +57,8 @@ public:
Bit8u GetBiosType(void);
Bit32u getSectSize(void);
imageDisk(FILE *imgFile, const char *imgName, Bit32u imgSizeK, bool isHardDisk);
imageDisk(const imageDisk&) = delete; // prevent copy
imageDisk& operator=(const imageDisk&) = delete; // prevent assignment
~imageDisk() { if(diskimg != NULL) { fclose(diskimg); } };
bool hardDrive;
@ -77,8 +81,8 @@ void incrementFDD(void);
#define MAX_DISK_IMAGES (2 + MAX_HDD_IMAGES)
extern imageDisk *imageDiskList[MAX_DISK_IMAGES];
extern imageDisk *diskSwap[MAX_SWAPPABLE_DISKS];
extern std::vector<std::unique_ptr<imageDisk>> imageDiskList;
extern std::vector<std::unique_ptr<imageDisk>> diskSwap;
extern Bit32s swapPosition;
extern Bit16u imgDTASeg; /* Real memory location of temporary DTA pointer for fat image disk access */
extern RealPt imgDTAPtr; /* Real memory location of temporary DTA pointer for fat image disk access */