Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions main/qr/parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
}
Expand All @@ -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
}
Expand All @@ -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) ||
Expand Down
19 changes: 19 additions & 0 deletions main/qr/test/test_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down
Loading