mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

check if string msg is not NULL, fix segfault

Browse Source
This commit is contained in:
Jacek Jendrzej
2016-05-19 15:22:15 +02:00
parent e7e158a273
commit c9e8a57418
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/lua/lua_video.cpp
View File

@@ -221,7 +221,9 @@ bool CLuaInstVideo::execLuaInfoFunc(lua_State *L, int xres, int yres, int aspect
lua_getstack(L, 1, &ar);
lua_getinfo(L, "Sl", &ar);
memset(msg, '\0', sizeof(msg));
snprintf(msg, sizeof(msg)-1, "[%s:%d] error running function '%s': %s", ar.short_src, ar.currentline, D->infoFunc.c_str(), lua_tostring(L, -1));
bool isString = lua_isstring(L,-1);
const char *null = "NULL";
snprintf(msg, sizeof(msg)-1, "[%s:%d] error running function '%s': %s", ar.short_src, ar.currentline, D->infoFunc.c_str(), isString ? lua_tostring(L, -1):null);
fprintf(stderr, "[CLuaInstVideo::%s:%d] %s\n", __func__, __LINE__, msg);
DisplayErrorMessage(msg);
return false;