From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH 2/2] box/applier: add missing diag_set on region_alloc failure
Date: Fri, 17 Jan 2020 16:29:29 +0300 [thread overview]
Message-ID: <20200117132929.11235-3-gorcunov@gmail.com> (raw)
In-Reply-To: <20200117132929.11235-1-gorcunov@gmail.com>
In case if we're hitting memory limit allocting triggers
we should setup diag error to prevent nil dereference
in diag_raise call for example from applier_apply_tx.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/box/applier.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/box/applier.cc b/src/box/applier.cc
index 1a051e8c4..5b1efdabe 100644
--- a/src/box/applier.cc
+++ b/src/box/applier.cc
@@ -714,8 +714,11 @@ applier_apply_tx(struct stailq *rows)
sizeof(struct trigger));
on_commit = (struct trigger *)region_alloc(&txn->region,
sizeof(struct trigger));
- if (on_rollback == NULL || on_commit == NULL)
+ if (on_rollback == NULL || on_commit == NULL) {
+ diag_set(OutOfMemory, sizeof(struct trigger),
+ "region_alloc", "on_rollback/on_commit");
goto rollback;
+ }
trigger_create(on_rollback, applier_txn_rollback_cb, NULL, NULL);
txn_on_rollback(txn, on_rollback);
--
2.20.1
next prev parent reply other threads:[~2020-01-17 13:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 13:29 [Tarantool-patches] [PATCH 0/2] origin/2.2: add missing diag_set calls on error paths Cyrill Gorcunov
2020-01-17 13:29 ` [Tarantool-patches] [PATCH 1/2] box/request: add missing OutOfMemory diag_set Cyrill Gorcunov
2020-01-17 13:29 ` Cyrill Gorcunov [this message]
2020-01-20 8:31 ` [Tarantool-patches] [PATCH 2/2] box/applier: add missing diag_set on region_alloc failure Konstantin Osipov
2020-01-20 8:44 ` Cyrill Gorcunov
2020-01-20 10:59 ` Cyrill Gorcunov
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=20200117132929.11235-3-gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 2/2] box/applier: add missing diag_set on region_alloc failure' \
/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