Update libpng to 1.6.51 (#1862)

This was the only RPN case to not assign a deliberate value
in all possible branches.

Fixes #1858

.github/scripts/build_libpng.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-pngver=1.6.50
+pngver=1.6.51
 
 ## Grab sources and check them
 
 curl -LOJ "http://prdownloads.sourceforge.net/libpng/libpng-$pngver.tar.xz?download"
 # Brew doesn't provide any sha256sum, so we're making do with `sha2` instead.
-if [ "$(sha2 -q -256 libpng-$pngver.tar.xz)" != 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 ]; then
+if [ "$(sha2 -q -256 libpng-$pngver.tar.xz)" != a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2 ]; then
 	sha2 -256 libpng-$pngver.tar.xz
 	echo Checksum mismatch! Aborting. >&2
 	exit 1

.github/scripts/get_win_deps.ps1

@@ -16,8 +16,8 @@ function getlibrary ([string] $URI, [string] $filename, [string] $hash, [string]
 }
 
 getlibrary 'https://www.zlib.net/zlib131.zip' 'zlib.zip' '72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17' .
-getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.50.zip' 'libpng.zip' 'f6bb2544d2cf5465af3a695dee0b7eacff82f11a50aa4672ef0e19df6e16d455' .
+getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.51.zip' 'libpng.zip' 'd1e8544445152f5c71fc58d06067da80f3f642f268d2c3e1114a7f34fd739e32' .
 getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' install_dir
 
 Move-Item zlib-1.3.1 zlib
-Move-Item libpng-1.6.50 libpng
+Move-Item libpng-1.6.51 libpng

.github/scripts/mingw-w64-libpng-dev.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-pngver=1.6.50
+pngver=1.6.51
 arch="$1"
 
 ## Grab sources and check them
 
 wget http://downloads.sourceforge.net/project/libpng/libpng16/$pngver/libpng-$pngver.tar.xz
-echo 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 libpng-$pngver.tar.xz | sha256sum -c -
+echo a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2 libpng-$pngver.tar.xz | sha256sum -c -
 
 ## Extract sources and patch them
 

CMakeLists.txt

@@ -49,7 +49,7 @@ else()
                   -fsanitize=float-divide-by-zero)
     add_compile_options(${SAN_FLAGS})
     add_link_options(${SAN_FLAGS})
-    add_definitions(-D_GLIBCXX_ASSERTIONS)
+    add_definitions(-D_GLIBCXX_ASSERTIONS -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
     # A non-zero optimization level is desired in debug mode, but allow overriding it nonetheless
     set(CMAKE_CXX_FLAGS_DEBUG "-g -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls ${CMAKE_CXX_FLAGS_DEBUG}"
                               CACHE STRING "" FORCE)

Makefile

@@ -222,8 +222,8 @@ develop:
 		-Wformat=2 -Wformat-overflow=2 -Wformat-truncation=1 \
 		-Wno-format-nonliteral -Wno-strict-overflow -Wno-unused-but-set-variable \
 		-Wno-type-limits -Wno-tautological-constant-out-of-range-compare -Wvla \
-		-D_GLIBCXX_ASSERTIONS -fsanitize=address -fsanitize=undefined \
-		-fsanitize=float-divide-by-zero" \
+		-D_GLIBCXX_ASSERTIONS -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG \
+		-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero" \
 		CXXFLAGS="-ggdb3 -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls"
 
 # Target used in development to debug with gdb.

src/asm/main.cpp

@@ -296,7 +296,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbasm %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -381,7 +381,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgbasm %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/fix/main.cpp

@@ -252,7 +252,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbfix %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':

src/gfx/main.cpp

@@ -409,7 +409,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgbgfx %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -481,7 +481,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgbgfx %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/link/assign.cpp

@@ -208,50 +208,37 @@ static std::optional<size_t> getPlacement(Section const &section, MemoryLocation
 }
 
 static std::string getSectionDescription(Section const &section) {
-	std::string where;
-
-	char bank[8], addr[8], mask[8], offset[8];
+	std::string description =
+	    "\"" + section.name + "\" (" + sectionTypeInfo[section.type].name + " section) ";
 	if (section.isBankFixed && sectTypeBanks(section.type) != 1) {
+		char bank[8];
 		snprintf(bank, sizeof(bank), "%02" PRIx32, section.bank);
-	}
-	if (section.isAddressFixed) {
-		snprintf(addr, sizeof(addr), "%04" PRIx16, section.org);
-	}
-	if (section.isAlignFixed) {
-		snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask));
-		snprintf(offset, sizeof(offset), "%" PRIx16, section.alignOfs);
-	}
-
-	if (section.isBankFixed && sectTypeBanks(section.type) != 1) {
 		if (section.isAddressFixed) {
-			where = "at $";
-			where += bank;
-			where += ":";
-			where += addr;
+			char addr[8];
+			snprintf(addr, sizeof(addr), "%04" PRIx16, section.org);
+			description = description + "at $" + bank + ":" + addr;
 		} else if (section.isAlignFixed) {
-			where = "in bank $";
-			where += bank;
-			where += " with align mask $";
-			where += mask;
+			char mask[8];
+			snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask));
+			description = description + "in bank $" + bank + " with align mask $" + mask;
 		} else {
-			where = "in bank $";
-			where += bank;
+			description = description + "in bank $" + bank;
 		}
 	} else {
 		if (section.isAddressFixed) {
-			where = "at address $";
-			where += addr;
+			char addr[8];
+			snprintf(addr, sizeof(addr), "%04" PRIx16, section.org);
+			description = description + "at address $" + addr;
 		} else if (section.isAlignFixed) {
-			where = "with align mask $";
-			where += mask;
-			where += " and offset $";
-			where += offset;
+			char mask[8], offset[8];
+			snprintf(mask, sizeof(mask), "%" PRIx16, static_cast<uint16_t>(~section.alignMask));
+			snprintf(offset, sizeof(offset), "%" PRIx16, section.alignOfs);
+			description = description + "with align mask $" + mask + " and offset $" + offset;
 		} else {
-			where = "anywhere";
+			description = description + "anywhere";
 		}
 	}
-
-	return where;
+	return description;
 }
 
 // Places a section in a suitable location, or error out if it fails to.
@@ -310,19 +297,11 @@ static void placeSection(Section &section) {
 
 	if (!section.isBankFixed || !section.isAddressFixed) {
 		// If a section failed to go to several places, nothing we can report
-		fatal(
-		    "Unable to place \"%s\" (%s section) %s",
-		    section.name.c_str(),
-		    sectionTypeInfo[section.type].name.c_str(),
-		    getSectionDescription(section).c_str()
-		);
+		fatal("Unable to place %s", getSectionDescription(section).c_str());
 	} else if (section.org + section.size > sectTypeEndAddr(section.type) + 1) {
 		// If the section just can't fit the bank, report that
 		fatal(
-		    "Unable to place \"%s\" (%s section) %s: section runs past end of region ($%04x > "
-		    "$%04x)",
-		    section.name.c_str(),
-		    sectionTypeInfo[section.type].name.c_str(),
+		    "Unable to place %s: section runs past end of region ($%04x > $%04x)",
 		    getSectionDescription(section).c_str(),
 		    section.org + section.size,
 		    sectTypeEndAddr(section.type) + 1
@@ -330,9 +309,7 @@ static void placeSection(Section &section) {
 	} else {
 		// Otherwise there is overlap with another section
 		fatal(
-		    "Unable to place \"%s\" (%s section) %s: section overlaps with \"%s\"",
-		    section.name.c_str(),
-		    sectionTypeInfo[section.type].name.c_str(),
+		    "Unable to place %s: section overlaps with \"%s\"",
 		    getSectionDescription(section).c_str(),
 		    out_OverlappingSection(section)->name.c_str()
 		);

src/link/main.cpp

@@ -283,7 +283,7 @@ static void parseArg(int ch, char *arg) {
 
 		// LCOV_EXCL_START
 	case 'V':
-		printf("rgblink %s\n", get_package_version_string());
+		printf("%s %s\n", usage.name.c_str(), get_package_version_string());
 		exit(0);
 
 	case 'v':
@@ -330,7 +330,7 @@ static void verboseOutputConfig() {
 
 	style_Set(stderr, STYLE_MAGENTA, false);
 
-	fprintf(stderr, "rgblink %s\n", get_package_version_string());
+	fprintf(stderr, "%s %s\n", usage.name.c_str(), get_package_version_string());
 
 	printVVVVVVerbosity();
 

src/link/object.cpp

@@ -420,19 +420,15 @@ void obj_ReadFile(std::string const &filePath, size_t fileID) {
 	}
 	Defer closeFile{[&] { fclose(file); }};
 
-	// First, check if the object is a RGBDS object or a SDCC one. If the first byte is 'R',
-	// we'll assume it's a RGBDS object file, and otherwise, that it's a SDCC object file.
-	int c = getc(file);
-
-	ungetc(c, file); // Guaranteed to work
-	switch (c) {
+	// First, check if the object is a RGBDS object, a SDCC one, or neither.
+	// A single `ungetc` is guaranteed to work.
+	switch (ungetc(getc(file), file)) {
 	case EOF:
 		fatal("File \"%s\" is empty!", fileName);
 
-	case 'R':
-		break;
-
-	default:
+	case 'X':
+	case 'D':
+	case 'Q': {
 		// This is (probably) a SDCC object file, defer the rest of detection to it.
 		// Since SDCC does not provide line info, everything will be reported as coming from the
 		// object file. It's better than nothing.
@@ -450,11 +446,16 @@ void obj_ReadFile(std::string const &filePath, size_t fileID) {
 		return;
 	}
 
-	// Begin by reading the magic bytes
-	int matchedElems;
+	case 'R':
+		// Check the magic byte signature for a RGB object file.
+		if (char magic[literal_strlen(RGBDS_OBJECT_VERSION_STRING)];
+		    fread(magic, 1, sizeof(magic), file) == sizeof(magic)
+		    && !memcmp(magic, RGBDS_OBJECT_VERSION_STRING, sizeof(magic))) {
+			break;
+		}
+		[[fallthrough]];
 
-	if (fscanf(file, RGBDS_OBJECT_VERSION_STRING "%n", &matchedElems) == 1
-	    && matchedElems != literal_strlen(RGBDS_OBJECT_VERSION_STRING)) {
+	default:
 		fatal("%s: Not a RGBDS object file", fileName);
 	}
 

src/link/patch.cpp

@@ -437,6 +437,7 @@ static int32_t computeRPNExpr(Patch const &patch, std::vector<Symbol> const &fil
 			} else if (Symbol const *symbol = getSymbol(fileSymbols, value); !symbol) {
 				errorAt(patch, "Undefined symbol `%s`", fileSymbols[value].name.c_str());
 				sym_TraceLocalAliasedSymbols(fileSymbols[value].name);
+				value = 0;
 				isError = true;
 			} else if (std::holds_alternative<Label>(symbol->data)) {
 				Label const &label = std::get<Label>(symbol->data);

src/version.cpp

@@ -14,7 +14,13 @@
 #if !defined(NDEBUG) && defined(__SANITIZE_ADDRESS__) && !defined(__APPLE__)
 extern "C" {
 	char const *__asan_default_options(void) {
-		return "detect_leaks=1";
+		return "detect_leaks=1"
+		       ":detect_stack_use_after_return=1"
+		       ":detect_invalid_pointer_pairs=2"
+		       ":check_initialization_order=1"
+		       ":strict_init_order=1"
+		       ":strict_string_checks=1"
+		       ":print_legend=0";
 	}
 }
 #endif

test/link/rpn-bad-sym-id.asm

@@ -0,0 +1,3 @@
+SECTION "bad", ROM0
+ld a, FOO * 256
+ld a, BAR * 256

test/link/rpn-bad-sym-id.out

@@ -0,0 +1,5 @@
+error: Undefined symbol `BAR`
+    at rpn-bad-sym-id.asm(3)
+error: Undefined symbol `FOO`
+    at rpn-bad-sym-id.asm(2)
+Linking failed with 2 errors