From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 0A92F4696C3 for ; Sat, 4 Apr 2020 19:16:16 +0300 (MSK) Received: by mail-lj1-f196.google.com with SMTP id f20so10170471ljm.0 for ; Sat, 04 Apr 2020 09:16:15 -0700 (PDT) From: Cyrill Gorcunov Date: Sat, 4 Apr 2020 19:15:20 +0300 Message-Id: <20200404161524.7466-5-gorcunov@gmail.com> In-Reply-To: <20200404161524.7466-1-gorcunov@gmail.com> References: <20200404161524.7466-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v11 4/8] box/applier: add missing diag_set on region_alloc failure List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml In case if we're hitting memory limit allocating triggers we should setup diag error to prevent nil dereference in diag_raise call (for example from applier_apply_tx). Note that there are region_alloc_xc helpers which are throwing errors but as far as I understand we need the rollback action to process first instead of immediate throw/catch thus we use diag_set. Acked-by: Sergey Ostanevich Acked-by: Konstantin Osipov Signed-off-by: Cyrill Gorcunov --- 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 47a26c366..2eb1e04fc 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -796,8 +796,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