On Thu, Feb 14, 2019 at 09:19:31PM +0100, Philippe Mathieu-Daudé wrote: >chardev::read() depends of what chardev::can_read() returns, move the >assertion to can_read(). > >Suggested-by: Paolo Bonzini <[email protected]> >Signed-off-by: Philippe Mathieu-Daudé <[email protected]> >--- > hw/usb/ccid-card-passthru.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > >diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c >index 0a6c657228..8bb1314f49 100644 >--- a/hw/usb/ccid-card-passthru.c >+++ b/hw/usb/ccid-card-passthru.c >@@ -116,8 +116,8 @@ static int ccid_card_vscard_can_read(void *opaque) > { > PassthruState *card = opaque; > >- return VSCARD_IN_SIZE >= card->vscard_in_pos ? >- VSCARD_IN_SIZE - card->vscard_in_pos : 0; >+ assert(card->vscard_in_pos <= VSCARD_IN_SIZE);
Do you have special reason change "<" to "<="? >+ return VSCARD_IN_SIZE - card->vscard_in_pos; > } > > static void ccid_card_vscard_handle_init( >@@ -282,7 +282,6 @@ static void ccid_card_vscard_read(void *opaque, const >uint8_t *buf, int size) > ccid_card_vscard_drop_connection(card); > return; > } >- assert(card->vscard_in_pos < VSCARD_IN_SIZE); > assert(card->vscard_in_hdr < VSCARD_IN_SIZE); > memcpy(card->vscard_in_data + card->vscard_in_pos, buf, size); > card->vscard_in_pos += size; >-- >2.20.1 > -- Wei Yang Help you, Help me
