From 56fca5b2a17c757af399075b454762a306e3c7ea Mon Sep 17 00:00:00 2001 From: gitlost Date: Sun, 22 Mar 2026 15:05:53 +0000 Subject: [PATCH] raster/vector: fix BARCODE_BIND_TOP trumping BARCODE_BOX backend/tests/fuzz: update "fuzz.h" to take `option_3` min/max; update `INPUT_MODE_MASK` & `OUTPUT_OPTIONS_MASK`; set `height`, `border_width` & `output_options` from input (removing `Z_FUZZ_SET_OUTPUT_OPTIONS` conditional) and call `ZBarcode_Encode_and_Print()` instead of `ZBarcode_Encode()`; support standalone builds of "fuzz_data" & "fuzz_gs1" with `Z_FUZZ_MAIN_READ_ARGV_1` macro; update "fuzz_gs1" & "fuzz_gs1.dict" to better test caret/raw modes; gen_corpora: add `output_options`, `height` & `border_width` & find (3rd) from fuzz_data of BIND_TOP | BIND_BOX bug --- ChangeLog | 3 +- backend/output.c | 3 +- backend/raster.c | 3 +- backend/tests/fuzz/Dockerfile | 1 + backend/tests/fuzz/README | 56 +++ backend/tests/fuzz/fuzz.h | 379 +++++++++++-------- backend/tests/fuzz/fuzz_data.c | 18 +- backend/tests/fuzz/fuzz_data_seed_corpus.zip | Bin 10725 -> 11150 bytes backend/tests/fuzz/fuzz_gs1.c | 57 ++- backend/tests/fuzz/fuzz_gs1.dict | 16 +- backend/tests/fuzz/fuzz_gs1_seed_corpus.zip | Bin 969 -> 1346 bytes backend/tests/fuzz/gen_corpora.c | 128 ++++--- backend/tests/test_output.c | 6 +- backend/tests/test_raster.c | 54 +-- backend/tests/test_vector.c | 28 +- backend/vector.c | 34 +- docs/README | 13 +- docs/zint-qt.1 | 2 +- 18 files changed, 494 insertions(+), 307 deletions(-) create mode 100644 backend/tests/fuzz/README diff --git a/ChangeLog b/ChangeLog index 8d449a6c..b3374407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2.16.0.9 (dev) not released yet (2026-03-18) +Version 2.16.0.9 (dev) not released yet (2026-03-22) ==================================================== **Incompatible changes** @@ -42,6 +42,7 @@ Bugs - CODE32/PZN: fix not restoring `option_2` (props axxel) - DBAR_EXP_CC/DBAR_EXPSTK_CC: fix separator over finder patterns when linear part is greater than 4 codeblocks +- raster/vector: fix BARCODE_BIND_TOP trumping BARCODE_BOX Version 2.16.0 (2025-12-19) diff --git a/backend/output.c b/backend/output.c index 6df039de..351b1acd 100644 --- a/backend/output.c +++ b/backend/output.c @@ -710,7 +710,8 @@ INTERNAL void zint_out_set_whitespace_offsets(const struct zint_symbol *symbol, *p_xoffset = symbol->whitespace_width + qz_left; *p_roffset = symbol->whitespace_width + qz_right; - if (symbol->output_options & BARCODE_BOX) { + /* BARCODE_BIND_TOP trumps BARCODE_BOX */ + if (!(symbol->output_options & BARCODE_BIND_TOP) && (symbol->output_options & BARCODE_BOX)) { *p_xoffset += symbol->border_width; *p_roffset += symbol->border_width; } diff --git a/backend/raster.c b/backend/raster.c index fa08bb56..35fe5472 100644 --- a/backend/raster.c +++ b/backend/raster.c @@ -727,7 +727,8 @@ static void draw_bind_box(const struct zint_symbol *symbol, unsigned char *pixel DEFAULT_INK); } } - if (symbol->output_options & BARCODE_BOX) { + /* BARCODE_BIND_TOP trumps BARCODE_BOX */ + if (!(symbol->output_options & BARCODE_BIND_TOP) && (symbol->output_options & BARCODE_BOX)) { /* Vertical side bars */ const int xbox_right = image_width - bwidth_si; int box_top = yoffset_si; diff --git a/backend/tests/fuzz/Dockerfile b/backend/tests/fuzz/Dockerfile index 2ddd4333..7c5b1ae1 100644 --- a/backend/tests/fuzz/Dockerfile +++ b/backend/tests/fuzz/Dockerfile @@ -17,5 +17,6 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make cmake RUN git clone --depth 1 https://git.code.sf.net/p/zint/code zint +#ADD ./zint.tar.gz zint WORKDIR zint COPY build.sh $SRC/ diff --git a/backend/tests/fuzz/README b/backend/tests/fuzz/README new file mode 100644 index 00000000..ab1ff5e7 --- /dev/null +++ b/backend/tests/fuzz/README @@ -0,0 +1,56 @@ +% backend/tests/fuzz/README 2026-03-22 +% vim: set ts=4 sw=4 et : + +To run fuzzers "fuzz_data" and "fuzz_gs1" using OSS-Fuzz + +Assuming have cloned OSS-Fuzz somewhere: + + git clone https://github.com/google/oss-fuzz + +and using the following shell vars: + + export OSS_FUZZ_DIR= + export ZINT_DIR= + export PROJECT_NAME=zint + +make sure have latest: + + cd $OSS_FUZZ_DIR + git pull origin master + +Link zint's "backend/tests/fuzz" to a sub-dir of OSS-Fuzz`s project dir as "zint", e.g.: + + cd $OSS_FUZZ_DIR/projects + ln -s $ZINT_DIR/backend/tests/fuzz $PROJECT_NAME + +Create corpus dirs, e.g. could create in the "build" dir in "": + + mkdir -p $OSS_FUZZ_DIR/build/corpus_data + mkdir -p $OSS_FUZZ_DIR/build/corpus_gs1 + +Then can use OSS-Fuzz's python helpers to build the docker image and fuzzers: + + cd $OSS_FUZZ_DIR/projects/$PROJECT_NAME + python3 $OSS_FUZZ_DIR/infra/helper.py build_image $PROJECT_NAME + +(on any subsequent runs can add "--no-pull" option to avoid question) + + python3 $OSS_FUZZ_DIR/infra/helper.py build_fuzzers $PROJECT_NAME + +Then run "fuzz_data": + + python3 $OSS_FUZZ_DIR/infra/helper.py run_fuzzer --corpus-dir=build/corpus_data $PROJECT_NAME fuzz_data + +and/or "fuzz_gs1": + + python3 $OSS_FUZZ_DIR/infra/helper.py run_fuzzer --corpus-dir=build/corpus_gs1 $PROJECT_NAME fuzz_gs1 + +If want to test local changes not in zint's commit tree, then create an archive, e.g. + + cd $ZINT_DIR + git stash + git archive -o backend/tests/fuzz/zint.tar.gz 'stash@{0}' + git stash pop + +then edit "Dockerfile" and comment out "RUN zint clone ..." and uncomment "ADD ./zint.tar.gz zint" and +rebuild Docker image and fuzzers. diff --git a/backend/tests/fuzz/fuzz.h b/backend/tests/fuzz/fuzz.h index 1a86752f..bf8eb66b 100644 --- a/backend/tests/fuzz/fuzz.h +++ b/backend/tests/fuzz/fuzz.h @@ -42,14 +42,13 @@ #define ZARRAY_SIZE(x) ((int) (sizeof(x) / sizeof((x)[0]))) #define INPUT_MODE_MASK (ESCAPE_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE | HEIGHTPERROW_MODE | FAST_MODE \ - | EXTRA_ESCAPE_MODE) + | EXTRA_ESCAPE_MODE | GS1SYNTAXENGINE_MODE | GS1RAW_MODE) -#ifdef Z_FUZZ_SET_OUTPUT_OPTIONS #define OUTPUT_OPTIONS_MASK (BARCODE_BIND_TOP | BARCODE_BIND | BARCODE_BOX | BARCODE_STDOUT | READER_INIT \ | SMALL_TEXT | BOLD_TEXT | CMYK_COLOUR | BARCODE_DOTTY_MODE | GS1_GS_SEPARATOR \ | OUT_BUFFER_INTERMEDIATE | BARCODE_QUIET_ZONES | BARCODE_NO_QUIET_ZONES \ - | COMPLIANT_HEIGHT | EANUPC_GUARD_WHITESPACE | EMBED_VECTOR_FONT) -#endif + | COMPLIANT_HEIGHT | EANUPC_GUARD_WHITESPACE | EMBED_VECTOR_FONT \ + | BARCODE_CONTENT_SEGS) /* BARCODE_MEMORY_FILE always set */ /* Based on `z_not_sane()` flags in "backend/common.h") */ #define IS_CTL_F (0x00000001) /* ASCII control (incl. DEL) */ @@ -161,160 +160,160 @@ static int not_sane(const unsigned int flg, const unsigned char source[], const struct settings_item { const int idx, symbology, sane_flag; - const int option_1_min, option_1_max, option_2_min, option_2_max, option_3, len_min, len_max; + const int option_1_min, option_1_max, option_2_min, option_2_max, option_3_min, option_3_max, len_min, len_max; }; static const struct settings_item settings[] = { - { 0, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 1, BARCODE_CODE11, SODIUM_MNS_F, 0, -1, 0, 2, 0, 1, 140 }, - { 2, BARCODE_C25STANDARD, NEON_F, 0, -1, 0, 2, 0, 1, 112 }, - { 3, BARCODE_C25INTER, NEON_F, 0, -1, 0, 2, 0, 1, 125 }, - { 4, BARCODE_C25IATA, NEON_F, 0, -1, 0, 2, 0, 1, 80 }, - { 5, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 6, BARCODE_C25LOGIC, NEON_F, 0, -1, 0, 2, 0, 1, 113 }, - { 7, BARCODE_C25IND, NEON_F, 0, -1, 0, 2, 0, 1, 79 }, - { 8, BARCODE_CODE39, SILVER_F, 0, -1, 0, 2, 0, 1, 86 }, - { 9, BARCODE_EXCODE39, SILVER_F, 0, -1, 0, 2, 0, 1, 86 }, - { 10, BARCODE_EAN8, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 14 }, - { 11, BARCODE_EAN_2ADDON, NEON_F, 0, -1, 0, -1, 0, 1, 2 }, - { 12, BARCODE_EAN_5ADDON, NEON_F, 0, -1, 0, -1, 0, 1, 5 }, - { 13, BARCODE_EANX, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 19 }, - { 14, BARCODE_EANX_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 19 }, - { 15, BARCODE_EAN13, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 19 }, - { 16, BARCODE_GS1_128, ASCII_PRT_F, 0, -1, 0, -1, 0, 3, 198 }, - { 17, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 18, BARCODE_CODABAR, CALCIUM_F, 0, -1, 0, 2, 0, 3, 103 }, - { 19, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 20, BARCODE_CODE128, 0, 0, -1, 0, -1, 0, 1, 198 }, - { 21, BARCODE_DPLEIT, NEON_F, 0, -1, 0, -1, 0, 1, 13 }, - { 22, BARCODE_DPIDENT, NEON_F, 0, -1, 0, -1, 0, 1, 11 }, - { 23, BARCODE_CODE16K, 0, -1, 16, 0, -1, 0, 1, 154 }, - { 24, BARCODE_CODE49, ASCII_F, 2, 8, 0, -1, 0, 1, 81 }, - { 25, BARCODE_CODE93, ASCII_F, 0, -1, 0, 1, 0, 1, 123 }, - { 26, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 27, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 28, BARCODE_FLAT, NEON_F, 0, -1, 0, -1, 0, 1, 128 }, - { 29, BARCODE_DBAR_OMN, NEON_F, 0, -1, 0, -1, 0, 1, 14 }, - { 30, BARCODE_DBAR_LTD, NEON_F, 0, -1, 0, -1, 0, 1, 14 }, - { 31, BARCODE_DBAR_EXP, ASCII_PRT_F, 0, -1, 0, -1, 0, 3, 74 }, - { 32, BARCODE_TELEPEN, ASCII_F, 0, -1, 0, -1, 0, 1, 69 }, - { 33, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 34, BARCODE_UPCA, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 18 }, - { 35, BARCODE_UPCA_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 18 }, - { 36, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 37, BARCODE_UPCE, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 14 }, - { 38, BARCODE_UPCE_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, 1, 14 }, - { 39, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 40, BARCODE_POSTNET, NEON_F, 0, -1, 0, -1, 0, 1, 38 }, - { 41, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 42, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 43, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 44, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 45, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 46, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 47, BARCODE_MSI_PLESSEY, NEON_F, 0, -1, 0, 16, 0, 1, 92 }, - { 48, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 49, BARCODE_FIM, FIM_F, 0, -1, 0, -1, 0, 1, 1 }, - { 50, BARCODE_LOGMARS, SILVER_F, 0, -1, 0, 2, 0, 1, 30 }, - { 51, BARCODE_PHARMA, NEON_F, 0, -1, 0, -1, 0, 1, 6 }, - { 52, BARCODE_PZN, NEON_F, 0, -1, 0, 1, 0, 1, 8 }, - { 53, BARCODE_PHARMA_TWO, NEON_F, 0, -1, 0, -1, 0, 1, 8 }, - { 54, BARCODE_CEPNET, NEON_F, 0, -1, 0, -1, 0, 8, 8 }, - { 55, BARCODE_PDF417, 0, -1, 8, 0, 30, 0, 1, 2710 }, - { 56, BARCODE_PDF417COMP, 0, -1, 8, 0, 30, 0, 1, 2710 }, - { 57, BARCODE_MAXICODE, 0, -1, 6, 0, 100, 0, 1, 138 }, - { 58, BARCODE_QRCODE, 0, -1, 4, 0, 40, ZINT_FULL_MULTIBYTE, 1, 7089 }, - { 59, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 60, BARCODE_CODE128AB, 0, 0, -1, 0, -1, 0, 1, 99 }, - { 61, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 62, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 63, BARCODE_AUSPOST, GDSET_F, 0, -1, 0, -1, 0, 8, 23 }, - { 64, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 65, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 66, BARCODE_AUSREPLY, GDSET_F, 0, -1, 0, -1, 0, 1, 8 }, - { 67, BARCODE_AUSROUTE, GDSET_F, 0, -1, 0, -1, 0, 1, 8 }, - { 68, BARCODE_AUSREDIRECT, GDSET_F, 0, -1, 0, -1, 0, 1, 8 }, - { 69, BARCODE_ISBNX, ISBNX_ADDON_SANE_F, 0, -1, 0, -1, 0, 9, 19 }, - { 70, BARCODE_RM4SCC, KRSET_F, 0, -1, 0, -1, 0, 1, 50 }, - { 71, BARCODE_DATAMATRIX, 0, 0, -1, 0, 48, DM_SQUARE | DM_ISO_144, 1, 3550 }, - { 72, BARCODE_EAN14, NEON_F, 0, -1, 0, -1, 0, 1, 13 }, - { 73, BARCODE_VIN, ARSENIC_F, 0, -1, 0, -1, 0, 17, 17 }, - { 74, BARCODE_CODABLOCKF, 0, -1, 44, -1, 67, 0, 1, 2725 }, - { 75, BARCODE_NVE18, NEON_F, 0, -1, 0, -1, 0, 1, 17 }, - { 76, BARCODE_JAPANPOST, SHKASUTSET_F, 0, -1, 0, -1, 0, 1, 20 }, - { 77, BARCODE_KOREAPOST, NEON_F, 0, -1, 0, -1, 0, 1, 6 }, - { 78, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 79, BARCODE_DBAR_STK, NEON_F, 0, -1, 0, -1, 0, 1, 14 }, - { 80, BARCODE_DBAR_OMNSTK, NEON_F, 0, -1, 0, -1, 0, 1, 14 }, - { 81, BARCODE_DBAR_EXPSTK, ASCII_PRT_F, 0, -1, 0, 11, 0, 1, 74 }, - { 82, BARCODE_PLANET, NEON_F, 0, -1, 0, -1, 0, 1, 38 }, - { 83, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 84, BARCODE_MICROPDF417, 0, 0, -1, 0, 30, 0, 1, 366 }, - { 85, BARCODE_USPS_IMAIL, SODIUM_MNS_F, 0, -1, 0, -1, 0, 1, 32 }, - { 86, BARCODE_PLESSEY, SSET_F, 0, -1, 0, -1, 0, 1, 67 }, - { 87, BARCODE_TELEPEN_NUM, SODIUM_X_F, 0, -1, 0, -1, 0, 1, 136 }, - { 88, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 89, BARCODE_ITF14, NEON_F, 0, -1, 0, -1, 0, 1, 13 }, - { 90, BARCODE_KIX, KRSET_F, 0, -1, 0, -1, 0, 1, 18 }, - { 91, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 92, BARCODE_AZTEC, 0, -1, 4, 0, 36, 0, 1, 4483 }, - { 93, BARCODE_DAFT, DAFT_F, 0, -1, 50, 900, 0, 1, 576 }, - { 94, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 95, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 96, BARCODE_DPD, KRSET_F, 0, -1, 0, -1, 0, 27, 28 }, - { 97, BARCODE_MICROQR, 0, -1, 4, 0, 4, 0, 1, 35 }, - { 98, BARCODE_HIBC_128, SILVER_F, 0, -1, 0, -1, 0, 1, 110 }, - { 99, BARCODE_HIBC_39, SILVER_F, 0, -1, 0, 2, 0, 1, 70 }, - { 100, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 101, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 102, BARCODE_HIBC_DM, SILVER_F, 0, -1, 0, 48, DM_SQUARE | DM_ISO_144, 1, 110 }, - { 103, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 104, BARCODE_HIBC_QR, SILVER_F, -1, 4, 0, 40, ZINT_FULL_MULTIBYTE, 1, 110 }, - { 105, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 106, BARCODE_HIBC_PDF, SILVER_F, -1, 8, 0, 30, 0, 1, 110 }, - { 107, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 108, BARCODE_HIBC_MICPDF, SILVER_F, 0, -1, 0, 30, 0, 1, 110 }, - { 109, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 110, BARCODE_HIBC_BLOCKF, SILVER_F, -1, 44, -1, 67, 0, 1, 110 }, - { 111, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 112, BARCODE_HIBC_AZTEC, SILVER_F, -1, 4, 0, 36, 0, 1, 110 }, - { 113, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 114, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 115, BARCODE_DOTCODE, 0, 0, -1, 0, 200, 0, 1, 900 }, - { 116, BARCODE_HANXIN, 0, -1, 5, 0, 84, ZINT_FULL_MULTIBYTE, 1, 7827 }, - { 117, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 118, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 119, BARCODE_MAILMARK_2D, RUBIDIUM_F, 0, -1, 0, 30, DM_SQUARE | DM_ISO_144, 28, 90 }, - { 120, BARCODE_UPU_S10, KRSET_F, 0, -1, 0, -1, 0, 12, 13 }, - { 121, BARCODE_MAILMARK_4S, RUBIDIUM_F, 0, -1, 0, -1, 0, 14, 26 }, - { 122, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 123, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 124, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 125, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 126, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 127, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, /*len*/ 0, -1 }, - { 128, BARCODE_AZRUNE, NEON_F, 0, -1, 0, -1, 0, 1, 3 }, - { 129, BARCODE_CODE32, NEON_F, 0, -1, 0, -1, 0, 1, 8 }, - { 130, BARCODE_EANX_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, 1, 338 }, - { 131, BARCODE_GS1_128_CC, ASCII_PRT_F, 0, 3, 0, -1, 0, 1, 2361 }, - { 132, BARCODE_DBAR_OMN_CC, NEON_F, 0, 2, 0, -1, 0, 1, 338 }, - { 133, BARCODE_DBAR_LTD_CC, NEON_F, 0, 2, 0, -1, 0, 1, 338 }, - { 134, BARCODE_DBAR_EXP_CC, ASCII_PRT_F, 0, 2, 0, -1, 0, 1, 338 }, - { 135, BARCODE_UPCA_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, 1, 338 }, - { 136, BARCODE_UPCE_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, 1, 338 }, - { 137, BARCODE_DBAR_STK_CC, NEON_F, 0, 2, 0, -1, 0, 1, 338 }, - { 138, BARCODE_DBAR_OMNSTK_CC, NEON_F, 0, 2, 0, -1, 0, 1, 338 }, - { 139, BARCODE_DBAR_EXPSTK_CC, ASCII_PRT_F, 0, 2, 0, 11, 0, 1, 338 }, - { 140, BARCODE_CHANNEL, NEON_F, 0, -1, 3, 8, 0, 1, 7 }, - { 141, BARCODE_CODEONE, 0, 0, -1, 0, 10, 0, 1, 3550 }, - { 142, BARCODE_GRIDMATRIX, 0, 0, 5, 0, 13, ZINT_FULL_MULTIBYTE, 1, 1751 }, - { 143, BARCODE_UPNQR, 0, 0, -1, 0, -1, ZINT_FULL_MULTIBYTE, 1, 411 }, - { 144, BARCODE_ULTRA, 0, -1, 5, 0, 2, ULTRA_COMPRESSION, 1, 504 }, - { 145, BARCODE_RMQR, 0, -1, 4, 0, 38, 0, 1, 361 }, - { 146, BARCODE_BC412, ARSENIC_F, 0, -1, 0, -1, 0, 7, 18 }, - { 147, BARCODE_DXFILMEDGE, SILVER_F, 0, -1, 0, -1, 0, 1, 10 }, - { 148, BARCODE_EAN8_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, 1, 335 }, - { 149, BARCODE_EAN13_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, 1, 338 }, + { 0, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 1, BARCODE_CODE11, SODIUM_MNS_F, 0, -1, 0, 2, 0, -1, 1, 140 }, + { 2, BARCODE_C25STANDARD, NEON_F, 0, -1, 0, 2, 0, -1, 1, 112 }, + { 3, BARCODE_C25INTER, NEON_F, 0, -1, 0, 2, 0, -1, 1, 125 }, + { 4, BARCODE_C25IATA, NEON_F, 0, -1, 0, 2, 0, -1, 1, 80 }, + { 5, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 6, BARCODE_C25LOGIC, NEON_F, 0, -1, 0, 2, 0, -1, 1, 113 }, + { 7, BARCODE_C25IND, NEON_F, 0, -1, 0, 2, 0, -1, 1, 79 }, + { 8, BARCODE_CODE39, SILVER_F, 0, -1, 0, 2, 0, -1, 1, 86 }, + { 9, BARCODE_EXCODE39, SILVER_F, 0, -1, 0, 2, 0, -1, 1, 86 }, + { 10, BARCODE_EAN8, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 11, BARCODE_EAN_2ADDON, NEON_F, 0, -1, 0, -1, 0, -1, 1, 2 }, + { 12, BARCODE_EAN_5ADDON, NEON_F, 0, -1, 0, -1, 0, -1, 1, 5 }, + { 13, BARCODE_EANX, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 19 }, + { 14, BARCODE_EANX_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 19 }, + { 15, BARCODE_EAN13, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 19 }, + { 16, BARCODE_GS1_128, ASCII_PRT_F, 0, -1, 0, -1, 0, -1, 3, 198 }, + { 17, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 18, BARCODE_CODABAR, CALCIUM_F, 0, -1, 0, 2, 0, -1, 3, 103 }, + { 19, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 20, BARCODE_CODE128, 0, 0, -1, 0, -1, 0, -1, 1, 198 }, + { 21, BARCODE_DPLEIT, NEON_F, 0, -1, 0, -1, 0, -1, 1, 13 }, + { 22, BARCODE_DPIDENT, NEON_F, 0, -1, 0, -1, 0, -1, 1, 11 }, + { 23, BARCODE_CODE16K, 0, -1, 16, 0, -1, 0, 4, 1, 154 }, + { 24, BARCODE_CODE49, ASCII_F, 2, 8, 0, -1, 1, 4, 1, 81 }, + { 25, BARCODE_CODE93, ASCII_F, 0, -1, 0, 1, 0, -1, 1, 123 }, + { 26, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 27, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 28, BARCODE_FLAT, NEON_F, 0, -1, 0, -1, 0, -1, 1, 128 }, + { 29, BARCODE_DBAR_OMN, NEON_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 30, BARCODE_DBAR_LTD, NEON_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 31, BARCODE_DBAR_EXP, ASCII_PRT_F, 0, -1, 0, -1, 0, -1, 3, 74 }, + { 32, BARCODE_TELEPEN, ASCII_F, 0, -1, 0, -1, 0, -1, 1, 69 }, + { 33, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 34, BARCODE_UPCA, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 18 }, + { 35, BARCODE_UPCA_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 18 }, + { 36, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 37, BARCODE_UPCE, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 38, BARCODE_UPCE_CHK, SODIUM_PLS_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 39, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 40, BARCODE_POSTNET, NEON_F, 0, -1, 0, -1, 0, -1, 1, 38 }, + { 41, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 42, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 43, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 44, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 45, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 46, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 47, BARCODE_MSI_PLESSEY, NEON_F, 0, -1, 0, 16, 0, -1, 1, 92 }, + { 48, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 49, BARCODE_FIM, FIM_F, 0, -1, 0, -1, 0, -1, 1, 1 }, + { 50, BARCODE_LOGMARS, SILVER_F, 0, -1, 0, 2, 0, -1, 1, 30 }, + { 51, BARCODE_PHARMA, NEON_F, 0, -1, 0, -1, 0, -1, 1, 6 }, + { 52, BARCODE_PZN, NEON_F, 0, -1, 0, 1, 0, -1, 1, 8 }, + { 53, BARCODE_PHARMA_TWO, NEON_F, 0, -1, 0, -1, 0, -1, 1, 8 }, + { 54, BARCODE_CEPNET, NEON_F, 0, -1, 0, -1, 0, -1, 8, 8 }, + { 55, BARCODE_PDF417, 0, -1, 8, 0, 30, 1, 4, 1, 2710 }, + { 56, BARCODE_PDF417COMP, 0, -1, 8, 0, 30, 4, 4, 1, 2710 }, + { 57, BARCODE_MAXICODE, 0, -1, 6, 0, 100, 0, -1, 1, 138 }, + { 58, BARCODE_QRCODE, 0, -1, 4, 0, 40, 200, 200, 1, 7089 }, + { 59, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 60, BARCODE_CODE128AB, 0, 0, -1, 0, -1, 0, -1, 1, 99 }, + { 61, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 62, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 63, BARCODE_AUSPOST, GDSET_F, 0, -1, 0, -1, 0, -1, 8, 23 }, + { 64, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 65, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 66, BARCODE_AUSREPLY, GDSET_F, 0, -1, 0, -1, 0, -1, 1, 8 }, + { 67, BARCODE_AUSROUTE, GDSET_F, 0, -1, 0, -1, 0, -1, 1, 8 }, + { 68, BARCODE_AUSREDIRECT, GDSET_F, 0, -1, 0, -1, 0, -1, 1, 8 }, + { 69, BARCODE_ISBNX, ISBNX_ADDON_SANE_F, 0, -1, 0, -1, 0, -1, 9, 19 }, + { 70, BARCODE_RM4SCC, KRSET_F, 0, -1, 0, -1, 0, -1, 1, 50 }, + { 71, BARCODE_DATAMATRIX, 0, 0, -1, 0, 48, 128, 128, 1, 3550 }, + { 72, BARCODE_EAN14, NEON_F, 0, -1, 0, -1, 0, -1, 1, 13 }, + { 73, BARCODE_VIN, ARSENIC_F, 0, -1, 0, -1, 0, -1, 17, 17 }, + { 74, BARCODE_CODABLOCKF, 0, -1, 44, -1, 67, 4, 4, 1, 2725 }, + { 75, BARCODE_NVE18, NEON_F, 0, -1, 0, -1, 0, -1, 1, 17 }, + { 76, BARCODE_JAPANPOST, SHKASUTSET_F, 0, -1, 0, -1, 0, -1, 1, 20 }, + { 77, BARCODE_KOREAPOST, NEON_F, 0, -1, 0, -1, 0, -1, 1, 6 }, + { 78, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 79, BARCODE_DBAR_STK, NEON_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 80, BARCODE_DBAR_OMNSTK, NEON_F, 0, -1, 0, -1, 0, -1, 1, 14 }, + { 81, BARCODE_DBAR_EXPSTK, ASCII_PRT_F, 0, -1, 0, 11, 0, -1, 1, 74 }, + { 82, BARCODE_PLANET, NEON_F, 0, -1, 0, -1, 0, -1, 1, 38 }, + { 83, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 84, BARCODE_MICROPDF417, 0, 0, -1, 0, 30, 4, 4, 1, 366 }, + { 85, BARCODE_USPS_IMAIL, SODIUM_MNS_F, 0, -1, 0, -1, 0, -1, 1, 32 }, + { 86, BARCODE_PLESSEY, SSET_F, 0, -1, 0, -1, 0, -1, 1, 67 }, + { 87, BARCODE_TELEPEN_NUM, SODIUM_X_F, 0, -1, 0, -1, 0, -1, 1, 136 }, + { 88, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 89, BARCODE_ITF14, NEON_F, 0, -1, 0, -1, 0, 4, 1, 13 }, + { 90, BARCODE_KIX, KRSET_F, 0, -1, 0, -1, 0, -1, 1, 18 }, + { 91, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 92, BARCODE_AZTEC, 0, -1, 4, 0, 36, 128, 128, 1, 4483 }, + { 93, BARCODE_DAFT, DAFT_F, 0, -1, 50, 900, 0, -1, 1, 576 }, + { 94, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 95, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 96, BARCODE_DPD, KRSET_F, 0, -1, 0, -1, 0, 4, 27, 28 }, + { 97, BARCODE_MICROQR, 0, -1, 4, 0, 4, 0, -1, 1, 35 }, + { 98, BARCODE_HIBC_128, SILVER_F, 0, -1, 0, -1, 0, -1, 1, 110 }, + { 99, BARCODE_HIBC_39, SILVER_F, 0, -1, 0, 2, 0, -1, 1, 70 }, + { 100, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 101, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 102, BARCODE_HIBC_DM, SILVER_F, 0, -1, 0, 48, 100, 101, 1, 110 }, + { 103, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 104, BARCODE_HIBC_QR, SILVER_F, -1, 4, 0, 40, 200, 200, 1, 110 }, + { 105, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 106, BARCODE_HIBC_PDF, SILVER_F, -1, 8, 0, 30, 0, -1, 1, 110 }, + { 107, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 108, BARCODE_HIBC_MICPDF, SILVER_F, 0, -1, 0, 30, 0, -1, 1, 110 }, + { 109, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 110, BARCODE_HIBC_BLOCKF, SILVER_F, -1, 44, -1, 67, 0, -1, 1, 110 }, + { 111, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 112, BARCODE_HIBC_AZTEC, SILVER_F, -1, 4, 0, 36, 128, 128, 1, 110 }, + { 113, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 114, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 115, BARCODE_DOTCODE, 0, 0, -1, 0, 200, 0, -1, 1, 900 }, + { 116, BARCODE_HANXIN, 0, -1, 5, 0, 84, 200, 200, 1, 7827 }, + { 117, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 118, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 119, BARCODE_MAILMARK_2D, RUBIDIUM_F, 0, -1, 0, 30, 100, 101, 28, 90 }, + { 120, BARCODE_UPU_S10, KRSET_F, 0, -1, 0, -1, 0, -1, 12, 13 }, + { 121, BARCODE_MAILMARK_4S, RUBIDIUM_F, 0, -1, 0, -1, 0, -1, 14, 26 }, + { 122, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 123, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 124, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 125, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 126, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 127, /*symbology*/ -1, /*sane_flag*/ 0, /*opt_1*/ 0, -1, /*opt_2*/ 0, -1, /*opt_3*/ 0, -1, /*len*/ 0, -1 }, + { 128, BARCODE_AZRUNE, NEON_F, 0, -1, 0, -1, 0, -1, 1, 3 }, + { 129, BARCODE_CODE32, NEON_F, 0, -1, 0, -1, 0, -1, 1, 8 }, + { 130, BARCODE_EANX_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 131, BARCODE_GS1_128_CC, ASCII_PRT_F, 0, 3, 0, -1, 0, -1, 1, 2361 }, + { 132, BARCODE_DBAR_OMN_CC, NEON_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 133, BARCODE_DBAR_LTD_CC, NEON_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 134, BARCODE_DBAR_EXP_CC, ASCII_PRT_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 135, BARCODE_UPCA_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 136, BARCODE_UPCE_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 137, BARCODE_DBAR_STK_CC, NEON_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 138, BARCODE_DBAR_OMNSTK_CC, NEON_F, 0, 2, 0, -1, 0, -1, 1, 338 }, + { 139, BARCODE_DBAR_EXPSTK_CC, ASCII_PRT_F, 0, 2, 0, 11, 0, -1, 1, 338 }, + { 140, BARCODE_CHANNEL, NEON_F, 0, -1, 3, 8, 0, -1, 1, 7 }, + { 141, BARCODE_CODEONE, 0, 0, -1, 0, 10, 0, -1, 1, 3550 }, + { 142, BARCODE_GRIDMATRIX, 0, 0, 5, 0, 13, 200, 200, 1, 1751 }, + { 143, BARCODE_UPNQR, 0, 0, -1, 0, -1, 200, 200, 1, 411 }, + { 144, BARCODE_ULTRA, 0, -1, 5, 0, 2, 128, 128, 1, 504 }, + { 145, BARCODE_RMQR, 0, -1, 4, 0, 38, 0, -1, 1, 361 }, + { 146, BARCODE_BC412, ARSENIC_F, 0, -1, 0, -1, 0, -1, 7, 18 }, + { 147, BARCODE_DXFILMEDGE, SILVER_F, 0, -1, 0, -1, 0, -1, 1, 10 }, + { 148, BARCODE_EAN8_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, -1, 1, 335 }, + { 149, BARCODE_EAN13_CC, SODIUM_PLS_F, 0, 2, 0, -1, 0, -1, 1, 338 }, }; /* Make sure value `v` is between `min` and `max` */ @@ -383,18 +382,29 @@ static int set_symbol(struct zint_symbol *symbol, const int idx, const int chk_s } } /* `option_3` */ - if (length > si->len_min && si->option_3) { - if (*input++ & 1) { /* Odd/even */ - symbol->option_3 = si->option_3; + if (length > si->len_min && (si->option_3_min <= si->option_3_max)) { + if (si->option_3_min + 1 == si->option_3_max) { /* Only one in it? */ + symbol->option_3 = (*input++ & 1) ? si->option_3_min : si->option_3_max; /* Odd/even */ + } else { + symbol->option_3 = clamp(*input++, si->option_3_min, si->option_3_max); } length--; } -#ifdef Z_FUZZ_SET_OUTPUT_OPTIONS + /* `height` */ + if (length > si->len_min && !(ZBarcode_Cap(symbol->symbology, ZINT_CAP_FIXED_RATIO) & ZINT_CAP_FIXED_RATIO)) { + symbol->height = *input++; + length--; + } + /* `border_width` */ + if (length > si->len_min) { + symbol->border_width = *input++; + length--; + } + /* `output_options` */ if (length > si->len_min) { symbol->output_options = *input++ & OUTPUT_OPTIONS_MASK; length--; } -#endif if (length > si->len_max) { return 0; @@ -414,5 +424,54 @@ static int set_symbol(struct zint_symbol *symbol, const int idx, const int chk_s return length; } +/* Boilerplate for stand-alone testing of "fuzz_data" and "fuzz_gs1" to take single corpus file when + `Z_FUZZ_MAIN` defined */ +#define Z_FUZZ_MAIN_READ_ARGV_1(idx, buf) \ +int main(int argc, char *argv[]) { \ + unsigned char data[16384]; \ + size_t size = 0; \ + struct zint_symbol *symbol; \ + int idx; \ + unsigned char *buf; \ + { \ + long fsize; \ + size_t n; \ + FILE *fp; \ + if (argc != 2) { \ + fprintf(stderr, "usage: \n"); \ + return -1; \ + } \ + if (!(fp = fopen(argv[1], "rb"))) { \ + fprintf(stderr, "failed to open input file \"%s\" (%d, %s)\n", argv[1], errno, strerror(errno)); \ + return -1; \ + } \ + if (fseek(fp, 0, SEEK_END) != 0 \ + || (fsize = ftell(fp)) <= 0 || fsize == LONG_MAX \ + || fseek(fp, 0, SEEK_SET) != 0) { \ + fprintf(stderr, "failed to seek input file \"%s\" (%d, %s)\n", argv[1], errno, strerror(errno)); \ + return -1; \ + } \ + if (fsize > (long) sizeof(data)) { \ + fprintf(stderr, "Input file \"%s\" too big, file size %d, buffer max %d\n", argv[1], \ + (int) fsize, (int) sizeof(data)); \ + return -1; \ + } \ + do { \ + n = fread(data + size, 1, fsize - size, fp); \ + if (ferror(fp)) { \ + fprintf(stderr, "Input file \"%s\" read error (%d: %s)", argv[1], errno, strerror(errno)); \ + (void) fclose(fp); \ + return -1; \ + } \ + size += n; \ + } while (!feof(fp) && n > 0 && (long) size < fsize); \ + (void) fclose(fp); \ + if ((long) size != fsize) { \ + fprintf(stderr, "Failed to fully read input file \"%s\" read %d, file size %d\n", \ + argv[1], (int) size, (int) fsize); \ + return -1; \ + } \ + } + /* vim: set ts=4 sw=4 et : */ #endif /* Z_FUZZ_H */ diff --git a/backend/tests/fuzz/fuzz_data.c b/backend/tests/fuzz/fuzz_data.c index b883bf17..e8a7faca 100644 --- a/backend/tests/fuzz/fuzz_data.c +++ b/backend/tests/fuzz/fuzz_data.c @@ -1,7 +1,7 @@ /* fuzz_data.c - fuzzer for libzint (DATA_MODE, all symbologies except GS1_128, DBAR_EXP/STK & composites) */ /* libzint - the open source barcode library - Copyright (C) 2024 Robin Stuart + Copyright (C) 2024-2026 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -36,13 +36,24 @@ extern "C" { #if 0 #define Z_FUZZ_DEBUG /* Set `symbol->debug` flag */ -#define Z_FUZZ_SET_OUTPUT_OPTIONS /* Set `symbol->output_options` */ #endif #include "fuzz.h" +#if Z_FUZZ_MAIN +/* For testing that a corpus file reproduces a bug: + cc -g -O0 -DZ_FUZZ_MAIN fuzz_data.c -o fuzz_data -lzint -fsanitize=address + ./fuzz_data +*/ +#include +#include +Z_FUZZ_MAIN_READ_ARGV_1(idx, buf) +#else int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { struct zint_symbol *symbol; int idx; + unsigned char *buf; /* Dummy, used by "fuzz_gs1.c" */ +#endif + (void)buf; /* Ignore empty or very large input */ if (size < 1 || size > 10000) { @@ -70,8 +81,9 @@ int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { if (!length) { continue; } + symbol->output_options |= BARCODE_MEMORY_FILE; - ret = ZBarcode_Encode(symbol, input, length); + ret = ZBarcode_Encode_and_Print(symbol, input, length, 0 /*rotate_angle*/); assert(ret != ZINT_ERROR_ENCODING_PROBLEM); } diff --git a/backend/tests/fuzz/fuzz_data_seed_corpus.zip b/backend/tests/fuzz/fuzz_data_seed_corpus.zip index d2a53dfdb8dde69d125b185b7a2213df6ff5a880..5016719f33f2c379513fc45fd1f4588f0319ad21 100644 GIT binary patch literal 11150 zcmds-c|6ox_{V3=7-BH?u@9+;(QLL<#+rTKTa4`zB~nr;V@+t$;-ZDLZ&Fbzm7U6d zRkSK8q*BSPl=+=8-8(F&7_1x$g%U+M#K$jP z9Q_BG`%V)KDU>RT0$yYaCD6*%+Q!wz#@lNK3Ud}+y@ET|C5WTY*g*^mHT5log%S!O ziBgQ>cMEp~H8wNbh$uH0+>zRyKO2DO^5Il6g^CcKG90-KLzj;8^o+BbX+@uDg`r!8 zU_{F(7a26l<#NiTl)!W+T1r^lsVw-@(a01Uvgz3D_pC1e3I7M4z~R*tsQdi6^?N{B`~Bw*^-%a^yT0KhI$6iR{z1?Q6zXc6FLWA$5J zCk}_ZfIH0Gg_@oG_#h5gGv+U~R;@x3Z^C_Of zaHeKob)Tv<1v@$q|$_t08S?%$t#bA9fF z?(_>CGcc8Sx$4!T^BWbabE+IR+$bh%Ph?g-NDfwuL03!$e6KiPlki35#2|6m_ABx0 zSON2rZNBt#93vl|jl%9Wm#q8J>71rM>&JH5E$=MmYWF){_D&^*&1^;*{cp!lYjxG< z7Sta4;MlVK%*gg~KT|opc@mSjxpD4fjm3-S@91}y36Fg^{b;P@Z7jtpRpm|LbqkqP zu{p~lJO_5(816eNyE84!!2iIv=T?tvZMx0~$2Iwx8ZMEu+bv$6seev9vf%Zr_ZTsy zuK3{Kx(hh`w?uFKq|--@mQY@ulBxK$GmfI$^xy$R-)_fGdAfr zWc%(7jp&+eeHJ@}3zN9B_?+XNt9}i~AAb^ur;v%d*8VvlEVHEl-DZ$lX}{m*w~fZq zC=vlx)+Bx7i*ci73b{Z=_mIaDjkvdaT3dLpk-rS!v$gsi`xXO&Y774mfNX2>``HHe znYq+c2+TQ&g&mrjV%n!gyR?o4h-vvha_jKuoEeKzj%KqlZf@=?uijD0^E_ICm4CR3 z@UZ5VNxZ5V?pVM4j)jvgP5m=iLODZna^bpKF88DEY#3blfnqH5^=anR%_%@jMK0B?<*ndeS|58^u z)j08k?b&g>i1CtGlF#VuA7`&e-=bGM*m7m(6UM=9j0Wiy<$)U)Bn@KcwZ}ctXiEsU zIn%TEPPY6DweTSPqZ+j<>KpTXlsyY?ySAwpR{pWitoyRX);(P|#{2s;u0LuQ8WD?+ zluS%FENPs)eDnS)d+9BwCZBDYdFkY{<|C_OB^&n-*Ntzy+wqQ~TGScAczWTLUDmin zJyU6uu#&rqs6p&k41C)HTH+`PVB6O6x6O!5MUcBH_L@1?GYRZDiwc*{$t-5cSCw0y zzC8Wrz*Y^Y`YPH+G15aaB|^F6Oe+Csub zD5$ozVuhaw(sTAZYbMCIZdJuaPUNS{Hj-{&>+Z`k25(xeR$uo7eapP@qPUfx z=6qT+PLH1C|+*%T9~=Bw=9E3-f)YNI`a9w=kA*Uw*n zk?A~_45=FuucISNd|f7<>h&)jTy%G1tHOxsc;t$J!Z%wIWX^1U(HCDak||%MYyRo@ zqxVbSZh!JN*39`e%{i9o@YYwMT|>DhyT2!Af_`(ByYBHb!$AWdPtF>wEB#b|E?u&- zh3Pxhzx5MvW_3U0nd9I%oM&GZhe|U0V`(V9K(1NV(x{MzsoUHJIyJyZjf9hX9 zkoeBKP2){QBXiC5?2R4k`(pf-&S<-`B1SpkR>L!0!>1o!S(DWWFVnW##z;v2B|HETi=SWZTg|v}{vh2wTiHj%``~6TWqB&O@Z|Ab)-+xBLtWB~t$DAc#Al28j=w#; z@W_Jl!GJGEs^_U}*59R3Cg2zQrjqC4Agn(Czew^P$>35#33RizWl)W$dnQ+SP{nGQ zgas6-vI}K@X*jLAsMRBCv^8_zb}7R5WQ7%JYf}yuje36*ws`Sww&Hsy(SUrtHJgmD z)6K3tc|0iMP!lEkLc`uV|BidpM}rs6TDfNJa`zVJ9Qwn_^M_KclI%HcH@z}#PP1}t z^^;>KpE-PVxcgRohG}V7*sD10hJBt3>)u7(qsjzcI#F)F{rNg}w(;t>UY(w;5cVYPNwQjT<)H;#F0U$^su=Y)kn*Zb5v{^G<5Pm`HtALTD~WC{8`N0 zwGjsbT>ZY_Z%MR|zyIVh|Na6)ulo!VMX13DM0vN!B;c-ay-+x?5^rsGvQ#lEoxc8S5^CU177WA69MZ| zx*v?_uJQ~?Q0sfqy2R|p;HjX8Pl8W1`+Q?3)|jLyg#;&d*X-N8WO&cHS<0eIPX+f@ z#3;2~J(e9ZrhI&X*LwWO6|tNHKa3B|RZ|YXFRQSqZgt(I9}`vGJ1Sfy438h5=q>d8 zv?BPasiB-p>+0xrPR>ii9TyLGz3I!hoIiJLp?HpZ;x{bZqh}kBc-4WEM#BDc8KqIl zG?SkmwQ_ZKn=VjgS?p8}$26ZvJnBD7iI~q!T&%-(-~=(to`YC;iIP6n{9>c%aSR5% zT{}O$PDir#8<9DQNxh|$BBomgz`yBL$UxPRAD%=%vV9o#ZHDQ!Onr^h8k}FVgi2?(w%_a2!gfA)TEMPBN$gTEsPxdZd!tdVQ<*a}a@6s#VB%?Q zKNi^m++hZ;rMxpsqmgN*2m(wN+{U4Aq@TJ8x3o2@4u zAX063@*_rGK2%$8cWTBi@yySJEbsD`*$G~|BO55~7Ds27CbxxaSE5~&j}-Oawo@<} zQL@-4hbhw(S$AEgpLmpm{aa9#I#*>FX`FLW{;NiGZdf9;nc*^C2nAR%S(NM@HYWn2p=nLSt-YE2w^@+!ze6V6cnAKD}rXd2u(RQKC&{7vVr|w9~Fl_ z9hb4Tl-MeQ#YjX&cw1NnF}~a0&Fx$hTCS?8)iIhkQ?y@io0PEDM{!H}iWK!I7Yiw^ zG7rBU6rnlao#!(v?0bzbqT#7&=@}D)OmG(8f${S!g4;Yb(A|S8piP&SK+IKFH&=H& znkaeD^0>QL5l8dAQqf_fJ8W?{fiqNb;_-uHU@as3^#FB-hHO2>Enq$3Li09mB9qCR zHc2p1`dt&xijpmMphcf@WGAGs;)-oTsaHKDlg?H>J}5^ds(P@y#1(0jOnS1NdfD(B zeLP|GPqY$|SfJb#fGfZj2e&dIH^!`96f8(kxkAy63%MDsl580D`^0|2xy;F^h$2xLD2 zA~oAog3IR)JkQ3d3!06Ei{EtN1%4f6XsD-0HG~JO{azabu8yeqFONQTJNX?igvDZY z7%^x@R73ieG6wsCfSoCBMyYT+=|C_t3H%+GYo{KSMrTaf$@ipP>2`H-@ELdT)=dXm zk?DWn8NnAWmQkuh05HhH>D&VDcLs77PC=n(Vu;69g|Y-g=zd&z%0C;zw zyL$aD0RUT2D4nfy;ATck&hM`UADjjW`zLTJp&$T;uuv%xR>q`@I%C=6pXk1${UM{` zpYak46_tlYu#==6^qjitKE>Csn+DgnwY9ryG-sj3zI<&(-A>QQC=I-ID7kZ9iMY@t z=l$UD>2P*Tq~_it^CLw?igp{8sbc1{esGH9Bkp(?%iLPEMF=m!y!1wiILQ$yR2d$4 z-_%@Pe376%qrAsesyFu=W&PLQg_dg`Se|`1e0um|Jytz0uQ2bppLTH{ZV|hbm~HBl zmp4HszYTh<>gDg^RjNm0i=qWWO3nM;Z4uxK?)d47sa%A>72q#WsQvTdhqFL3c98%N z9Cte6y*jK4=bdXzaunc!!_Gj=t5k>cI?Ep93Gk)_Vx;RWQik*5=dJ1FO5@zY^B-eM z8Aii*@b=3%kdnIJu^pNosEBqheB1#0lLT zUsmNBDebqxD6Byx+HD8AbcmC5@;JvJhcMK8NrKgPT4E|D_(lXN+pm%b2JGS+0n!3B z5U~+Ew%Nsy*oSj3Y&%tOHGP%w#7A~ z@c2UfeC9Xv0#_*)63h(*Uvuy9teh6BU}E-%|CYzMS=$ zw2(T6zZLM#ArUNu_bN~3{`{qnD9r043iJ>Kq416&6uOKDh4&AULE(KtD71wKg?9;& zLE)W0DAXLJZm@iK9}pQ7-sOWrPx7Gfo*yzOyuSy9Vn7f9OF=L|x_!u?@HQS48q0&i zn|jEg@MazqTFrz0+S)?~hPU*fU|Ar10T=w*;6nz6H}#<4NFMmt79TP&ysZZX*Gz%` zmnI)FFubz|1uFu1g+lqY&xec)Z|*_4D|uXKs}C6x-hYE4RfVTag?8hRA>q9qC=vr6 zyUYnL574k8=y!X(3AyMLR$~WkZ=JUihKoAKcmj5-NuyL&D`~D3ZfN!o+E0Ot>BkWqL?(&4jD7$e3_N63RR(ImP@%pG3xm zOM6i6C8;ScOz1<#gv(-3=3P(^f%U^gGGt7+qy%O5gKh|5!UQH{Ot_Q+Wtz)QF{kRF ze}oleOt_o@WlDjI46qX>ZcNAISEg{)0LuK%V+v>p$f$7T07`WM_g!GAfR2ES3Re%H z)M6eLq9sg6`T>+UIz@!43DXhz{)8(BP@*09*Bo$sjGAg{#hEgR}rfh|m-P1w& wkqR%Wq0sd_=r1KUGA_J+hH_u>xZqeptLguXD$G@4PzKR literal 10725 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 diff --git a/backend/tests/fuzz/fuzz_gs1.c b/backend/tests/fuzz/fuzz_gs1.c index b33fa0e4..9a0253a5 100644 --- a/backend/tests/fuzz/fuzz_gs1.c +++ b/backend/tests/fuzz/fuzz_gs1.c @@ -36,20 +36,30 @@ extern "C" { #if 0 #define Z_FUZZ_DEBUG /* Set `symbol->debug` flag */ -#define Z_FUZZ_SET_OUTPUT_OPTIONS /* Set `symbol->output_options` */ #endif #include "fuzz.h" +static const int symbologies[] = { + BARCODE_AZTEC, BARCODE_CODE16K, BARCODE_CODE49, BARCODE_CODEONE, BARCODE_DATAMATRIX, BARCODE_DBAR_EXP, + BARCODE_DBAR_EXPSTK, BARCODE_DOTCODE, BARCODE_GS1_128, BARCODE_QRCODE, BARCODE_RMQR, BARCODE_ULTRA, + BARCODE_EANX_CC, BARCODE_GS1_128_CC, BARCODE_DBAR_OMN_CC, BARCODE_DBAR_LTD_CC, BARCODE_DBAR_EXP_CC, + BARCODE_UPCA_CC, BARCODE_UPCE_CC, BARCODE_DBAR_STK_CC, BARCODE_DBAR_OMNSTK_CC, BARCODE_DBAR_EXPSTK_CC, +}; + +#if Z_FUZZ_MAIN +/* For testing that a corpus file reproduces a bug: + cc -g -O0 -DZ_FUZZ_MAIN fuzz_gs1.c -o fuzz_data -lzint -fsanitize=address + ./fuzz_gs1 +*/ +#include +#include +Z_FUZZ_MAIN_READ_ARGV_1(i, gs1_buf) +#else int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { - static const int symbologies[] = { - BARCODE_AZTEC, BARCODE_CODE16K, BARCODE_CODE49, BARCODE_CODEONE, BARCODE_DATAMATRIX, BARCODE_DBAR_EXP, - BARCODE_DBAR_EXPSTK, BARCODE_DOTCODE, BARCODE_GS1_128, BARCODE_QRCODE, BARCODE_RMQR, BARCODE_ULTRA, - BARCODE_EANX_CC, BARCODE_GS1_128_CC, BARCODE_DBAR_OMN_CC, BARCODE_DBAR_LTD_CC, BARCODE_DBAR_EXP_CC, - BARCODE_UPCA_CC, BARCODE_UPCE_CC, BARCODE_DBAR_STK_CC, BARCODE_DBAR_OMNSTK_CC, BARCODE_DBAR_EXPSTK_CC, - }; struct zint_symbol *symbol; - unsigned char *gs1_buf; int i; + unsigned char *gs1_buf; +#endif /* Ignore empty or very large input */ if (size < 1 || size > 10000) { @@ -65,12 +75,16 @@ int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { gs1_buf[1] = ']'; for (i = 0; i < ZARRAY_SIZE(symbologies); i++) { + static const char primary_ai_raw[] = "0112345678901231"; + static const char primary_ai_caret[] = "^0112345678901231"; + static const char primary_ai_parens[] = "(01)12345678901231"; static const char primary_ai[] = "[01]12345678901231"; static const char primary_upce[] = "12345670"; static const char primary[] = "123456789012"; const int idx = symbologies[i]; const int is_composite = ZBarcode_Cap(idx, ZINT_CAP_COMPOSITE) & ZINT_CAP_COMPOSITE; const unsigned char *input; + int input_mode; int length; int ret; @@ -81,10 +95,21 @@ int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { if (!length) { continue; } + input_mode = symbol->input_mode; + + symbol->output_options |= BARCODE_MEMORY_FILE; if (is_composite) { if (idx == BARCODE_GS1_128_CC || idx == BARCODE_DBAR_EXP_CC || idx == BARCODE_DBAR_EXPSTK_CC) { - memcpy(symbol->primary, primary_ai, sizeof(primary_ai)); + if (input_mode & GS1RAW_MODE) { + memcpy(symbol->primary, primary_ai_raw, sizeof(primary_ai_raw)); + } else if (input[0] == '^') { + memcpy(symbol->primary, primary_ai_caret, sizeof(primary_ai_caret)); + } else if (input_mode & GS1PARENS_MODE) { + memcpy(symbol->primary, primary_ai_parens, sizeof(primary_ai_parens)); + } else { + memcpy(symbol->primary, primary_ai, sizeof(primary_ai)); + } } else if (idx == BARCODE_UPCE_CC) { memcpy(symbol->primary, primary_upce, sizeof(primary_upce)); } else { @@ -92,21 +117,21 @@ int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size) { } } - /* Try it first without GS1NOCHECK_MODE */ - symbol->input_mode = (symbol->input_mode & ~0x07) | GS1_MODE; + /* Try it first with GS1NOCHECK_MODE */ + symbol->input_mode = (input_mode & ~0x07) | GS1_MODE | GS1NOCHECK_MODE; - ret = ZBarcode_Encode(symbol, input, length); + ret = ZBarcode_Encode_and_Print(symbol, input, length, 0 /*rotate_angle*/); assert(ret != ZINT_ERROR_ENCODING_PROBLEM); ZBarcode_Clear(symbol); - /* Now with GS1NOCHECK_MODE */ - symbol->input_mode = (symbol->input_mode & ~0x07) | GS1_MODE | GS1NOCHECK_MODE; - symbol->input_mode &= ~GS1PARENS_MODE; + /* Now without GS1NOCHECK_MODE */ + symbol->input_mode = (input_mode & ~0x07) | GS1_MODE; + symbol->input_mode &= ~GS1NOCHECK_MODE; memcpy(gs1_buf + 2, input, length); - ret = ZBarcode_Encode(symbol, gs1_buf, length + 2); + ret = ZBarcode_Encode_and_Print(symbol, gs1_buf, length + 2, 90 * (size % 3) /*rotate_angle*/); assert(ret != ZINT_ERROR_ENCODING_PROBLEM); } diff --git a/backend/tests/fuzz/fuzz_gs1.dict b/backend/tests/fuzz/fuzz_gs1.dict index dd11f36f..6bbd7c5c 100644 --- a/backend/tests/fuzz/fuzz_gs1.dict +++ b/backend/tests/fuzz/fuzz_gs1.dict @@ -1,10 +1,10 @@ +"[10]" +"[91]" +"^" +"^10" +"^91" +"10" +"91" +"\x1D" "%" "%%" -"[01]" -"[10]" -"[15]" -"[17]" -"[20]" -"[3103]" -"[3202]" -"[91]" diff --git a/backend/tests/fuzz/fuzz_gs1_seed_corpus.zip b/backend/tests/fuzz/fuzz_gs1_seed_corpus.zip index 378a9c8de89a859463b5669bad56b2d6c04fa8fd..feddc6fe3c5add9d43711258be3288c1a8ae44b5 100644 GIT binary patch literal 1346 zcmWIWW@Zs#U|`^2@G2{dS$@m(VmOfJ&B(yO#~{OC00g=Q2JwMG&i*d0p&^_M%xf4A zWP)&M1vdjD%L`@(1~8HQ^E?B~#f|3_9yIe>I5##Mmn~TJil;?`!Be~}vLu0l@tB)f zTHCWWwy0xb$CfQiigX2{@9d1veQf`MdNec*4GmRM&CJq~ zKgkJ{17WC{M!E)O@u30Ej>MU1X#g@25s3ee^7yC%O*285Xsl~sPK=4kzt0~yuwY?k zX2K(Wrdj9iu^l^>mL|sbPvgJ|qgx8n93hPk%-}FV*w&T!yHgBklR6L!LBhmD*T5p) zJ=ieb(8z*-7m^dx5)wN4c)7T`j28WxR`% zV^F+nL;${E&rV24FfcJNF)}kWHQv6#B}r0J3KFXbAH*kx*PxkirfX<-&Y{=${GJze7mh^}-6*Y+= dn_3Dn6)nNxGL@ALlwjC_FdV4wDiAX;005b$C=&nx literal 969 zcmWIWW@Zs#U|`^2D4(MfQ*!gULKu+e$;iOK#~{OC00g=Q2JwMG&i*d0p&^_M%tF4Y znIK$R!Og(P@`9Ox0Zb(SJbyqy_B9Wa-Hirg5etiC_EoFSIdm{hC`p{|%FZT`kdu;_ zmXVjSAT=j3Co8M%s^t_0=ip#&XJcn$4H19M`GOa8rnVPFv#`aI+zzL&U3ep@QjSkGqvoY`0-475fCh=m|QVWMkb5$_&s7;k7~ zLBR3JiG6*%TwGnpS?=At=fKIVzyLI!kx7mjVF7ANkN{c(0b3eDG twice row height) */ + /* 45*/ { 2, BARCODE_MAXICODE, -1, BARCODE_BIND_TOP | BARCODE_BOX, -1, -1, -1, -1, 0, 52, "^11%", -1 }, /* fuzz_data (3rd) */ }; /* GS1_MODE data */ static const struct item gs1_data[] = { - /* 0*/ { 0, BARCODE_QRCODE, GS1_MODE | GS1NOCHECK_MODE, -1, -1, -1, -1, "[]CCCCCLLLLLLLLLLLLLLLLLLLLLCCCCCCCC@CCCCCCCCCCCCCCCCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLLLLLLLLLLLLLLLLL000000032861710*383556LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL155816162LLLLLCC%%C%C%%%%%%%%%%%%%%LLLCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLLLLLLLL)!1661055777[723]T5", -1 }, /* #300 (#14), Andre Maute */ - /* 1*/ { 5, BARCODE_EANX_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, -1, -1, -1, -1, "()111%", -1 }, /* #300 (#5), Andre Maute (`dbar_date()` not checking length + other non-checks) */ - /* 2*/ { 6, BARCODE_UPCA_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, -1, -1, -1, -1, "()90", -1, }, /* #300 (#6), Andre Maute (`dbar_date()` not checking length + other non-checks) */ - /* 3*/ { 7, BARCODE_UPCA_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, -1, -1, -1, -1, "()904OOOOO)CK0336680OOOOOOOOOOOOOO29[0kkkk%%%%(", -1 }, /* #300 (#11), Andre Maute (`gs1_verify()` not checking length on resolve AI data loop) */ - /* 4*/ { 8, BARCODE_GS1_128_CC, GS1_MODE | GS1NOCHECK_MODE, -1, 3, -1, -1, "[]RRR___________________KKKRRR0000", -1 }, /* #300 (#13), Andre Maute (`calc_padding_ccc()` dividing by zero when linear width == 68) */ + /* 0*/ { 0, BARCODE_QRCODE, GS1_MODE | GS1NOCHECK_MODE, 0, -1, -1, -1, -1, 0, 0, "[]CCCCCLLLLLLLLLLLLLLLLLLLLLCCCCCCCC@CCCCCCCCCCCCCCCCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLLLLLLLLLLLLLLLLL000000032861710*383556LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL155816162LLLLLCC%%C%C%%%%%%%%%%%%%%LLLCCCCCCCC%%C%C%%%%%%%%%%%%%%LLLLLLLLLL)!1661055777[723]T5", -1 }, /* #300 (#14), Andre Maute */ + /* 1*/ { 5, BARCODE_EANX_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, 0, -1, -1, -1, -1, 0, 0, "()111%", -1 }, /* #300 (#5), Andre Maute (`dbar_date()` not checking length + other non-checks) */ + /* 2*/ { 6, BARCODE_UPCA_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, 0, -1, -1, -1, -1, 0, 0, "()90", -1, }, /* #300 (#6), Andre Maute (`dbar_date()` not checking length + other non-checks) */ + /* 3*/ { 7, BARCODE_UPCA_CC, GS1_MODE | GS1PARENS_MODE | GS1NOCHECK_MODE, 0, -1, -1, -1, -1, 0, 0, "()904OOOOO)CK0336680OOOOOOOOOOOOOO29[0kkkk%%%%(", -1 }, /* #300 (#11), Andre Maute (`gs1_verify()` not checking length on resolve AI data loop) */ + /* 4*/ { 8, BARCODE_GS1_128_CC, GS1_MODE | GS1NOCHECK_MODE, 0, -1, 3, -1, -1, 0, 0, "[]RRR___________________KKKRRR0000", -1 }, /* #300 (#13), Andre Maute (`calc_padding_ccc()` dividing by zero when linear width == 68) */ + /* 5*/ { 9, BARCODE_DBAR_EXP, GS1_MODE | GS1RAW_MODE, 0, -1, -1, -1, -1, 0, 0, "1012345678901234567890211", -1 }, /* #352, Simon Resch (`gs1_lint_parse_raw_caret()` check that data of AIs with non-predefined lengths are terminated with separators (unless last)) */ + /* 5*/ { 10, BARCODE_DBAR_EXP, GS1_MODE | GS1NOCHECK_MODE | HEIGHTPERROW_MODE | FAST_MODE, 0, -1, -1, -1, -1, 0, 0, "1012345678901234567890211", -1 }, /* #352, Simon Resch (`gs1_lint_parse_raw_caret()` check that data of AIs with non-predefined lengths are terminated with separators (unless last)) */ }; /* Write a setting as 1 char to filename, allowing for -1 meaning none (255 or zero) */ @@ -935,22 +942,29 @@ static void write_corp(const char dirname[], const struct item data[], const int if (data[i].input_mode != -1) { /* Shift out DATA/UNICODE/GS1_MODE (shifted back in `set_symbol()` in "fuzz.h") */ - write_setting(filename, data[i].input_mode >> 3, 0, fp); + write_setting(filename, data[i].input_mode >> 3, 0 /*none*/, fp); } else { - write_setting(filename, data[i].input_mode, 0, fp); + write_setting(filename, data[i].input_mode, 0 /*none*/, fp); } if (si->option_1_min <= si->option_1_max) { - write_setting(filename, data[i].option_1, 0xFF, fp); + write_setting(filename, data[i].option_1, 0xFF /*none*/, fp); } if (si->option_2_min <= si->option_2_max) { - write_setting(filename, data[i].option_2, 0, fp); + write_setting(filename, data[i].option_2, 0 /*none*/, fp); } if (!no_eci && (ZBarcode_Cap(data[i].symbology, ZINT_CAP_ECI) & ZINT_CAP_ECI)) { - write_setting(filename, data[i].eci, 0, fp); + write_setting(filename, data[i].eci, 0 /*none*/, fp); } - if (si->option_3) { - write_setting(filename, data[i].option_3 != -1, 0, fp); + if (si->option_3_min <= si->option_3_max) { + write_setting(filename, data[i].option_3 != -1, 0 /*none*/, fp); } + if (!(ZBarcode_Cap(data[i].symbology, ZINT_CAP_FIXED_RATIO) & ZINT_CAP_FIXED_RATIO)) { + write_setting(filename, data[i].height, 0 /*none*/, fp); + } + /* `border_width` */ + write_setting(filename, data[i].border_width, 0 /*none*/, fp); + /* `output_options` */ + write_setting(filename, data[i].output_options, 0 /*none*/, fp); ret = fwrite(data[i].data, sizeof(char), length, fp); if (ret != length) { diff --git a/backend/tests/test_output.c b/backend/tests/test_output.c index 79b9eb52..8e7c047e 100644 --- a/backend/tests/test_output.c +++ b/backend/tests/test_output.c @@ -1,6 +1,6 @@ /* libzint - the open source barcode library - Copyright (C) 2021-2025 Robin Stuart + Copyright (C) 2021-2026 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -260,9 +260,9 @@ static void test_set_whitespace_offsets(const testCtx *const p_ctx) { /* 5*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP, 0, 0, 1.0f, /*expected*/ 2.0f, 4.0f, 2.0f, 3.0f, 0.0f }, /* 6*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP | BARCODE_BIND, 0, 0, 1.0f, /*expected*/ 2.0f, 4.0f, 2.0f, 3.0f, 0.0f }, /* BIND_TOP wins */ /* 7*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BOX, 0, 0, 1.0f, /*expected*/ 3.0f, 4.0f, 3.0f, 4.0f, 0.0f }, - /* 8*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP | BARCODE_BOX, 0, 0, 1.0f, /*expected*/ 3.0f, 4.0f, 3.0f, 3.0f, 0.0f }, /* BIND_TOP wins */ + /* 8*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP | BARCODE_BOX, 0, 0, 1.0f, /*expected*/ 2.0f, 4.0f, 2.0f, 3.0f, 0.0f }, /* BIND_TOP wins */ /* 9*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BOX | BARCODE_BIND, 0, 0, 1.0f, /*expected*/ 3.0f, 4.0f, 3.0f, 4.0f, 0.0f }, /* BIND_BOX wins */ - /* 10*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP | BARCODE_BOX | BARCODE_BIND, 0, 0, 1.0f, /*expected*/ 3.0f, 4.0f, 3.0f, 3.0f, 0.0f }, /* BIND_TOP wins */ + /* 10*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BIND_TOP | BARCODE_BOX | BARCODE_BIND, 0, 0, 1.0f, /*expected*/ 2.0f, 4.0f, 2.0f, 3.0f, 0.0f }, /* BIND_TOP wins */ /* 11*/ { BARCODE_CODE128, 2, 3, 1, BARCODE_BOX | BARCODE_QUIET_ZONES, 0, 0, 1.0f, /*expected*/ 13.0f, 4.0f, 13.0f, 4.0f, 10.0f }, }; const int data_size = ARRAY_SIZE(data); diff --git a/backend/tests/test_raster.c b/backend/tests/test_raster.c index 4689d281..5394af33 100644 --- a/backend/tests/test_raster.c +++ b/backend/tests/test_raster.c @@ -1044,29 +1044,37 @@ static void test_output_options(const testCtx *const p_ctx) { /* 70*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 50 * 2, 298 + 50 * 2, 0, 347, 50 }, /* 71*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 50 * 2, 1, 50, 15 }, /* 72*/ { BARCODE_MAXICODE, -1, -1, 5, BARCODE_BIND | BARCODE_QUIET_ZONES, 0, 0, "A123", 0, 165, 33, 30, 299 + 10 * 2, 298 + (50 + 10) * 2, 0, 50, 15 }, - /* 73*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 0, 14 }, - /* 74*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 14 }, - /* 75*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 47 }, - /* 76*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 1, 0, 47 }, - /* 77*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 0, 50, 0 }, - /* 78*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + (60 + 50) * 2, 298 + 50 * 2, 1, 50, 0 }, - /* 79*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 }, - /* 80*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 }, - /* 81*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 }, - /* 82*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 }, - /* 83*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 }, - /* 84*/ { BARCODE_ITF14, -1, -1, -1, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, - /* 85*/ { BARCODE_ITF14, -1, -1, -1, -1, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 }, - /* 86*/ { BARCODE_ITF14, -1, -1, 0, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, - /* 87*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, 0, 0, "123", 0, 50, 1, 135, 310, 116, 0, 100, 0 }, - /* 88*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, - /* 89*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 }, - /* 90*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 101, 242, 44, 1, 43, 24 }, - /* 91*/ { BARCODE_CODABLOCKF, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 101, 242, 42, 0, 41, 24 }, - /* 92*/ { BARCODE_CODE16K, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 70, 162, 44, 1, 43, 0 }, - /* 93*/ { BARCODE_CODE16K, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 70, 162, 42, 0, 41, 0 }, - /* 94*/ { BARCODE_CODE49, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 70, 162, 44, 1, 43, 0 }, - /* 95*/ { BARCODE_CODE49, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 70, 162, 42, 0, 41, 0 }, + /* 73*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300 * 2, 1, 299, 0 }, + /* 74*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300 * 2, 0, 300, 0 }, + /* 75*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND | BARCODE_BIND_TOP, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300, 1, 299, 0 }, /* BIND_TOP trumps BIND */ + /* 76*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND | BARCODE_BIND_TOP, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300, 0, 300, 0 }, + /* 77*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 300 * 2, 298 + 300 * 2, 1, 300, 299 }, + /* 78*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + 300 * 2, 298 + 300 * 2, 0, 300, 300 }, + /* 79*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BOX | BARCODE_BIND_TOP, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300, 1, 299, 0 }, /* BIND_TOP trumps BOX */ + /* 80*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BOX | BARCODE_BIND_TOP, 0, 0, "A123", 0, 165, 33, 30, 299, 298 + 300, 0, 300, 0 }, + /* 81*/ { BARCODE_MAXICODE, -1, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 0, 14 }, + /* 82*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 14 }, + /* 83*/ { BARCODE_MAXICODE, 6, -1, -1, -1, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298, 0, 0, 47 }, + /* 84*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 1, 0, 47 }, + /* 85*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, 0, 0, "A123", 0, 165, 33, 30, 299 + 60 * 2, 298 + 50 * 2, 0, 50, 0 }, + /* 86*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, 0, 0, "A123", 0, 165, 33, 30, 299 + (60 + 50) * 2, 298 + 50 * 2, 1, 50, 0 }, + /* 87*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, 0, 0, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 }, + /* 88*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 0, 4, 4 }, + /* 89*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "A123", 0, 165, 33, 30, 299, 298, 1, 4, 14 }, + /* 90*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 1, 4, 4 }, + /* 91*/ { BARCODE_MAXICODE, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 270, 0, "A123", 0, 165, 33, 30, 298, 299, 0, 4, 14 }, + /* 92*/ { BARCODE_ITF14, -1, -1, -1, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, + /* 93*/ { BARCODE_ITF14, -1, -1, -1, -1, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 }, + /* 94*/ { BARCODE_ITF14, -1, -1, 0, -1, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, + /* 95*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, 0, 0, "123", 0, 50, 1, 135, 310, 116, 0, 100, 0 }, + /* 96*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 0, 0, "123", 0, 50, 1, 135, 330, 136, 1, 110, 0 }, + /* 97*/ { BARCODE_ITF14, -1, -1, -1, OUT_BUFFER_INTERMEDIATE, 90, 0, "123", 0, 50, 1, 135, 136, 330, 1, 0, 110 }, + /* 98*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 101, 242, 44, 1, 43, 24 }, + /* 99*/ { BARCODE_CODABLOCKF, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 101, 242, 42, 0, 41, 24 }, + /*100*/ { BARCODE_CODE16K, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 70, 162, 44, 1, 43, 0 }, + /*101*/ { BARCODE_CODE16K, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 70, 162, 42, 0, 41, 0 }, + /*102*/ { BARCODE_CODE49, -1, -1, -1, -1, 0, 0, "A123", 0, 20, 2, 70, 162, 44, 1, 43, 0 }, + /*103*/ { BARCODE_CODE49, -1, -1, -1, BARCODE_BIND_TOP, 0, 0, "A123", 0, 20, 2, 70, 162, 42, 0, 41, 0 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; diff --git a/backend/tests/test_vector.c b/backend/tests/test_vector.c index 37f21522..0630161b 100644 --- a/backend/tests/test_vector.c +++ b/backend/tests/test_vector.c @@ -1389,16 +1389,24 @@ static void test_output_options(const testCtx *const p_ctx) { /* 44*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 1, 0, 67.7334 }, /* 45*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BIND, "A123", 0, 165, 33, 30, 84, 77.733398, 0, 94, 10 }, /* 46*/ { BARCODE_MAXICODE, 6, -1, 5, BARCODE_BOX, "A123", 0, 165, 33, 30, 104, 77.733398, 1, 94, 10 }, - /* 47*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 }, - /* 48*/ { BARCODE_ITF14, -1, -1, -1, -1, "123", 0, 50, 1, 135, 330, 136.28, 1, 320, 10 }, - /* 49*/ { BARCODE_ITF14, -1, -1, 0, -1, "123", 0, 50, 1, 135, 330, 136.28, 1, 320, 10 }, - /* 50*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, "123", 0, 50, 1, 135, 310, 116.28, 0, 300, 0 }, /* No zero-width/height rectangles */ - /* 51*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, "A123", 0, 20, 2, 101, 242, 44, 1, 20, 42 }, - /* 52*/ { BARCODE_CODABLOCKF, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 101, 242, 42, 0, 20, 42 }, - /* 53*/ { BARCODE_CODE16K, -1, -1, -1, -1, "A123", 0, 20, 2, 70, 162, 44, 1, 0, 42 }, - /* 54*/ { BARCODE_CODE16K, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 70, 162, 42, 0, 0, 42 }, - /* 55*/ { BARCODE_CODE49, -1, -1, -1, -1, "A123", 0, 20, 2, 70, 162, 44, 1, 0, 42 }, - /* 56*/ { BARCODE_CODE49, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 70, 162, 42, 0, 0, 42 }, + /* 47*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 177.733398, 1, 0, 0 }, + /* 48*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 177.733398, 1, 0, 117.733398 }, + /* 49*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP, "A123", 0, 165, 33, 30, 60, 117.733398, 1, 0, 0 }, + /* 50*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP, "A123", 0, 165, 33, 30, 60, 117.733398, 0, 0, 117.733398 }, + /* 51*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP | BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 117.733398, 1, 0, 0 }, /* BIND_TOP trumps BIND */ + /* 52*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP | BARCODE_BIND, "A123", 0, 165, 33, 30, 60, 117.733398, 0, 0, 117.733398 }, + /* 53*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP | BARCODE_BOX, "A123", 0, 165, 33, 30, 60, 117.733398, 1, 0, 0 }, /* BIND_TOP trumps BOX */ + /* 54*/ { BARCODE_MAXICODE, -1, -1, 30, BARCODE_BIND_TOP | BARCODE_BOX, "A123", 0, 165, 33, 30, 60, 117.733398, 0, 0, 117.733398 }, + /* 55*/ { BARCODE_MAXICODE, -1, -1, -1, BARCODE_DOTTY_MODE, "A123", ZINT_ERROR_INVALID_OPTION, -1, -1, -1, -1, -1, -1, -1, -1 }, + /* 56*/ { BARCODE_ITF14, -1, -1, -1, -1, "123", 0, 50, 1, 135, 330, 136.28, 1, 320, 10 }, + /* 57*/ { BARCODE_ITF14, -1, -1, 0, -1, "123", 0, 50, 1, 135, 330, 136.28, 1, 320, 10 }, + /* 58*/ { BARCODE_ITF14, -1, -1, 0, BARCODE_BOX, "123", 0, 50, 1, 135, 310, 116.28, 0, 300, 0 }, /* No zero-width/height rectangles */ + /* 59*/ { BARCODE_CODABLOCKF, -1, -1, -1, -1, "A123", 0, 20, 2, 101, 242, 44, 1, 20, 42 }, + /* 60*/ { BARCODE_CODABLOCKF, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 101, 242, 42, 0, 20, 42 }, + /* 61*/ { BARCODE_CODE16K, -1, -1, -1, -1, "A123", 0, 20, 2, 70, 162, 44, 1, 0, 42 }, + /* 62*/ { BARCODE_CODE16K, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 70, 162, 42, 0, 0, 42 }, + /* 63*/ { BARCODE_CODE49, -1, -1, -1, -1, "A123", 0, 20, 2, 70, 162, 44, 1, 0, 42 }, + /* 64*/ { BARCODE_CODE49, -1, -1, -1, BARCODE_BIND_TOP, "A123", 0, 20, 2, 70, 162, 42, 0, 0, 42 }, }; int data_size = ARRAY_SIZE(data); int i, length, ret; diff --git a/backend/vector.c b/backend/vector.c index 6e15a93a..8c653946 100644 --- a/backend/vector.c +++ b/backend/vector.c @@ -1017,24 +1017,24 @@ INTERNAL int zint_plot_vector(struct zint_symbol *symbol, int rotate_angle, int last_rect->x = xoffset; last_rect->width -= xoffset + roffset; } - } - if (symbol->output_options & BARCODE_BOX) { - const float xbox_right = vector->width - symbol->border_width; - float box_top = yoffset; - /* Following equivalent to symbol->height except for BARCODE_MAXICODE */ - float box_height = vector->height - textoffset - dot_overspill - yoffset - boffset; - if (horz_outside) { - box_top = symbol->border_width; - box_height = vector->height - symbol->border_width * 2; - } else if (upceanflag == 2 || upceanflag == 5) { - box_top += textoffset; + if (symbol->output_options & BARCODE_BOX) { + const float xbox_right = vector->width - symbol->border_width; + float box_top = yoffset; + /* Following equivalent to symbol->height except for BARCODE_MAXICODE */ + float box_height = vector->height - textoffset - dot_overspill - yoffset - boffset; + if (horz_outside) { + box_top = symbol->border_width; + box_height = vector->height - symbol->border_width * 2; + } else if (upceanflag == 2 || upceanflag == 5) { + box_top += textoffset; + } + /* Left */ + if (!vector_add_rect(symbol, 0.0f, box_top, symbol->border_width, box_height, &last_rect)) + return ZINT_ERROR_MEMORY; + /* Right */ + if (!vector_add_rect(symbol, xbox_right, box_top, symbol->border_width, box_height, &last_rect)) + return ZINT_ERROR_MEMORY; } - /* Left */ - if (!vector_add_rect(symbol, 0.0f, box_top, symbol->border_width, box_height, &last_rect)) - return ZINT_ERROR_MEMORY; - /* Right */ - if (!vector_add_rect(symbol, xbox_right, box_top, symbol->border_width, box_height, &last_rect)) - return ZINT_ERROR_MEMORY; } } diff --git a/docs/README b/docs/README index 89e061c6..65a97637 100644 --- a/docs/README +++ b/docs/README @@ -1,4 +1,5 @@ -% docs/README 2026-03-17 +% docs/README 2026-03-22 +% vim: set ts=4 sw=4 et : For generation of "docs/manual.html", "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" and man pages "docs/zint.1" from "docs/zint.1.pmd" and "docs/zint-qt.1" from "docs/zint-qt.1.pmd" @@ -6,8 +7,8 @@ using pandoc >= 3.8.2. On Ubuntu/Debian (tested on Ubuntu 22.04 and Ubuntu 24.04) - wget https://github.com/jgm/pandoc/releases/download/3.9/pandoc-3.9-1-amd64.deb - sudo dpkg -i pandoc-3.9-1-amd64.deb + wget https://github.com/jgm/pandoc/releases/download/3.9.0.2/pandoc-3.9.0.2-1-amd64.deb + sudo dpkg -i pandoc-3.9.0.2-1-amd64.deb sudo apt install librsvg2-bin sudo apt install texlive-xetex sudo apt install texlive-lang-cjk @@ -16,9 +17,9 @@ On Ubuntu/Debian (tested on Ubuntu 22.04 and Ubuntu 24.04) On Fedora (tested on Fedora Linux 38 (Workstation Edition) and Fedora Linux 42 (Workstation Edition)) - wget https://github.com/jgm/pandoc/releases/download/3.9/pandoc-3.9-linux-amd64.tar.gz - tar xf pandoc-3.9-linux-amd64.tar.gz - sudo mv -i pandoc-3.9/bin/pandoc /usr/local/bin + wget https://github.com/jgm/pandoc/releases/download/3.9.0.2/pandoc-3.9.0.2-linux-amd64.tar.gz + tar xf pandoc-3.9.0.2-linux-amd64.tar.gz + sudo mv -i pandoc-3.9.0.2/bin/pandoc /usr/local/bin sudo dnf install librsvg2-tools.x86_64 sudo dnf install texlive-xetex sudo dnf install texlive-ctex.noarch diff --git a/docs/zint-qt.1 b/docs/zint-qt.1 index cfeaec01..72bd0b60 100644 --- a/docs/zint-qt.1 +++ b/docs/zint-qt.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 3.9 +.\" Automatically generated by Pandoc 3.9.0.2 .\" .TH "ZINT\-QT" "1" "March 2026" "Version 2.16.0.9" .SH NAME