gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly check if a symbol's full name is too long

Browse Source
This commit is contained in:
dbrotz
2019-05-05 20:21:55 -07:00
parent 540564694c
commit 021990b8e0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/asm/symbol.c
View File

@@ -154,12 +154,14 @@ struct sSymbol *createsymbol(char *s)
* Creates the full name of a local symbol in a given scope, by prepending * Creates the full name of a local symbol in a given scope, by prepending
* the name with the parent symbol's name. * the name with the parent symbol's name.
*/ */
static size_t fullSymbolName(char *output, size_t outputSize, char *localName, static void fullSymbolName(char *output, size_t outputSize, char *localName,
const struct sSymbol *scope) const struct sSymbol *scope)
{ {
const struct sSymbol *parent = scope->pScope ? scope->pScope : scope; const struct sSymbol *parent = scope->pScope ? scope->pScope : scope;
int n = snprintf(output, outputSize, "%s%s", parent->tzName, localName);
return snprintf(output, outputSize, "%s%s", parent->tzName, localName); if (n >= (int)outputSize)
fatalerror("Symbol too long");
} }
/* /*
@@ -561,9 +563,6 @@ void sym_AddSet(char *tzSym, int32_t value)
void sym_AddLocalReloc(char *tzSym) void sym_AddLocalReloc(char *tzSym)
{ {
if (pScope) { if (pScope) {
if (strlen(tzSym) + strlen(pScope->tzName) > MAXSYMLEN)
fatalerror("Symbol too long");
char fullname[MAXSYMLEN + 1]; char fullname[MAXSYMLEN + 1];
fullSymbolName(fullname, sizeof(fullname), tzSym, pScope); fullSymbolName(fullname, sizeof(fullname), tzSym, pScope);