libs: Robustness updates for Windows

terryburton · terryburton · commit 62a40c078a71 · 2026-03-30T04:43:39.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,6 +43,18 @@ jobs:
       - name: Test
         run: make test
 
+      - name: Create CRLF copy of barcode.ps
+        run: sed 's/$/\r/' build/monolithic/barcode.ps > build/monolithic/barcode_crlf.ps
+
+      - name: Store monolithic barcode.ps
+        uses: actions/upload-artifact@v4
+        with:
+          name: monolithic-barcode-ps
+          path: |
+            build/monolithic/barcode.ps
+            build/monolithic/barcode_crlf.ps
+          retention-days: 1
+
   #
   #  C library CI
   #
@@ -103,6 +115,49 @@ jobs:
           make -C libs/c -j "$(nproc)" test CC=gcc
           make -C libs/c test-valgrind
 
+  ci-windows:
+
+    needs: ci
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - name: Load barcode.ps
+        uses: actions/download-artifact@v4
+        with:
+          name: monolithic-barcode-ps
+          path: build/monolithic
+
+      - name: MSVC build
+        working-directory: libs/c
+        run: |
+          cl /W4 /WX /Od /Zi ^
+            /D_CRT_SECURE_NO_WARNINGS ^
+            postscriptbarcode.c ^
+            postscriptbarcode_test.c ^
+            /Fe:postscriptbarcode_test.exe
+        shell: cmd
+
+      - name: Test with LF barcode.ps
+        working-directory: libs/c
+        run: postscriptbarcode_test.exe
+        shell: cmd
+
+      - name: Test with CRLF barcode.ps
+        working-directory: libs/c
+        run: |
+          copy /Y ..\..\build\monolithic\barcode_crlf.ps ..\..\build\monolithic\barcode.ps
+          postscriptbarcode_test.exe
+        shell: cmd
+
   ci-scan-build:
 
     runs-on: ubuntu-24.04
@@ -233,6 +288,7 @@ jobs:
       - ci
       - ci-clang
       - ci-gcc
+      - ci-windows
       - ci-valgrind
       - ci-scan-build
       - ci-bindings
diff --git a/libs/c/Makefile b/libs/c/Makefile
@@ -60,7 +60,7 @@ TEST_STATIC = $(NAME)_test_static
 PREFIX = /usr/local
 LIBDIR = $(PREFIX)/lib
 
-.PHONY: default all clean lib libstatic libshared test test-valgrind fuzzer fuzzer-corpus-seeds clean-fuzzer-corpus install install-static install-shared uninstall
+.PHONY: default all clean lib libstatic libshared test test-static test-valgrind fuzzer fuzzer-corpus-seeds clean-fuzzer-corpus install install-static install-shared uninstall
 
 default: lib
 all: default test
@@ -95,6 +95,9 @@ test: $(TEST_SHARED) $(TEST_STATIC)
 	$(SAN_ENV) LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ./$(TEST_SHARED)
 	$(SAN_ENV) ./$(TEST_STATIC)
 
+test-static: $(TEST_STATIC)
+	$(SAN_ENV) ./$(TEST_STATIC)
+
 # Valgrind: full memory checking with leak detection.
 # Mutually exclusive with ASAN/MSAN.
 #
diff --git a/libs/c/postscriptbarcode.c b/libs/c/postscriptbarcode.c
@@ -168,8 +168,9 @@ static const Resource *get_resource(BWIPP *ctx, const char *name) {
 }
 
 /* Read resource body from file on demand; returns NULL on I/O error */
-static char *load_code(BWIPP *ctx, const Resource *resource) {
+static char *load_code(BWIPP *ctx, const Resource *resource, size_t *out_len) {
 	char *code;
+	size_t i, j;
 
 	if (resource->code_offset < 0 || !ctx->f)
 		return NULL;
@@ -188,7 +189,14 @@ static char *load_code(BWIPP *ctx, const Resource *resource) {
 		return NULL;
 	}
 
-	code[resource->code_len] = '\0';
+	/* Strip \r from CRLF sequences (file opened in binary mode) */
+	for (i = 0, j = 0; i < resource->code_len; i++) {
+		if (code[i] != '\r' || i + 1 >= resource->code_len || code[i + 1] != '\n')
+			code[j++] = code[i];
+	}
+	code[j] = '\0';
+	*out_len = j;
+
 	return code;
 }
 
@@ -373,7 +381,7 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 	ctx->hexify_width = hexify_width;
 	tail = &ctx->resourcelist;
 
-	f = fopen(filename, "r");
+	f = fopen(filename, "rb");
 	if (!f)
 		goto error;
 
@@ -386,6 +394,14 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 	skip = true;
 	while (fgets(buf, sizeof buf, f)) {
 		size_t line_len = strlen(buf);
+		size_t raw_len = line_len;
+
+		/* Strip \r from CRLF (binary mode preserves \r) */
+		if (line_len >= 2 && buf[line_len - 2] == '\r' && buf[line_len - 1] == '\n') {
+			buf[line_len - 2] = '\n';
+			buf[line_len - 1] = '\0';
+			line_len--;
+		}
 
 		/* Reject marker lines truncated by fgets */
 		if (strncmp(buf, "% --", 4) == 0 &&
@@ -453,6 +469,8 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 				*code = '\0';
 			code_len = 0;
 			code_start = ftell(f);
+			if (code_start < 0)
+				goto error;
 
 			continue;
 
@@ -478,6 +496,8 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 				if (!add_property(resource, key, value))
 					goto error;
 				code_start = ftell(f);
+				if (code_start < 0)
+					goto error;
 				continue;
 			}
 		}
@@ -501,6 +521,8 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 				goto error;
 
 			code_start = ftell(f);
+			if (code_start < 0)
+				goto error;
 			continue;
 
 		} /* REQUIRES */
@@ -531,15 +553,19 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 				goto error;
 
 			if (lazy) {
+				long end_pos = ftell(f);
+				if (end_pos < 0)
+					goto error;
 				resource->code = NULL;
 				resource->code_offset = code_start;
+				resource->code_len = (size_t)(end_pos - (long)raw_len - code_start);
 			} else {
 				resource->code = strdup(code);
 				if (!resource->code)
 					goto error;
 				*code = '\0';
+				resource->code_len = code_len;
 			}
-			resource->code_len = code_len;
 			code_len = 0;
 
 			/* Add to ResourceList */
@@ -563,13 +589,9 @@ BWIPP_API BWIPP *bwipp_load_ex(const bwipp_load_init_opts_t *opts) {
 		} /* END */
 
 		/* PS Code */
-		if (resource) {
-			if (lazy) {
-				code_len += line_len;
-			} else {
-				if (!safe_append_n(code, &code_len, MAX_CODE, buf, line_len))
-					goto error;
-			}
+		if (resource && !lazy) {
+			if (!safe_append_n(code, &code_len, MAX_CODE, buf, line_len))
+				goto error;
 		}
 	}
 
@@ -862,11 +884,12 @@ static bool append_resource_code(BWIPP *ctx, const Resource *res,
 	if (res->code) {
 		return safe_append_n(buf, pos, capacity, res->code, res->code_len);
 	} else {
-		char *lazy_code = load_code(ctx, res);
+		size_t len;
+		char *lazy_code = load_code(ctx, res, &len);
 		bool ok;
 		if (!lazy_code)
 			return false;
-		ok = safe_append_n(buf, pos, capacity, lazy_code, res->code_len);
+		ok = safe_append_n(buf, pos, capacity, lazy_code, len);
 		free(lazy_code);
 		return ok;
 	}
diff --git a/libs/c/postscriptbarcode_private.h b/libs/c/postscriptbarcode_private.h
@@ -36,6 +36,11 @@
 #include "postscriptbarcode.h"
 #include <stddef.h>
 
+#ifdef _MSC_VER
+#define strdup _strdup
+#define strtok_r strtok_s
+#endif
+
 typedef struct Property {
 	char *key, *value;
 } Property;
diff --git a/libs/c/postscriptbarcode_test.c b/libs/c/postscriptbarcode_test.c
@@ -68,7 +68,7 @@ static BWIPP *load_from(const char *filename) {
 
 
 static void write_mock_ps(const char *filename, const char *content) {
-	FILE *f = fopen(filename, "w");
+	FILE *f = fopen(filename, "wb");
 	if (!f) {
 		perror(filename);
 		abort();
@@ -584,7 +584,7 @@ static void test_load_long_requires_line(void) {
 	BWIPP *ctx;
 	FILE *f;
 
-	f = fopen(MOCK_PS, "w");
+	f = fopen(MOCK_PS, "wb");
 	if (!f) abort();
 	fputs("%!PS\n", f);
 	fputs("% Barcode Writer in Pure PostScript - Version 2099-01-01\n", f);
@@ -2447,6 +2447,7 @@ static void test_real_load(void) {
 
 	TEST_CHECK(bwipp_get_version(ctx) != NULL);
 	TEST_CHECK(strlen(bwipp_get_version(ctx)) >= 10);
+	TEST_CHECK(strchr(bwipp_get_version(ctx), '\r') == NULL);
 
 	bwipp_unload(ctx);
 }
@@ -2464,11 +2465,13 @@ static void test_real_emit_required(void) {
 	/* Resource with dependencies */
 	TEST_CHECK((out = bwipp_emit_required_resources(ctx, "code39ext")) != NULL);
 	TEST_CHECK(strlen(out) > 0);
+	TEST_CHECK(strchr(out, '\r') == NULL);
 	bwipp_free(out);
 
 	/* Resource without dependencies */
 	TEST_CHECK((out = bwipp_emit_required_resources(ctx, "preamble")) != NULL);
 	TEST_CHECK(strlen(out) > 0);
+	TEST_CHECK(strchr(out, '\r') == NULL);
 	bwipp_free(out);
 
 	/* Missing resource */
@@ -2491,6 +2494,7 @@ static void test_real_emit_all(void) {
 
 	TEST_CHECK((out = bwipp_emit_all_resources(ctx)) != NULL);
 	TEST_CHECK(strlen(out) > 100000);
+	TEST_CHECK(strchr(out, '\r') == NULL);
 	bwipp_free(out);
 
 	bwipp_unload(ctx);
@@ -2656,6 +2660,8 @@ static void test_real_lazy_emit_required(void) {
 	TEST_ASSERT(lazy_out != NULL);
 
 	TEST_CHECK(strcmp(eager_out, lazy_out) == 0);
+	TEST_CHECK(strchr(eager_out, '\r') == NULL);
+	TEST_CHECK(strchr(lazy_out, '\r') == NULL);
 
 	bwipp_free(eager_out);
 	bwipp_free(lazy_out);
@@ -2686,6 +2692,8 @@ static void test_real_lazy_emit_all(void) {
 	TEST_ASSERT(lazy_out != NULL);
 
 	TEST_CHECK(strcmp(eager_out, lazy_out) == 0);
+	TEST_CHECK(strchr(eager_out, '\r') == NULL);
+	TEST_CHECK(strchr(lazy_out, '\r') == NULL);
 
 	bwipp_free(eager_out);
 	bwipp_free(lazy_out);
