mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

generators: Do not leak error messages text

Browse Source
This commit is contained in:
ZyX
2017-05-08 20:54:09 +03:00
parent db1155f713
commit 577befef97
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/genmsgpack.lua
View File

@@ -401,7 +401,7 @@ local function process_function(fn)
Error err = ERROR_INIT; Error err = ERROR_INIT;
if (lua_gettop(lstate) != %i) { if (lua_gettop(lstate) != %i) {
api_set_error(&err, kErrorTypeValidation, "Expected %i argument%s"); api_set_error(&err, kErrorTypeValidation, "Expected %i argument%s");
return luaL_error(lstate, "%%s", err.msg); goto exit_0;
} }
]], lua_c_function_name, #fn.parameters, #fn.parameters, ]], lua_c_function_name, #fn.parameters, #fn.parameters,
(#fn.parameters == 1) and '' or 's')) (#fn.parameters == 1) and '' or 's'))
@@ -420,11 +420,11 @@ local function process_function(fn)
const %s %s = nlua_pop_%s(lstate, &err); const %s %s = nlua_pop_%s(lstate, &err);
if (ERROR_SET(&err)) { if (ERROR_SET(&err)) {
%s goto exit_%u;
return luaL_error(lstate, "%%s", err.msg);
} }
]], param[1], cparam, param_type, table.concat(free_code, '\n '))) ]], param[1], cparam, param_type, #fn.parameters - j))
free_code[#free_code + 1] = ('api_free_%s(%s);'):format(lc_param_type, cparam) free_code[#free_code + 1] = ('api_free_%s(%s);'):format(
lc_param_type, cparam)
cparams = cparam .. ', ' .. cparams cparams = cparam .. ', ' .. cparams
end end
if fn.receives_channel_id then if fn.receives_channel_id then
@@ -435,7 +435,28 @@ local function process_function(fn)
else else
cparams = cparams:gsub(', $', '') cparams = cparams:gsub(', $', '')
end end
free_at_exit_code = table.concat(free_code, '\n ') local free_at_exit_code = ''
for i = 1, #free_code do
local rev_i = #free_code - i + 1
local code = free_code[rev_i]
if i == 1 then
free_at_exit_code = free_at_exit_code .. ('\n %s'):format(code)
else
free_at_exit_code = free_at_exit_code .. ('\n exit_%u:\n %s'):format(
rev_i, code)
end
end
local err_throw_code = [[
exit_0:
if (ERROR_SET(&err)) {
luaL_where(lstate, 1);
lua_pushstring(lstate, err.msg);
api_clear_error(&err);
lua_concat(lstate, 2);
return lua_error(lstate);
}
]]
if fn.return_type ~= 'void' then if fn.return_type ~= 'void' then
if fn.return_type:match('^ArrayOf') then if fn.return_type:match('^ArrayOf') then
return_type = 'Array' return_type = 'Array'
@@ -444,24 +465,20 @@ local function process_function(fn)
end end
write_shifted_output(output, string.format([[ write_shifted_output(output, string.format([[
const %s ret = %s(%s); const %s ret = %s(%s);
%s
if (ERROR_SET(&err)) {
return luaL_error(lstate, "%%s", err.msg);
}
nlua_push_%s(lstate, ret); nlua_push_%s(lstate, ret);
api_free_%s(ret); api_free_%s(ret);
%s
%s
return 1; return 1;
]], fn.return_type, fn.name, cparams, free_at_exit_code, return_type, ]], fn.return_type, fn.name, cparams, return_type, return_type:lower(),
return_type:lower())) free_at_exit_code, err_throw_code))
else else
write_shifted_output(output, string.format([[ write_shifted_output(output, string.format([[
%s(%s); %s(%s);
%s %s
if (ERROR_SET(&err)) { %s
return luaL_error(lstate, "%%s", err.msg);
}
return 0; return 0;
]], fn.name, cparams, free_at_exit_code)) ]], fn.name, cparams, free_at_exit_code, err_throw_code))
end end
write_shifted_output(output, [[ write_shifted_output(output, [[
} }