Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-07 19:03:29 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

upd765_dsk: don't crash when inserting a disk after removing a different size one (nw)

Browse Source 
winsocket, winptty: don't use osd_free on pointer allocated with malloc (nw)
This commit is contained in:
cracyc 2013-04-15 02:10:49 +00:00
parent b20b4936eb
commit 5ee7683519
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/formats/upd765_dsk.c
View File

@ -154,12 +154,12 @@ floppy_image_format_t::desc_e* upd765_format::get_desc_fm(const format &f, int &
floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int &current_size, int &end_gap_index)
{
static floppy_image_format_t::desc_e desc[29] = {
/* 00 */ { MFM, 0x4e, f.gap_4a },
/* 00 */ { MFM, 0x4e, 0 },
/* 01 */ { MFM, 0x00, 12 },
/* 02 */ { RAW, 0x5224, 3 },
/* 03 */ { MFM, 0xfc, 1 },
/* 04 */ { MFM, 0x4e, f.gap_1 },
/* 05 */ { SECTOR_LOOP_START, 0, f.sector_count-1 },
/* 04 */ { MFM, 0x4e, 0 },
/* 05 */ { SECTOR_LOOP_START, 0, 0 },
/* 06 */ { MFM, 0x00, 12 },
/* 07 */ { CRC_CCITT_START, 1 },
/* 08 */ { RAW, 0x4489, 3 },
@ -170,7 +170,7 @@ floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int
/* 13 */ { SIZE_ID },
/* 14 */ { CRC_END, 1 },
/* 15 */ { CRC, 1 },
/* 16 */ { MFM, 0x4e, f.gap_2 },
/* 16 */ { MFM, 0x4e, 0 },
/* 17 */ { MFM, 0x00, 12 },
/* 18 */ { CRC_CCITT_START, 2 },
/* 19 */ { RAW, 0x4489, 3 },
@ -178,13 +178,19 @@ floppy_image_format_t::desc_e* upd765_format::get_desc_mfm(const format &f, int
/* 21 */ { SECTOR_DATA, -1 },
/* 22 */ { CRC_END, 2 },
/* 23 */ { CRC, 2 },
/* 24 */ { MFM, 0x4e, f.gap_3 },
/* 24 */ { MFM, 0x4e, 0 },
/* 25 */ { SECTOR_LOOP_END },
/* 26 */ { MFM, 0x4e, 0 },
/* 27 */ { RAWBITS, 0x9254, 0 },
/* 28 */ { END }
};
desc[0].p2 = f.gap_4a;
desc[4].p2 = f.gap_1;
desc[5].p2 = f.sector_count-1;
desc[16].p2 = f.gap_2;
desc[24].p2 = f.gap_3;
current_size = (f.gap_4a+12+3+1+f.gap_1)*16;
if(f.sector_base_size)
current_size += f.sector_base_size * f.sector_count * 16;

2
src/osd/windows/winptty.c
View File

@ -62,6 +62,6 @@ file_error win_close_ptty(osd_file *file)
FlushFileBuffers(file->handle);
DisconnectNamedPipe(file->handle);
CloseHandle(file->handle);
osd_free(file);
free(file);
return FILERR_NONE;
}

2
src/osd/windows/winsocket.c
View File

@ -203,6 +203,6 @@ file_error win_write_socket(osd_file *file, const void *buffer, UINT64 offset, U
file_error win_close_socket(osd_file *file)
{
closesocket(file->socket);
osd_free(file);
free(file);
return FILERR_NONE;
}