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

Add NULL and overflow checks to macro args

Browse Source
This commit is contained in:
ISSOtm
2020-05-13 01:17:58 +02:00
parent d517d2d6b4
commit 5c6069dbe9
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/asm/macro.c
View File

@@ -1,5 +1,6 @@
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -46,22 +47,32 @@ struct MacroArgs *macro_NewArgs(void)
{ {
struct MacroArgs *args = malloc(SIZEOF_ARGS(INITIAL_ARG_SIZE)); struct MacroArgs *args = malloc(SIZEOF_ARGS(INITIAL_ARG_SIZE));
if (!args)
fatalerror("Unable to register macro arguments: %s", strerror(errno));
args->nbArgs = 0; args->nbArgs = 0;
args->shift = 0; args->shift = 0;
args->capacity = INITIAL_ARG_SIZE; args->capacity = INITIAL_ARG_SIZE;
return args; return args;
} }
void macro_AppendArg(struct MacroArgs **args, char *s) void macro_AppendArg(struct MacroArgs **argPtr, char *s)
{ {
if ((**args).nbArgs == MAXMACROARGS) #define macArgs (*argPtr)
if (macArgs->nbArgs == MAXMACROARGS)
yyerror("A maximum of " EXPAND_AND_STR(MAXMACROARGS) yyerror("A maximum of " EXPAND_AND_STR(MAXMACROARGS)
" arguments is allowed"); " arguments is allowed");
if ((**args).nbArgs == (**args).capacity) { if (macArgs->nbArgs >= macArgs->capacity) {
(**args).capacity *= 2; macArgs->capacity *= 2;
*args = realloc(*args, SIZEOF_ARGS((**args).capacity)); /* Check that overflow didn't roll us back */
if (macArgs->capacity <= macArgs->nbArgs)
fatalerror("Failed to add new macro argument: possible capacity overflow");
macArgs = realloc(macArgs, SIZEOF_ARGS(macArgs->capacity));
if (!macArgs)
fatalerror("Error adding new macro argument: %s", strerror(errno));
} }
(**args).args[(**args).nbArgs++] = s; macArgs->args[macArgs->nbArgs++] = s;
#undef macArgs
} }
void macro_UseNewArgs(struct MacroArgs *args) void macro_UseNewArgs(struct MacroArgs *args)