walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

NULL pointer check on scripts.

This commit is contained in:
Steve 2015-11-28 15:04:11 +00:00
parent fbc4eb01d1
commit e13243d926
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/battle/script.c
View File

@ -73,32 +73,35 @@ void runScriptFunction(const char *format, ...)
char funcNameBuffer[MAX_NAME_LENGTH]; char funcNameBuffer[MAX_NAME_LENGTH];
va_list args; va_list args;
memset(&funcNameBuffer, '\0', sizeof(funcNameBuffer)); if (scriptJSON)
va_start(args, format);
vsprintf(funcNameBuffer, format, args);
va_end(args);
function = scriptJSON->child;
while (function)
{ {
functionName = cJSON_GetObjectItem(function, "function")->valuestring; memset(&funcNameBuffer, '\0', sizeof(funcNameBuffer));
va_start(args, format);
vsprintf(funcNameBuffer, format, args);
va_end(args);
if (strcmp(functionName, funcNameBuffer) == 0) function = scriptJSON->child;
while (function)
{ {
scriptRunner = malloc(sizeof(ScriptRunner)); functionName = cJSON_GetObjectItem(function, "function")->valuestring;
memset(scriptRunner, 0, sizeof(ScriptRunner));
scriptRunner->line = cJSON_GetObjectItem(function, "lines")->child; if (strcmp(functionName, funcNameBuffer) == 0)
{
scriptRunner = malloc(sizeof(ScriptRunner));
memset(scriptRunner, 0, sizeof(ScriptRunner));
scriptRunner->line = cJSON_GetObjectItem(function, "lines")->child;
tail->next = scriptRunner;
tail = scriptRunner;
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Running script '%s'", funcNameBuffer);
}
tail->next = scriptRunner; function = function->next;
tail = scriptRunner;
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Running script '%s'", funcNameBuffer);
} }
function = function->next;
} }
} }