nfctool: sniffer: Fix ndef read-ahead check macro

This macro checks if we can safely read the next field in a ndef
record. So the check needs to be done at the current read position
in the current record.

diff --git a/tools/nfctool/ndef-decode.c b/tools/nfctool/ndef-decode.c
index 72f250b..bc891ae 100644 (file)
--- a/tools/nfctool/ndef-decode.c
+++ b/tools/nfctool/ndef-decode.c
@@ -226,7 +226,7 @@ int ndef_print_records(guint8 *data, guint32 data_len)
 
 #define CHECK_OFFSET(s)                                                        \
        do {                                                            \
-               if (data_len - ndef_offset < (s)) {                     \
+               if (data_len - (ndef_offset + record_offset) < (s)) {   \
                        ndef_printf_error("Malformed NDEF record");     \
                        sniffer_print_hexdump(stdout, data, data_len,   \
                                              NDEF_HEX_INDENT, TRUE);   \