Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-19 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

CODE128: fix not handling FNC1 at end of data when in manual

Browse Source 
switching mode or any FNC1 after manual C mode selected and no
  other non-C data - found by fuzz test "fuzz_data" - 2nd ever
  trophy!
qr.h: fix typo (props https://github.com/crate-ci/typos)
This commit is contained in:
gitlost
2026-01-12 20:38:15 +00:00
parent a718c79237
commit 6e533c7a0a
8 changed files with 158 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
backend/code128.c
View File

@@ -1,7 +1,7 @@
/* code128.c - Handles Code 128 and GS1-128 */
/*
libzint - the open source barcode library
Copyright (C) 2008-2025 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2008-2026 Robin Stuart <rstuart114@gmail.com>
Bugfixes thanks to Christian Sakowski and BogDan Vatra
Redistribution and use in source and binary forms, with or without
@@ -446,21 +446,24 @@ INTERNAL int zint_code128(struct zint_symbol *symbol, unsigned char source[], in
have_a |= !mask_0x60;
have_b |= mask_0x60 == 0x60;
}
} else if (have_fnc1) {
have_a = have_b = have_c = 1;
for (i = 0; i < length; i++) {
have_extended |= src[i] & 0x80;
}
} else {
int prev_digit, digit = 0;
for (i = 0; i < length; i++) {
const unsigned char ch = src[i];
const int is_fnc1 = ch == '\x1D' && fncs[i];
if (!is_fnc1) {
const unsigned char mask_0x60 = ch & 0x60; /* 0 for (ch & 0x7F) < 32, 0x60 for (ch & 0x7F) >= 96 */
const int manual = manuals[i];
have_extended |= ch & 0x80;
have_a |= !mask_0x60 || manual == C128_A0;
have_b |= mask_0x60 == 0x60 || manual == C128_B0;
prev_digit = digit;
digit = z_isdigit(ch);
have_c |= prev_digit && digit;
}
const unsigned char mask_0x60 = ch & 0x60; /* 0 for (ch & 0x7F) < 32, 0x60 for (ch & 0x7F) >= 96 */
const int manual = manuals[i];
assert(!(ch == '\x1D' && fncs[i])); /* Can't be FNC1 */
have_extended |= ch & 0x80;
have_a |= !mask_0x60 || manual == C128_A0;
have_b |= mask_0x60 == 0x60 || manual == C128_B0;
prev_digit = digit;
digit = z_isdigit(ch);
have_c |= prev_digit && digit;
}
}
c128_set_priority(priority, have_a, have_b, have_c, have_extended);