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

Prevent from stack corruption when using PN533-based device and add errors handling for ReadRegister and WriteRegister. (Fixes Issue 135)

Browse source
This commit is contained in:
Romuald Conty 2010-12-29 14:01:14 +00:00
parent 84710f266b
commit ba37313cb8
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnfc/chips/pn53x.c
View file

@ -194,7 +194,13 @@ pn53x_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, b
default: default:
pnd->iLastError = 0; pnd->iLastError = 0;
} }
if (pnd->nc == NC_PN533) {
if ((pbtTx[1] == 0x06) // ReadRegister
|| (pbtTx[1] == 0x08)) { // WriteRegister
// PN533 prepends its answer by a status byte
pnd->iLastError = pbtRx[0] & 0x3f;
}
}
return (0 == pnd->iLastError); return (0 == pnd->iLastError);
} }
@ -207,14 +213,18 @@ pn53x_get_reg (nfc_device_t * pnd, uint16_t ui16Reg, uint8_t * ui8Value)
abtCmd[2] = ui16Reg >> 8; abtCmd[2] = ui16Reg >> 8;
abtCmd[3] = ui16Reg & 0xff; abtCmd[3] = ui16Reg & 0xff;
if (pn53x_transceive (pnd, abtCmd, sizeof (pncmd_get_register), ui8Value, &szValueLen)) {
byte_t abtRegValue[2];
if (pn53x_transceive (pnd, abtCmd, sizeof (pncmd_get_register), abtRegValue, &szValueLen)) {
if (pnd->nc == NC_PN533) { if (pnd->nc == NC_PN533) {
// PN533 prepends its answer by a status byte // PN533 prepends its answer by a status byte
if (ui8Value[0] == 0) { if (abtRegValue[0] == 0) { // 0x00
ui8Value[0] = ui8Value[1]; *ui8Value = abtRegValue[1];
} else { } else {
return false; return false;
} }
} else {
*ui8Value = abtRegValue[0];
} }
return true; return true;
} }