| Message ID | 20230103110814.3726795-2-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Various win32 fixes & new 'get-win32-socket' QMP command | expand |
On 03/01/2023 12.08, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > ../hw/usb/ccid-card-emulated.c: In function 'handle_apdu_thread': > ../hw/usb/ccid-card-emulated.c:251:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] > 251 | assert((unsigned long)event > 1000); > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/usb/ccid-card-emulated.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c > index ee41a81801..c328660075 100644 > --- a/hw/usb/ccid-card-emulated.c > +++ b/hw/usb/ccid-card-emulated.c > @@ -248,7 +248,7 @@ static void *handle_apdu_thread(void* arg) > WITH_QEMU_LOCK_GUARD(&card->vreader_mutex) { > while (!QSIMPLEQ_EMPTY(&card->guest_apdu_list)) { > event = QSIMPLEQ_FIRST(&card->guest_apdu_list); > - assert((unsigned long)event > 1000); > + assert(event != NULL); > QSIMPLEQ_REMOVE_HEAD(&card->guest_apdu_list, entry); > if (event->p.data.type != EMUL_GUEST_APDU) { > DPRINTF(card, 1, "unexpected message in handle_apdu_thread\n"); Reviewed-by: Thomas Huth <thuth@redhat.com>
Le 03/01/2023 à 12:08, marcandre.lureau@redhat.com a écrit : > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > ../hw/usb/ccid-card-emulated.c: In function 'handle_apdu_thread': > ../hw/usb/ccid-card-emulated.c:251:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] > 251 | assert((unsigned long)event > 1000); > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/usb/ccid-card-emulated.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c > index ee41a81801..c328660075 100644 > --- a/hw/usb/ccid-card-emulated.c > +++ b/hw/usb/ccid-card-emulated.c > @@ -248,7 +248,7 @@ static void *handle_apdu_thread(void* arg) > WITH_QEMU_LOCK_GUARD(&card->vreader_mutex) { > while (!QSIMPLEQ_EMPTY(&card->guest_apdu_list)) { > event = QSIMPLEQ_FIRST(&card->guest_apdu_list); > - assert((unsigned long)event > 1000); > + assert(event != NULL); > QSIMPLEQ_REMOVE_HEAD(&card->guest_apdu_list, entry); > if (event->p.data.type != EMUL_GUEST_APDU) { > DPRINTF(card, 1, "unexpected message in handle_apdu_thread\n"); Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index ee41a81801..c328660075 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -248,7 +248,7 @@ static void *handle_apdu_thread(void* arg) WITH_QEMU_LOCK_GUARD(&card->vreader_mutex) { while (!QSIMPLEQ_EMPTY(&card->guest_apdu_list)) { event = QSIMPLEQ_FIRST(&card->guest_apdu_list); - assert((unsigned long)event > 1000); + assert(event != NULL); QSIMPLEQ_REMOVE_HEAD(&card->guest_apdu_list, entry); if (event->p.data.type != EMUL_GUEST_APDU) { DPRINTF(card, 1, "unexpected message in handle_apdu_thread\n");