| Message ID | 20190214201939.494-7-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ccid-card-passthru: check buffer size parameter | expand |
Hi On Thu, Feb 14, 2019 at 9:20 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Simplify the if() condition so we can remove an indent layer > and the code is easier to review. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/usb/ccid-card-passthru.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c > index ccc3ffa7fa..6cb8b2d26b 100644 > --- a/hw/usb/ccid-card-passthru.c > +++ b/hw/usb/ccid-card-passthru.c > @@ -338,19 +338,17 @@ static void passthru_realize(CCIDCardState *base, Error **errp) > { > PassthruState *card = PASSTHRU_CCID_CARD(base); > > - card->vscard_in_pos = 0; > - card->vscard_in_hdr = 0; The 0 assignment are needless too (objects are memset 0), but not a problem either. > - if (qemu_chr_fe_backend_connected(&card->cs)) { > - DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); > - qemu_chr_fe_set_handlers(&card->cs, > - ccid_card_vscard_can_read, > - ccid_card_vscard_read, > - ccid_card_vscard_event, NULL, card, NULL, true); > - ccid_card_vscard_send_init(card); > - } else { > + if (!qemu_chr_fe_backend_connected(&card->cs)) { > error_setg(errp, "missing chardev"); > return; > } > + card->vscard_in_pos = 0; > + card->vscard_in_hdr = 0; > + DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); > + qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, > + ccid_card_vscard_read, ccid_card_vscard_event, > + NULL, card, NULL, true); > + ccid_card_vscard_send_init(card); > card->debug = parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE, > card->debug); > memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR)); > -- > 2.20.1 >
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index ccc3ffa7fa..6cb8b2d26b 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -338,19 +338,17 @@ static void passthru_realize(CCIDCardState *base, Error **errp) { PassthruState *card = PASSTHRU_CCID_CARD(base); - card->vscard_in_pos = 0; - card->vscard_in_hdr = 0; - if (qemu_chr_fe_backend_connected(&card->cs)) { - DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); - qemu_chr_fe_set_handlers(&card->cs, - ccid_card_vscard_can_read, - ccid_card_vscard_read, - ccid_card_vscard_event, NULL, card, NULL, true); - ccid_card_vscard_send_init(card); - } else { + if (!qemu_chr_fe_backend_connected(&card->cs)) { error_setg(errp, "missing chardev"); return; } + card->vscard_in_pos = 0; + card->vscard_in_hdr = 0; + DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); + qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, + ccid_card_vscard_read, ccid_card_vscard_event, + NULL, card, NULL, true); + ccid_card_vscard_send_init(card); card->debug = parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE, card->debug); memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR));
Simplify the if() condition so we can remove an indent layer and the code is easier to review. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/usb/ccid-card-passthru.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)