gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-01-22 08:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error-related issues (#773)

Browse Source 
* Mark `error` as a `format` function, to properly scan its format

* Fix the call to error() from parser.y:
  - Use '%s' to avoid passing an arbitrary format
  - Simplify yyerror overall

* Fix size parameter of %.*s format being an int... bonkers standard.

* Report the number of arguments required and provided on a STRFMT mismatch

* Add an assert to check for a very unlikely bug
This commit is contained in:
daid
2021-03-02 16:34:19 +01:00
committed by GitHub
parent 56071599e7
commit 5d6e0677d9
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/asm/parser.y
View File

@@ -276,13 +276,8 @@ static void strfmt(char *dest, size_t destLen, char const *fmt, size_t nbArgs, s
dest[i++] = '%';
a++;
continue;
} else if (a == nbArgs) {
error("STRFMT: Not enough arguments for format spec\n", a + 1);
dest[i++] = '%';
a++;
continue;
} else if (a > nbArgs) {
// already warned for a == nbArgs
} else if (a >= nbArgs) {
// Will warn after formatting is done.
dest[i++] = '%';
a++;
continue;
@@ -301,6 +296,8 @@ static void strfmt(char *dest, size_t destLen, char const *fmt, size_t nbArgs, s
if (a < nbArgs)
error("STRFMT: %zu unformatted argument(s)\n", nbArgs - a);
else if (a > nbArgs)
error("STRFMT: Not enough arguments for format spec, got: %zu, need: %zu\n", nbArgs, a);
if (i > destLen - 1) {
warning(WARNING_LONG_STR, "STRFMT: String too long, got truncated\n");
@@ -366,14 +363,7 @@ static inline void failAssertMsg(enum AssertionType type, char const *msg)
void yyerror(char const *str)
{
size_t len = strlen(str);
char *buf = malloc(len + 2);
memcpy(buf, str, len);
buf[len] = '\n';
buf[len + 1] = '\0';
error(buf);
free(buf);
error("%s\n", str);
}
// The CPU encodes instructions in a logical way, so most instructions actually follow patterns.