Reorder the code so the assertion of p->ep occurs before it is
used in the subsequent lines.

Signed-off-by: Sergei Heifetz <heifetz@yandex-team.com>
---
 hw/usb/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/usb/core.c b/hw/usb/core.c
index b3f811c513..9572a870cc 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -423,10 +423,10 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
         p->status = USB_RET_NODEV;
         return;
     }
+    assert(p->ep);
     assert(dev == p->ep->dev);
     assert(dev->state == USB_STATE_DEFAULT);
     usb_packet_check_state(p, USB_PACKET_SETUP);
-    assert(p->ep != NULL);
 
     /* Submitting a new packet clears halt */
     if (p->ep->halted) {
-- 
2.34.1

Le 04/02/2026 à 08:57, Sergei Heifetz a écrit :
> Reorder the code so the assertion of p->ep occurs before it is
> used in the subsequent lines.
> 
> Signed-off-by: Sergei Heifetz <heifetz@yandex-team.com>
> ---
>   hw/usb/core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/usb/core.c b/hw/usb/core.c
> index b3f811c513..9572a870cc 100644
> --- a/hw/usb/core.c
> +++ b/hw/usb/core.c
> @@ -423,10 +423,10 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
>           p->status = USB_RET_NODEV;
>           return;
>       }
> +    assert(p->ep);
>       assert(dev == p->ep->dev);
>       assert(dev->state == USB_STATE_DEFAULT);
>       usb_packet_check_state(p, USB_PACKET_SETUP);
> -    assert(p->ep != NULL);
>   
>       /* Submitting a new packet clears halt */
>       if (p->ep->halted) {

Reviewed-by: Laurent Vivier <laurent@vivier.eu>