Fix a couple of bugs in CDROM_GetSerial:

- it would fail if DeviceIoControl succeeded. - it would leak handles in some cases.

Fix a couple of bugs in CDROM_GetSerial:
5ef127a0 · Mike McCormack · Alexandre Julliard · ec0d4252 · 5ef127a0
Commit 5ef127a0 authored Jul 21, 2003 by Mike McCormack Committed by Alexandre Julliard Jul 21, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 6 deletions

drive.c files/drive.c +23 -6

No files found.
--- a/files/drive.c
+++ b/files/drive.c
@@ -861,12 +861,18 @@ failure:
 */
 static DWORD CDROM_GetLabel(int drive, WCHAR *label)
 {
-    HANDLE              h = CDROM_Open(drive);
+    HANDLE              h;
    CDROM_DISK_DATA     cdd;
-    DWORD               br;
+    DWORD               br, ret = 1;
-    DWORD               ret = 1;
+    BOOL                r;
-    if (!h || !DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 0, &cdd, sizeof(cdd), &br, 0))
+    h = CDROM_Open(drive);
+    if( !h ) 
+        return 0;
+    r = DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 
+                        0, &cdd, sizeof(cdd), &br, 0);
+    CloseHandle( h );
+    if( !r )
        return 0;
    switch (cdd.DiskData & 0x03)
@@ -1032,12 +1038,23 @@ static DWORD CDROM_Data_GetSerial(int drive)
 static DWORD CDROM_GetSerial(int drive)
 {
    DWORD               serial = 0;
-    HANDLE              h = CDROM_Open(drive);
+    HANDLE              h;
    CDROM_DISK_DATA     cdd;
    DWORD               br;
+    BOOL                r;
+    TRACE("%d\n", drive);
-    if (!h || ! !DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 0, &cdd, sizeof(cdd), &br, 0))
+    h = CDROM_Open(drive);
+    if( !h ) 
        return 0;
+    r = DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 
+                        0, &cdd, sizeof(cdd), &br, 0);
+    if (!r)
+    {
+        CloseHandle(h);
+        return 0;
+    }
    switch (cdd.DiskData & 0x03)
    {