Changeset 103291 in vbox

Timestamp:

Feb 9, 2024 1:23:50 PM (12 months ago)

Author:

vboxsync

Message:

Devices/Storage/DevFdc.cpp: Simplify the logic in get_cur_drv() a bit, eliminates 23 false potential NULL pointer dereference errors in our static code analyzer, bugref:3409

File:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -913 +913 @@
 static fdrive_t *get_cur_drv(fdctrl_t *fdctrl)
 {
+#if MAX_FD == 2
+    if (fdctrl->dor & FD_DRV_SELMASK)
+        return drv1(fdctrl);
+
+    return drv0(fdctrl);
+#else
     switch (fdctrl->dor & FD_DRV_SELMASK) {
         case 0: return drv0(fdctrl);
         case 1: return drv1(fdctrl);
-#if MAX_FD == 4
+# if MAX_FD == 4
         case 2: return drv2(fdctrl);
         case 3: return drv3(fdctrl);
+# endif
+        default: return NULL;
+    }
 #endif
-        default: return NULL;
-    }
 }