From b8cd21a07ea4394ba1c11cbbb166ca9edeca20b6 Mon Sep 17 00:00:00 2001 From: pythcoiner Date: Mon, 16 Nov 2026 21:23:23 -0500 Subject: [PATCH] fix(qr): skip whitespace around a scanned frame --- main/qr/parser.c | 31 +++++++++++++++++++++++++++---- main/qr/test/test_parser.c | 19 +++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/main/qr/parser.c b/main/qr/parser.c index 9b3e7735..d088c4fb 100644 --- a/main/qr/parser.c +++ b/main/qr/parser.c @@ -43,6 +43,20 @@ static bool sequence_exceeds_budget(int total, size_t part_len) { part_len > QR_PARSER_MAX_STORED_BYTES / (size_t)(total - 1); } +static void skip_leading_whitespace(const char **data, size_t *data_len) { + while (*data_len > 0 && isspace((unsigned char)(*data)[0])) { + (*data)++; + (*data_len)--; + } +} + +static size_t trailing_trimmed_len(const char *data, size_t data_len) { + while (data_len > 0 && isspace((unsigned char)data[data_len - 1])) { + data_len--; + } + return data_len; +} + QRPartParser *qr_parser_create(void) { QRPartParser *parser = (QRPartParser *)calloc(1, sizeof(QRPartParser)); if (!parser) @@ -161,8 +175,17 @@ int qr_parser_parse_with_len(QRPartParser *parser, const char *data, return -1; } + /* A camera frame can carry stray whitespace around the payload. Skipping it + * up front lets a header be recognized; only the formats whose payload is + * self-delimiting (BBQr) may also drop it at the end. A pMofN part keeps its + * trailing whitespace, which belongs to the reassembled payload. */ + const char *frame = data; + size_t frame_len = data_len; + skip_leading_whitespace(&frame, &frame_len); + size_t body_len = trailing_trimmed_len(frame, frame_len); + if (parser->format == -1) { - parser->format = detect_format(data, data_len, &parser->bbqr); + parser->format = detect_format(frame, body_len, &parser->bbqr); } if (parser->format == FORMAT_NONE) { @@ -174,7 +197,7 @@ int qr_parser_parse_with_len(QRPartParser *parser, const char *data, const char *part = NULL; size_t part_len = 0; int index, total; - if (!parse_pmofn_qr_part(data, data_len, &part, &part_len, &index, + if (!parse_pmofn_qr_part(frame, frame_len, &part, &part_len, &index, &total)) { return fail_parser(parser); } @@ -200,7 +223,7 @@ int qr_parser_parse_with_len(QRPartParser *parser, const char *data, } ur_decoder_t *decoder = (ur_decoder_t *)parser->ur_decoder; - ur_decoder_state_t state = ur_decoder_receive_part(decoder, data); + ur_decoder_state_t state = ur_decoder_receive_part(decoder, frame); if (state == UR_DECODER_OK) { return 0; // Single-part UR, complete immediately } @@ -210,7 +233,7 @@ int qr_parser_parse_with_len(QRPartParser *parser, const char *data, } } else if (parser->format == FORMAT_BBQR) { BBQrPart part; - if (!parser->bbqr || !bbqr_parse_part(data, data_len, &part)) { + if (!parser->bbqr || !bbqr_parse_part(frame, body_len, &part)) { return fail_parser(parser); } if ((parser->total != -1 && parser->total != part.total) || diff --git a/main/qr/test/test_parser.c b/main/qr/test/test_parser.c index 118e609b..93f87c76 100644 --- a/main/qr/test/test_parser.c +++ b/main/qr/test/test_parser.c @@ -427,6 +427,24 @@ static void test_valid_ur_still_processes(void) { qr_parser_destroy(parser); } +/* A camera frame can carry stray whitespace around the payload: a BBQr part + * with whitespace on both sides still parses. */ +static void test_bbqr_trims_frame_whitespace(void) { + QRPartParser *parser = qr_parser_create(); + CHECK(parser != NULL); + CHECK(parse_str(parser, " \n\tB$HU020142 \r\n") == 1); + CHECK(parse_str(parser, "\tB$HU020041\n") == 0); + CHECK(qr_parser_is_complete(parser)); + CHECK(!qr_parser_is_failed(parser)); + size_t result_len = 0; + char *result = qr_parser_result(parser, &result_len); + CHECK(result != NULL); + CHECK(result_len == 2); + CHECK(memcmp(result, "AB", result_len) == 0); + free(result); + qr_parser_destroy(parser); +} + int main(void) { test_format_none_still_completes(); test_incomplete_pmofn_like_text_remains_plain(); @@ -449,6 +467,7 @@ int main(void) { test_bbqr_result_failure_clears_length(); test_valid_bbqr_still_assembles(); test_valid_ur_still_processes(); + test_bbqr_trims_frame_whitespace(); if (failures != 0) { fprintf(stderr, "%d QR parser test(s) failed\n", failures);