LIV2/lide.device
1
0
Fork 0
mirror of https://github.com/LIV2/lide.device.git synced 2025-12-06 00:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more potential memory leaks

Browse Source
This commit is contained in:
Matt Harlum 2025-01-29 08:01:00 +00:00
parent f077aa3933
commit bca771074c
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
device.c
View File

@ -79,7 +79,7 @@ char * set_dev_name(struct DeviceBase *dev) {
if (i == 0) {
devName = AllocMem(sizeof(device_name)+4,MEMF_ANY|MEMF_CLEAR);
if (devName == NULL) return NULL;
strncpy(devName + 4,device_name,sizeof(device_name));
strcpy(devName + 4,device_name);
}
switch (i) {
@ -99,7 +99,10 @@ char * set_dev_name(struct DeviceBase *dev) {
return devName;
}
}
Info("Couldn't set device name.\n");
// if devName doesn't point to the const device_name then we need to free up that memory
if (devName != device_name) FreeMem(devName,sizeof(device_name)+4);
return NULL;
}
@ -134,7 +137,10 @@ struct ConfigDev *CreateFakeConfigDev(struct ExecBase *SysBase, struct Library *
ULONG *da_Pointer = (ULONG *)&cd->cd_Rom.er_Reserved0c;
*da_Pointer = (ULONG)diagArea;
}
}
} else {
FreeConfigDev(cd);
cd = NULL;
}
return cd;
}
#endif
@ -228,7 +234,7 @@ static bool ioreq_is_valid(struct DeviceBase *dev, struct IORequest *ior) {
static void Cleanup(struct DeviceBase *dev) {
Info("Cleaning up...\n");
struct ExecBase *SysBase = *(struct ExecBase **)4UL;
char *devName = dev->lib.lib_Node.ln_Name;
struct IDEUnit *unit;
if (SysBase->LibNode.lib_Version >= 36) {
@ -257,6 +263,12 @@ static void Cleanup(struct DeviceBase *dev) {
FreeMem(itask,sizeof(struct IDETask));
}
// if devName doesn't point to the const device_name then we need to free up that memory
if (devName != device_name) {
FreeMem(devName,sizeof(device_name)+4);
devName = NULL;
}
FreeMem((char *)dev - dev->lib.lib_NegSize, dev->lib.lib_NegSize + dev->lib.lib_PosSize);
}
@ -327,7 +339,6 @@ static BYTE detectChannels(struct ConfigDev *cd) {
* Scan for drives and initialize the driver if any are found
*/
struct Library __attribute__((used, saveds)) * init_device(struct ExecBase *SysBase asm("a6"), BPTR seg_list asm("a0"), struct DeviceBase *dev asm("d0"))
//struct Library __attribute__((used)) * init_device(struct ExecBase *SysBase, BPTR seg_list, struct DeviceBase *dev)
{
dev->SysBase = SysBase;
Trace("Init dev, base: %08lx\n",dev);
@ -403,7 +414,11 @@ struct Library __attribute__((used, saveds)) * init_device(struct ExecBase *SysB
* If we are booting a non-autoconfig device we need to create a ConfigDev struct
* This could also be done in mounter.c but that would create a new ConfigDev for each unit
*/
cd = CreateFakeConfigDev(SysBase,ExpansionBase);
if ((cd = CreateFakeConfigDev(SysBase,ExpansionBase)) == NULL) {
Info("Failed to create fake configdev\n");
Cleanup(dev);
return NULL;
}
cd->cd_BoardAddr = (APTR)BOARD_BASE;
cd->cd_BoardSize = 0x1000;
numBoards = 1;

1
idetask.c
View File

@ -50,6 +50,7 @@ static BYTE scsi_inquiry_ata(struct IDEUnit *unit, struct SCSICmd *scsi_command)
if (!(ata_identify(unit,identity))) {
error = HFERR_SelTimeout;
scsi_sense(scsi_command,0,0,error);
FreeMem(identity,512);
return error;
}