The function GetNextHidItem has a switch-case block in which the case 1:
falls through to case 2: and then case 2: falls through to case 3:.

There is no possibility of the if blocks within case 2: and case 3: to
succeed later and not succeed in the original case and hence the fall
throughs even if it hypothetically happens are redundant as the code
still will eventually return NULL only at the function end point.

Better introduce straight forward break; statement within actual cases.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4222

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Ranbir Singh <rsingh@ventanamicro.com>
---
 MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
index acc19acd98e0..f07e48774a34 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
@@ -89,6 +89,8 @@ GetNextHidItem (
           return StartPos;
         }
 
+        break;
+
       case 2:
         //
         // 2-byte data
@@ -99,6 +101,8 @@ GetNextHidItem (
           return StartPos;
         }
 
+        break;
+
       case 3:
         //
         // 4-byte data, adjust size
@@ -109,6 +113,8 @@ GetNextHidItem (
           StartPos += 4;
           return StartPos;
         }
+
+        break;
     }
   }
 
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109457): https://edk2.groups.io/g/devel/message/109457
Mute This Topic: https://groups.io/mt/101849998/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On 10/9/23 13:28, Ranbir Singh wrote:
> The function GetNextHidItem has a switch-case block in which the case 1:
> falls through to case 2: and then case 2: falls through to case 3:.
> 
> There is no possibility of the if blocks within case 2: and case 3: to
> succeed later and not succeed in the original case and hence the fall
> throughs even if it hypothetically happens are redundant as the code
> still will eventually return NULL only at the function end point.
> 
> Better introduce straight forward break; statement within actual cases.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4222
> 
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Ranbir Singh <rsingh@ventanamicro.com>
> ---
>  MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
> index acc19acd98e0..f07e48774a34 100644
> --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
> +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
> @@ -89,6 +89,8 @@ GetNextHidItem (
>            return StartPos;
>          }
>  
> +        break;
> +
>        case 2:
>          //
>          // 2-byte data
> @@ -99,6 +101,8 @@ GetNextHidItem (
>            return StartPos;
>          }
>  
> +        break;
> +
>        case 3:
>          //
>          // 4-byte data, adjust size
> @@ -109,6 +113,8 @@ GetNextHidItem (
>            StartPos += 4;
>            return StartPos;
>          }
> +
> +        break;
>      }
>    }
>  

Reviewed-by: Laszlo Ersek <lersek@redhat.com>



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109459): https://edk2.groups.io/g/devel/message/109459
Mute This Topic: https://groups.io/mt/101849998/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-