crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add asserts to tell static analyzer we know what we're doing...

Browse source 
nfc.c:1244:19: warning: Dereference of undefined pointer value
  for (int i = 0; nmt[i]; i++) {
                  ^~~~~~
nfc.c:1256:23: warning: Dereference of undefined pointer value
      for (int j = 0; nbr[j]; j++) {
                      ^~~~~~
This commit is contained in:
Philippe Teuwen 2017-02-18 18:08:27 +01:00
parent f2c264d4ae
commit 2033519b0c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnfc/nfc.c
View file

@ -79,6 +79,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <nfc/nfc.h> #include <nfc/nfc.h>
@ -1237,13 +1238,14 @@ static int
nfc_device_validate_modulation(nfc_device *pnd, const nfc_mode mode, const nfc_modulation *nm) nfc_device_validate_modulation(nfc_device *pnd, const nfc_mode mode, const nfc_modulation *nm)
{ {
int res; int res;
const nfc_modulation_type *nmt; const nfc_modulation_type *nmt = NULL;
if ((res = nfc_device_get_supported_modulation(pnd, mode, &nmt)) < 0) { if ((res = nfc_device_get_supported_modulation(pnd, mode, &nmt)) < 0) {
return res; return res;
} }
assert(nmt != NULL);
for (int i = 0; nmt[i]; i++) { for (int i = 0; nmt[i]; i++) {
if (nmt[i] == nm->nmt) { if (nmt[i] == nm->nmt) {
const nfc_baud_rate *nbr; const nfc_baud_rate *nbr = NULL;
if (mode == N_INITIATOR) { if (mode == N_INITIATOR) {
if ((res = nfc_device_get_supported_baud_rate(pnd, nmt[i], &nbr)) < 0) { if ((res = nfc_device_get_supported_baud_rate(pnd, nmt[i], &nbr)) < 0) {
return res; return res;
@ -1253,6 +1255,7 @@ nfc_device_validate_modulation(nfc_device *pnd, const nfc_mode mode, const nfc_m
return res; return res;
} }
} }
assert(nbr != NULL);
for (int j = 0; nbr[j]; j++) { for (int j = 0; nbr[j]; j++) {
if (nbr[j] == nm->nbr) if (nbr[j] == nm->nbr)
return NFC_SUCCESS; return NFC_SUCCESS;