From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id A418B250AF for ; Tue, 15 Jan 2019 11:10:07 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9xwyEbNs4OqL for ; Tue, 15 Jan 2019 11:10:07 -0500 (EST) Received: from smtp14.mail.ru (smtp14.mail.ru [94.100.181.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 319EA1FBF4 for ; Tue, 15 Jan 2019 11:10:07 -0500 (EST) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v7 1/6] lua: remove exceptions from function luaL_tofield() Date: Tue, 15 Jan 2019 19:10:05 +0300 Message-Id: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org Before this commit, the luaL_tofield() function threw a Lua exception when an error occurred. This behavior has been changed in this commit, now it sets diag_set() and returns -1 in case of an error. Needed for #3505 --- src/box/lua/call.c | 9 +++-- src/box/lua/tuple.c | 3 +- src/lua/msgpack.c | 12 ++++-- src/lua/utils.c | 105 ++++++++++++++++++++++++++++++---------------------- src/lua/utils.h | 8 +++- 5 files changed, 83 insertions(+), 54 deletions(-) diff --git a/src/box/lua/call.c b/src/box/lua/call.c index 52939ae..39df05d 100644 --- a/src/box/lua/call.c +++ b/src/box/lua/call.c @@ -164,7 +164,8 @@ luamp_encode_call_16(lua_State *L, struct luaL_serializer *cfg, */ for (int i = 1; i <= nrets; ++i) { struct luaL_field field; - luaL_tofield(L, cfg, i, &field); + if (luaL_tofield(L, cfg, i, &field) < 0) + luaT_error(L); struct tuple *tuple; if (field.type == MP_EXT && (tuple = luaT_istuple(L, i)) != NULL) { @@ -192,7 +193,8 @@ luamp_encode_call_16(lua_State *L, struct luaL_serializer *cfg, * Inspect the first result */ struct luaL_field root; - luaL_tofield(L, cfg, 1, &root); + if (luaL_tofield(L, cfg, 1, &root) < 0) + luaT_error(L); struct tuple *tuple; if (root.type == MP_EXT && (tuple = luaT_istuple(L, 1)) != NULL) { /* `return box.tuple()` */ @@ -221,7 +223,8 @@ luamp_encode_call_16(lua_State *L, struct luaL_serializer *cfg, for (uint32_t t = 1; t <= root.size; t++) { lua_rawgeti(L, 1, t); struct luaL_field field; - luaL_tofield(L, cfg, -1, &field); + if (luaL_tofield(L, cfg, -1, &field) < 0) + luaT_error(L); if (field.type == MP_EXT && (tuple = luaT_istuple(L, -1))) { tuple_to_mpstream(tuple, stream); } else if (field.type != MP_ARRAY) { diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c index 1867f81..f76d656 100644 --- a/src/box/lua/tuple.c +++ b/src/box/lua/tuple.c @@ -223,7 +223,8 @@ luamp_convert_key(struct lua_State *L, struct luaL_serializer *cfg, return tuple_to_mpstream(tuple, stream); struct luaL_field field; - luaL_tofield(L, cfg, index, &field); + if (luaL_tofield(L, cfg, index, &field) < 0) + luaT_error(L); if (field.type == MP_ARRAY) { lua_pushvalue(L, index); luamp_encode_r(L, cfg, stream, &field, 0); diff --git a/src/lua/msgpack.c b/src/lua/msgpack.c index b470060..d00ade9 100644 --- a/src/lua/msgpack.c +++ b/src/lua/msgpack.c @@ -149,10 +149,12 @@ restart: /* used by MP_EXT */ lua_pushnil(L); /* first key */ while (lua_next(L, top) != 0) { lua_pushvalue(L, -2); /* push a copy of key to top */ - luaL_tofield(L, cfg, lua_gettop(L), field); + if (luaL_tofield(L, cfg, lua_gettop(L), field) < 0) + luaT_error(L); luamp_encode_r(L, cfg, stream, field, level + 1); lua_pop(L, 1); /* pop a copy of key */ - luaL_tofield(L, cfg, lua_gettop(L), field); + if (luaL_tofield(L, cfg, lua_gettop(L), field) < 0) + luaT_error(L); luamp_encode_r(L, cfg, stream, field, level + 1); lua_pop(L, 1); /* pop value */ } @@ -168,7 +170,8 @@ restart: /* used by MP_EXT */ mpstream_encode_array(stream, size); for (uint32_t i = 0; i < size; i++) { lua_rawgeti(L, top, i + 1); - luaL_tofield(L, cfg, top + 1, field); + if (luaL_tofield(L, cfg, top + 1, field) < 0) + luaT_error(L); luamp_encode_r(L, cfg, stream, field, level + 1); lua_pop(L, 1); } @@ -203,7 +206,8 @@ luamp_encode(struct lua_State *L, struct luaL_serializer *cfg, } struct luaL_field field; - luaL_tofield(L, cfg, lua_gettop(L), &field); + if (luaL_tofield(L, cfg, lua_gettop(L), &field) < 0) + luaT_error(L); enum mp_type top_type = luamp_encode_r(L, cfg, stream, &field, 0); if (!on_top) { diff --git a/src/lua/utils.c b/src/lua/utils.c index 978fe61..9a9fd3a 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -37,6 +37,8 @@ #include #include +#include "box/error.h" + int luaL_nil_ref = LUA_REFNIL; int luaL_map_metatable_ref = LUA_REFNIL; int luaL_array_metatable_ref = LUA_REFNIL; @@ -383,12 +385,13 @@ lua_field_inspect_ucdata(struct lua_State *L, struct luaL_serializer *cfg, lua_pcall(L, 1, 1, 0); /* replace obj with the unpacked value */ lua_replace(L, idx); - luaL_tofield(L, cfg, idx, field); + if (luaL_tofield(L, cfg, idx, field) < 0) + luaT_error(L); } /* else ignore lua_gettable exceptions */ lua_settop(L, top); /* remove temporary objects */ } -static void +static int lua_field_inspect_table(struct lua_State *L, struct luaL_serializer *cfg, int idx, struct luaL_field *field) { @@ -408,10 +411,11 @@ lua_field_inspect_table(struct lua_State *L, struct luaL_serializer *cfg, lua_call(L, 1, 1); /* replace obj with the unpacked value */ lua_replace(L, idx); - luaL_tofield(L, cfg, idx, field); - return; + return luaL_tofield(L, cfg, idx, field); } else if (!lua_isstring(L, -1)) { - luaL_error(L, "invalid " LUAL_SERIALIZE " value"); + diag_set(ClientError, ER_PROC_LUA, + "invalid " LUAL_SERIALIZE " value"); + return -1; } type = lua_tostring(L, -1); @@ -424,7 +428,7 @@ lua_field_inspect_table(struct lua_State *L, struct luaL_serializer *cfg, field->compact = true; lua_pop(L, 1); /* type */ - return; + return 0; } else if (strcmp(type, "map") == 0 || strcmp(type, "mapping") == 0) { field->type = MP_MAP; /* Override type */ field->size = luaL_maplen(L, idx); @@ -432,9 +436,11 @@ lua_field_inspect_table(struct lua_State *L, struct luaL_serializer *cfg, if (cfg->has_compact && type[3] == '\0') field->compact = true; lua_pop(L, 1); /* type */ - return; + return 0; } else { - luaL_error(L, "invalid " LUAL_SERIALIZE " value"); + diag_set(ClientError, ER_PROC_LUA, + "invalid " LUAL_SERIALIZE " value"); + return -1; } skip: @@ -456,7 +462,7 @@ skip: } field->type = MP_MAP; field->size = size; - return; + return 0; } if (k > max) max = k; @@ -466,15 +472,19 @@ skip: if (cfg->encode_sparse_ratio > 0 && max > size * (uint32_t)cfg->encode_sparse_ratio && max > (uint32_t)cfg->encode_sparse_safe) { - if (!cfg->encode_sparse_convert) - luaL_error(L, "excessively sparse array"); + if (!cfg->encode_sparse_convert) { + diag_set(ClientError, ER_PROC_LUA, + "excessively sparse array"); + return -1; + } field->type = MP_MAP; field->size = size; - return; + return 0; } assert(field->type == MP_ARRAY); field->size = max; + return 0; } static void @@ -487,12 +497,13 @@ lua_field_tostring(struct lua_State *L, struct luaL_serializer *cfg, int idx, lua_call(L, 1, 1); lua_replace(L, idx); lua_settop(L, top); - luaL_tofield(L, cfg, idx, field); + if (luaL_tofield(L, cfg, idx, field) < 0) + luaT_error(L); } -void +int luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, - struct luaL_field *field) + struct luaL_field *field) { if (index < 0) index = lua_gettop(L) + index + 1; @@ -501,10 +512,13 @@ luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, double intpart; size_t size; -#define CHECK_NUMBER(x) ({\ - if (!isfinite(x) && !cfg->encode_invalid_numbers) { \ - if (!cfg->encode_invalid_as_nil) \ - luaL_error(L, "number must not be NaN or Inf"); \ +#define CHECK_NUMBER(x) ({ \ + if (!isfinite(x) && !cfg->encode_invalid_numbers) { \ + if (!cfg->encode_invalid_as_nil) { \ + diag_set(ClientError, ER_PROC_LUA, \ + "number must not be NaN or Inf"); \ + return -1; \ + } \ field->type = MP_NIL; \ }}) @@ -525,94 +539,96 @@ luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, field->dval = num; CHECK_NUMBER(num); } - return; + break; case LUA_TCDATA: { - uint32_t ctypeid = 0; - void *cdata = luaL_checkcdata(L, index, &ctypeid); + GCcdata *cd = cdataV(L->base + index - 1); + void *cdata = (void *)cdataptr(cd); + int64_t ival; - switch (ctypeid) { + switch (cd->ctypeid) { case CTID_BOOL: field->type = MP_BOOL; field->bval = *(bool*) cdata; - return; + break; case CTID_CCHAR: case CTID_INT8: ival = *(int8_t *) cdata; field->type = (ival >= 0) ? MP_UINT : MP_INT; field->ival = ival; - return; + break; case CTID_INT16: ival = *(int16_t *) cdata; field->type = (ival >= 0) ? MP_UINT : MP_INT; field->ival = ival; - return; + break; case CTID_INT32: ival = *(int32_t *) cdata; field->type = (ival >= 0) ? MP_UINT : MP_INT; field->ival = ival; - return; + break; case CTID_INT64: ival = *(int64_t *) cdata; field->type = (ival >= 0) ? MP_UINT : MP_INT; field->ival = ival; - return; + break; case CTID_UINT8: field->type = MP_UINT; field->ival = *(uint8_t *) cdata; - return; + break; case CTID_UINT16: field->type = MP_UINT; field->ival = *(uint16_t *) cdata; - return; + break; case CTID_UINT32: field->type = MP_UINT; field->ival = *(uint32_t *) cdata; - return; + break; case CTID_UINT64: field->type = MP_UINT; field->ival = *(uint64_t *) cdata; - return; + break; case CTID_FLOAT: field->type = MP_FLOAT; field->fval = *(float *) cdata; CHECK_NUMBER(field->fval); - return; + break; case CTID_DOUBLE: field->type = MP_DOUBLE; field->dval = *(double *) cdata; CHECK_NUMBER(field->dval); - return; + break; case CTID_P_CVOID: case CTID_P_VOID: if (*(void **) cdata == NULL) { field->type = MP_NIL; - return; + break; } /* Fall through */ default: field->type = MP_EXT; - return; + break; } - return; + break; } case LUA_TBOOLEAN: field->type = MP_BOOL; field->bval = lua_toboolean(L, index); - return; + break; case LUA_TNIL: field->type = MP_NIL; - return; + break; case LUA_TSTRING: field->sval.data = lua_tolstring(L, index, &size); field->sval.len = (uint32_t) size; field->type = MP_STR; - return; + break; case LUA_TTABLE: { field->compact = false; - lua_field_inspect_table(L, cfg, index, field); - return; + if (lua_field_inspect_table(L, cfg, index, field) < 0) + return -1; + break; } case LUA_TLIGHTUSERDATA: case LUA_TUSERDATA: @@ -620,14 +636,15 @@ luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, field->sval.len = 0; if (lua_touserdata(L, index) == NULL) { field->type = MP_NIL; - return; + break; } /* Fall through */ default: field->type = MP_EXT; - return; + break; } #undef CHECK_NUMBER + return 0; } void diff --git a/src/lua/utils.h b/src/lua/utils.h index a47e3d2..fde3514 100644 --- a/src/lua/utils.h +++ b/src/lua/utils.h @@ -304,8 +304,11 @@ struct luaL_field { * @param cfg configuration * @param index stack index * @param field conversion result + * + * @retval 0 Success. + * @retval -1 Error. */ -void +int luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, struct luaL_field *field); @@ -345,7 +348,8 @@ static inline void luaL_checkfield(struct lua_State *L, struct luaL_serializer *cfg, int idx, struct luaL_field *field) { - luaL_tofield(L, cfg, idx, field); + if (luaL_tofield(L, cfg, idx, field) < 0) + luaT_error(L); if (field->type != MP_EXT) return; luaL_convertfield(L, cfg, idx, field); -- 2.7.4