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 0669030F05 for ; Fri, 7 Dec 2018 10:16:31 -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 EdZ9u_EeY3AH for ; Fri, 7 Dec 2018 10:16:30 -0500 (EST) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 B259230EED for ; Fri, 7 Dec 2018 10:16:30 -0500 (EST) From: Alexander Turenko Subject: [tarantool-patches] [PATCH] Fix premature cdata collecting in luaT_pusherror() Date: Fri, 7 Dec 2018 18:16:28 +0300 Message-Id: <480868ff8f304ead2fd03e317902a1e8d41c6248.1544195642.git.alexander.turenko@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Vladislav Shpilevoy Cc: Alexander Turenko , tarantool-patches@freelists.org This is follow up of 28c7e667aee9be8c3288597bcc179d9b4e7b4940 to fix luaT_pusherror() itself, not only luaT_error(). Fixes #1955 (again). --- https://github.com/tarantool/tarantool/issues/1955 https://github.com/tarantool/tarantool/tree/Totktonada/gh-1955-fix-luaT_pusherror src/lua/error.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lua/error.c b/src/lua/error.c index 71345927d..fca87f9d6 100644 --- a/src/lua/error.c +++ b/src/lua/error.c @@ -75,12 +75,20 @@ luaL_error_gc(struct lua_State *L) void luaT_pusherror(struct lua_State *L, struct error *e) { + /* + * gh-1955 luaT_pusherror allocates Lua objects, thus it + * may trigger GC. GC may invoke finalizers which are + * arbitrary Lua code, potentially invalidating last error + * object, hence error_ref below. + * + * It also important to reference the error first and only + * then set the finalizer. + */ + error_ref(e); assert(CTID_CONST_STRUCT_ERROR_REF != 0); struct error **ptr = (struct error **) luaL_pushcdata(L, CTID_CONST_STRUCT_ERROR_REF); *ptr = e; - /* The order is important - first reference the error, then set gc */ - error_ref(e); lua_pushcfunction(L, luaL_error_gc); luaL_setcdatagc(L, -2); } @@ -90,15 +98,7 @@ luaT_error(lua_State *L) { struct error *e = diag_last_error(&fiber()->diag); assert(e != NULL); - /* - * gh-1955 luaT_pusherror allocates Lua objects, thus it may trigger - * GC. GC may invoke finalizers which are arbitrary Lua code, - * potentially invalidating last error object, hence error_ref - * below. - */ - error_ref(e); luaT_pusherror(L, e); - error_unref(e); lua_error(L); unreachable(); return 0; -- 2.19.2