Tarantool development patches archive
 help / color / mirror / Atom feed
From: Roman Khabibov <roman.habibov@tarantool.org>
To: tarantool-patches@freelists.org
Cc: v.shpilevoy@tarantool.org
Subject: [tarantool-patches] [PATCH] box: fix bug with module_reload() without box.cfg{}
Date: Tue,  5 Feb 2019 03:17:36 +0300	[thread overview]
Message-ID: <20190205001737.8475-1-roman.habibov@tarantool.org> (raw)

Fix bug with segfault when use module_reload() before box.cfg{}.

Closes #3770

Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/gh-3770-module-reload
Issue: https://github.com/tarantool/tarantool/issues/3770
---
 src/box/func.c                | 3 +++
 test/box/func_reload.result   | 9 +++++++++
 test/box/func_reload.test.lua | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/src/box/func.c b/src/box/func.c
index a817851fd..ee6dd55dc 100644
--- a/src/box/func.c
+++ b/src/box/func.c
@@ -301,6 +301,9 @@ module_sym(struct module *module, const char *name)
 int
 module_reload(const char *package, const char *package_end, struct module **module)
 {
+	if (!modules)
+		return -1;
+
 	struct module *old_module = module_cache_find(package, package_end);
 	if (old_module == NULL) {
 		/* Module wasn't loaded - do nothing. */
diff --git a/test/box/func_reload.result b/test/box/func_reload.result
index b024cd143..e35ca41e2 100644
--- a/test/box/func_reload.result
+++ b/test/box/func_reload.result
@@ -1,3 +1,12 @@
+-- gh-3770 Check no segfault with module_reload() without box.cfg{}.
+box.internal.module_reload('')
+---
+- error: Module '' does not exist
+...
+box.internal.module_reload('xxx')
+---
+- error: Module 'xxx' does not exist
+...
 fio  = require('fio')
 ---
 ...
diff --git a/test/box/func_reload.test.lua b/test/box/func_reload.test.lua
index 8906898ec..00fe8cf48 100644
--- a/test/box/func_reload.test.lua
+++ b/test/box/func_reload.test.lua
@@ -1,3 +1,8 @@
+-- gh-3770 Check no segfault with module_reload() without box.cfg{}.
+
+box.internal.module_reload('')
+box.internal.module_reload('xxx')
+
 fio  = require('fio')
 net = require('net.box')
 fiber = require('fiber')
-- 
2.17.1

             reply	other threads:[~2019-02-05  0:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-05  0:17 Roman Khabibov [this message]
2019-02-05 15:41 ` [tarantool-patches] " Vladislav Shpilevoy
2019-02-07 11:31   ` Roman
2019-02-15 13:28     ` Vladislav Shpilevoy
2019-02-15 14:58 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190205001737.8475-1-roman.habibov@tarantool.org \
    --to=roman.habibov@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [tarantool-patches] [PATCH] box: fix bug with module_reload() without box.cfg{}' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox