[libnfc] push by yob...@gmail.com - nfc-read-forum-tag3: fix incomplete NDEF retrieval and size of output ... on 2014-02-17 22:22 GMT

[lib...@googlecode.com]

Revision: 73c84c214dd0
Author: Pim 't Hart <pimmeypr...@gmail.com>
Date: Mon Feb 17 22:09:15 2014 UTC
Log: nfc-read-forum-tag3: fix incomplete NDEF retrieval and size of
output file

http://code.google.com/p/libnfc/source/detail?r=73c84c214dd0

Modified:
/utils/nfc-read-forum-tag3.c

=======================================
--- /utils/nfc-read-forum-tag3.c Sun Sep 22 16:32:47 2013 UTC
+++ /utils/nfc-read-forum-tag3.c Mon Feb 17 22:09:15 2014 UTC
@@ -130,6 +130,7 @@
if ((res = nfc_initiator_transceive_bytes(dev, frame, frame_len, rx,
sizeof(rx), 0)) < 0) {
return res;
}
+
const int res_overhead = 1 + 1 + 8 + 2; // 1+1+8+2: LEN + CMD + NFCID2
+ STATUS
if (res < res_overhead) {
// Not enough data
@@ -326,7 +327,7 @@
const uint16_t block_count_to_check = (ndef_data_len / 16) + 1;

data_len = 0;
- for (uint16_t b = 0; b < (block_count_to_check / block_max_per_check); b
+= block_max_per_check) {
+ for (uint16_t b = 0; b < ((block_count_to_check - 1) /
block_max_per_check + 1); b += block_max_per_check) {
size_t size = sizeof(data) - data_len;
if (!nfc_forum_tag_type3_check(pnd, &nt, 1 + b,
MIN(block_max_per_check, (block_count_to_check - (b *
block_max_per_check))), data + data_len, &size)) {
nfc_perror(pnd, "nfc_forum_tag_type3_check");
@@ -337,7 +338,8 @@
}
data_len += size;
}
- if (fwrite(data, 1, data_len, ndef_stream) != data_len) {
+
+ if (fwrite(data, 1, ndef_data_len, ndef_stream) != ndef_data_len) {
fprintf(stderr, "Could not write to file.\n");
fclose(ndef_stream);
nfc_close(pnd);