From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 1656843D67A for ; Fri, 18 Oct 2019 00:06:38 +0300 (MSK) Date: Fri, 18 Oct 2019 00:06:27 +0300 From: Alexander Turenko Message-ID: <20191017210627.g2quduhuph243u4q@tkn_work_nb> References: <6de1f18613e9b6a3f716c60b9c85457d2bd9eb64.1571341771.git.v.shpilevoy@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6de1f18613e9b6a3f716c60b9c85457d2bd9eb64.1571341771.git.v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 1/1] console: fix usage of an undeclared variable List-Id: Tarantool development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org LGTM. Pushed to master, 2.2, 2.1 and 1.10. WBR, Alexander Turenko. On Thu, Oct 17, 2019 at 09:50:44PM +0200, Vladislav Shpilevoy wrote: > Console client's eval() method in case of an error at > reading from a socket was trying to return a variable > declared in a different view scope. Instead, the > error should be raised to drop the connection. > --- > Branch: https://github.com/tarantool/tarantool/tree/gerold103/console-undefined-variable > > No test, because can be reproduced only in repl mode of a client. > > src/box/lua/console.lua | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua > index f70ed830a..52df67465 100644 > --- a/src/box/lua/console.lua > +++ b/src/box/lua/console.lua > @@ -451,7 +451,7 @@ local text_connection_mt = { > self.print_f(rc) > end > end > - return rc > + return error(self:set_error()) > end, > -- > -- Make the connection be in error state, set error > -- > 2.21.0 (Apple Git-122) >