Don't access null pointers when printing null module names

Browse Source 
fixes #631
This commit is contained in:
underscorediscovery 2019-09-18 22:49:01 -07:00
parent 7eac8e6a37
commit 688691b17c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vm/wren_compiler.c
View File

@ -393,18 +393,21 @@ static void printError(Parser* parser, int line, const char* label,
{ {
parser->hasError = true; parser->hasError = true;
if (!parser->printErrors) return; if (!parser->printErrors) return;
// Only report errors if there is a WrenErrorFn to handle them. // Only report errors if there is a WrenErrorFn to handle them.
if (parser->vm->config.errorFn == NULL) return; if (parser->vm->config.errorFn == NULL) return;
// Format the label and message. // Format the label and message.
char message[ERROR_MESSAGE_SIZE]; char message[ERROR_MESSAGE_SIZE];
int length = sprintf(message, "%s: ", label); int length = sprintf(message, "%s: ", label);
length += vsprintf(message + length, format, args); length += vsprintf(message + length, format, args);
ASSERT(length < ERROR_MESSAGE_SIZE, "Error should not exceed buffer."); ASSERT(length < ERROR_MESSAGE_SIZE, "Error should not exceed buffer.");
ObjString* module = parser->module->name;
const char* module_name = module ? module->value : "<unknown>";
parser->vm->config.errorFn(parser->vm, WREN_ERROR_COMPILE, parser->vm->config.errorFn(parser->vm, WREN_ERROR_COMPILE,
parser->module->name->value, line, message); module_name, line, message);
} }
// Outputs a lexical error. // Outputs a lexical error.