From a5d40cefc8da677b9869a57d9448f07bb9d54bf7 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 3 Jul 2013 00:10:24 +0200 Subject: [PATCH] Fix warning about garbage value acr122s.c:196:23: warning: The left operand of '<<' is a garbage value size_t frame_size = FRAME_SIZE(frame); ^ ~~~~~~ acr122s.c:76:24: note: expanded from macro 'FRAME_SIZE' ^ acr122s.c:74:47: note: expanded from macro 'APDU_SIZE' --- libnfc/drivers/acr122s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libnfc/drivers/acr122s.c b/libnfc/drivers/acr122s.c index db2ea68..d4fc2aa 100644 --- a/libnfc/drivers/acr122s.c +++ b/libnfc/drivers/acr122s.c @@ -386,7 +386,9 @@ acr122s_get_firmware_version(nfc_device *pnd, char *version, size_t length) int ret; uint8_t cmd[MAX_FRAME_SIZE]; - acr122s_build_frame(pnd, cmd, sizeof(cmd), 0x48, 0, NULL, 0, 0); + if (! acr122s_build_frame(pnd, cmd, sizeof(cmd), 0x48, 0, NULL, 0, 0)) { + return NFC_EINVARG; + } if ((ret = acr122s_send_frame(pnd, cmd, 1000)) != 0) return ret; @@ -639,7 +641,10 @@ acr122s_send(nfc_device *pnd, const uint8_t *buf, const size_t buf_len, int time uart_flush_input(DRIVER_DATA(pnd)->port); uint8_t cmd[MAX_FRAME_SIZE]; - acr122s_build_frame(pnd, cmd, sizeof(cmd), 0, 0, buf, buf_len, 1); + if (! acr122s_build_frame(pnd, cmd, sizeof(cmd), 0, 0, buf, buf_len, 1)) { + return NFC_EINVARG; + } + int ret; if ((ret = acr122s_send_frame(pnd, cmd, timeout)) != 0) { log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "%s", "Unable to transmit data. (TX)");