fix memory leak and wrong check in font_retrieve
This commit is contained in:
parent
2d412ef64a
commit
7ecc174094
|
@ -60,16 +60,16 @@ static int f_font_load(lua_State *L) {
|
||||||
|
|
||||||
static bool font_retrieve(lua_State* L, RenFont** fonts, int idx) {
|
static bool font_retrieve(lua_State* L, RenFont** fonts, int idx) {
|
||||||
memset(fonts, 0, sizeof(RenFont*)*FONT_FALLBACK_MAX);
|
memset(fonts, 0, sizeof(RenFont*)*FONT_FALLBACK_MAX);
|
||||||
if (lua_type(L, 1) != LUA_TTABLE) {
|
if (lua_type(L, idx) != LUA_TTABLE) {
|
||||||
fonts[0] = *(RenFont**)luaL_checkudata(L, idx, API_TYPE_FONT);
|
fonts[0] = *(RenFont**)luaL_checkudata(L, idx, API_TYPE_FONT);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int i = 0;
|
int len = luaL_len(L, idx); len = len > FONT_FALLBACK_MAX ? FONT_FALLBACK_MAX : len;
|
||||||
do {
|
for (int i = 0; i < len; i++) {
|
||||||
lua_rawgeti(L, idx, i+1);
|
lua_rawgeti(L, idx, i+1);
|
||||||
fonts[i] = !lua_isnil(L, -1) ? *(RenFont**)luaL_checkudata(L, -1, API_TYPE_FONT) : NULL;
|
fonts[i] = *(RenFont**) luaL_checkudata(L, -1, API_TYPE_FONT);
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
} while (fonts[i] && i++ < FONT_FALLBACK_MAX);
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue