mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

DATAMATRIX: strip extra precision in loop also (#228); AZTEC: move assert after error check (#229)

Browse Source
This commit is contained in:
gitlost 2021-06-26 00:27:04 +01:00
parent ee3f25fada
commit 542fed1d4f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/aztec.c
View File

@ -867,12 +867,12 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], int lengt
} }
error_number = aztec_text_process(source, length, binary_string, gs1, symbol->eci, &data_length, debug); error_number = aztec_text_process(source, length, binary_string, gs1, symbol->eci, &data_length, debug);
assert(data_length > 0); /* Suppress clang-tidy warning: clang-analyzer-core.UndefinedBinaryOperatorResult */
if (error_number != 0) { if (error_number != 0) {
strcpy(symbol->errtxt, "502: Input too long or too many extended ASCII characters"); strcpy(symbol->errtxt, "502: Input too long or too many extended ASCII characters");
return error_number; return error_number;
} }
assert(data_length > 0); /* Suppress clang-tidy warning: clang-analyzer-core.UndefinedBinaryOperatorResult */
if (!((symbol->option_1 >= -1) && (symbol->option_1 <= 4))) { if (!((symbol->option_1 >= -1) && (symbol->option_1 <= 4))) {
strcpy(symbol->errtxt, "503: Invalid error correction level - using default instead"); strcpy(symbol->errtxt, "503: Invalid error correction level - using default instead");

7
backend/dmatrix.c
View File

@ -373,6 +373,13 @@ static int look_ahead_test(const unsigned char inputData[], const int sourcelen,
/* At least 5 data characters processed ... step (r) */ /* At least 5 data characters processed ... step (r) */
/* NOTE: different than spec, where it's at least 4. Following previous behaviour here (and BWIPP) */ /* NOTE: different than spec, where it's at least 4. Following previous behaviour here (and BWIPP) */
ascii_count = stripf(ascii_count);
b256_count = stripf(b256_count);
edf_count = stripf(edf_count);
text_count = stripf(text_count);
x12_count = stripf(x12_count);
c40_count = stripf(c40_count);
cnt_1 = ascii_count + 1.0f; cnt_1 = ascii_count + 1.0f;
if (cnt_1 <= b256_count && cnt_1 <= edf_count && cnt_1 <= text_count && cnt_1 <= x12_count if (cnt_1 <= b256_count && cnt_1 <= edf_count && cnt_1 <= text_count && cnt_1 <= x12_count
&& cnt_1 <= c40_count) { && cnt_1 <= c40_count) {