remove warnings

nfc-tools · May 21, 2020 · f52d04e · f52d04e
1 parent 5a059db
commit f52d04e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libnfc/drivers/acr122_usb.c b/libnfc/drivers/acr122_usb.c
@@ -331,7 +331,10 @@ acr122_usb_scan(const nfc_context *context, nfc_connstring connstrings[], const
  // acr122_usb_get_usb_device_name (dev, udev, pnddDevices[device_found].acDevice, sizeof (pnddDevices[device_found].acDevice));
  log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "device found: Bus %s Device %s Name %s", bus->dirname, dev->filename, acr122_usb_supported_devices[n].name);
  usb_close(udev);
- snprintf(connstrings[device_found], sizeof(nfc_connstring), "%s:%s:%s", ACR122_USB_DRIVER_NAME, bus->dirname, dev->filename);
+ if(snprintf(connstrings[device_found], sizeof(nfc_connstring), "%s:%s:%s", ACR122_USB_DRIVER_NAME, bus->dirname, dev->filename) >= (int)sizeof(nfc_connstring)) {
+ // truncation occurred, skipping that one
+ continue;
+ }
  device_found++;
  // Test if we reach the maximum "wanted" devices
  if (device_found == connstrings_len) {

diff --git a/libnfc/drivers/pn53x_usb.c b/libnfc/drivers/pn53x_usb.c
@@ -337,7 +337,10 @@ pn53x_usb_scan(const nfc_context *context, nfc_connstring connstrings[], const s
  // pn53x_usb_get_usb_device_name (dev, udev, pnddDevices[device_found].acDevice, sizeof (pnddDevices[device_found].acDevice));
  log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "device found: Bus %s Device %s", bus->dirname, dev->filename);
  usb_close(udev);
- snprintf(connstrings[device_found], sizeof(nfc_connstring), "%s:%s:%s", PN53X_USB_DRIVER_NAME, bus->dirname, dev->filename);
+ if(snprintf(connstrings[device_found], sizeof(nfc_connstring), "%s:%s:%s", PN53X_USB_DRIVER_NAME, bus->dirname, dev->filename) >= (int)sizeof(nfc_connstring)) {
+ // truncation occurred, skipping that one
+ continue;
+ }
  device_found++;
  // Test if we reach the maximum "wanted" devices
  if (device_found == connstrings_len) {