gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-08-20 05:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid UB from FileStackNodeType(type) on an invalid type

Browse Source
This commit is contained in:
Rangi
2026-07-20 00:06:09 -04:00
parent f27a8132d9
commit 8883251bf9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link/object.cpp
+4 -4
View File
@@ -108,9 +108,9 @@ static void readFileStackNode(
node.lineNo, file, "%s: Cannot read node #%" PRIu32 "'s line number: %s", fileName, nodeID
);
uint8_t type;
tryGetc(type, file, "%s: Cannot read node #%" PRIu32 "'s type: %s", fileName, nodeID);
switch (type & ~(1 << FSTACKNODE_QUIET_BIT)) {
uint8_t typeAndQuiet;
tryGetc(typeAndQuiet, file, "%s: Cannot read node #%" PRIu32 "'s type: %s", fileName, nodeID);
switch (uint8_t type = typeAndQuiet & ~(1 << FSTACKNODE_QUIET_BIT); type) {
case NODE_FILE:
case NODE_MACRO:
node.type = FileStackNodeType(type);
@@ -149,7 +149,7 @@ static void readFileStackNode(
fatal("%s: Node #%" PRIu32 " has unknown type 0x%02x", fileName, nodeID, type);
}
node.isQuiet = (type & (1 << FSTACKNODE_QUIET_BIT)) != 0;
node.isQuiet = (typeAndQuiet & (1 << FSTACKNODE_QUIET_BIT)) != 0;
}
// Reads a symbol from a file.