claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows CD-ROM IOCTL: Do not pass to big maximum size values to the READ TOC IOCTL's, fixes #5900.

Browse Source
This commit is contained in:
OBattler
2025-08-08 19:55:53 +02:00
parent d4bce724b1
commit a1b0d535e1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qt/win_cdrom_ioctl.c
View File

@@ -49,6 +49,13 @@ typedef struct ioctl_t {
WCHAR path[256]; WCHAR path[256];
} ioctl_t; } ioctl_t;
typedef struct _CDROM_FULL_TOC {
UCHAR Length[2];
UCHAR FirstCompleteSession;
UCHAR LastCompleteSession;
CDROM_TOC_FULL_TOC_DATA_BLOCK Descriptors[MAXIMUM_NUMBER_TRACKS + 2];
} CDROM_FULL_TOC;
static int ioctl_read_dvd_structure(const void *local, uint8_t layer, uint8_t format, static int ioctl_read_dvd_structure(const void *local, uint8_t layer, uint8_t format,
uint8_t *buffer, uint32_t *info); uint8_t *buffer, uint32_t *info);
@@ -124,7 +131,7 @@ ioctl_read_normal_toc(ioctl_t *ioctl, uint8_t *toc_buf, int32_t *tracks_num)
const int temp = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX, const int temp = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX,
&cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX), &cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX),
cur_full_toc, 65535, cur_full_toc, sizeof(CDROM_TOC),
(LPDWORD) &size, NULL); (LPDWORD) &size, NULL);
ioctl_log(ioctl->log, "temp = %i\n", temp); ioctl_log(ioctl->log, "temp = %i\n", temp);
@@ -179,7 +186,7 @@ ioctl_read_raw_toc(ioctl_t *ioctl)
if (!ioctl->is_dvd) { if (!ioctl->is_dvd) {
status = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX, status = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX,
&cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX), &cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX),
cur_full_toc, 65535, cur_full_toc, sizeof(CDROM_FULL_TOC),
(LPDWORD) &size, NULL); (LPDWORD) &size, NULL);
ioctl_log(ioctl->log, "status = %i\n", status); ioctl_log(ioctl->log, "status = %i\n", status);
} }