From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id CA657227E8
	for <tarantool-patches@freelists.org>; Thu, 19 Jul 2018 06:54:59 -0400 (EDT)
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 pHCAt0AKDSnH for <tarantool-patches@freelists.org>;
	Thu, 19 Jul 2018 06:54:59 -0400 (EDT)
Received: from smtp18.mail.ru (smtp18.mail.ru [94.100.176.155])
	(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 87F3E22FA5
	for <tarantool-patches@freelists.org>; Thu, 19 Jul 2018 06:54:59 -0400 (EDT)
From: Olga Arkhangelskaia <arkholga@tarantool.org>
Subject: [tarantool-patches] [PATCH v2 2/2] Added strdup fail checks in say
Date: Thu, 19 Jul 2018 13:54:49 +0300
Message-Id: <20180719105449.49710-2-arkholga@tarantool.org>
In-Reply-To: <20180719105449.49710-1-arkholga@tarantool.org>
References: <20180719105449.49710-1-arkholga@tarantool.org>
Sender: tarantool-patches-bounce@freelists.org
Errors-to: tarantool-patches-bounce@freelists.org
Reply-To: tarantool-patches@freelists.org
List-help: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: tarantool-patches@freelists.org
Cc: Olga Arkhangelskaia <arkholga@tarantool.org>

Strdup may silently fail without any message from tarantool.
Patch adds this checks.
---
Branch: https://github.com/tarantool/tarantool/tree/OKriw/refactor-log-cfg

v1:
https://www.freelists.org/post/tarantool-patches/PATCH-22-Added-strdup-fail-checks-in-say

Changes in v2:
- no double check now

 src/say.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/say.c b/src/say.c
index 92e0e6d9f..99344b685 100644
--- a/src/say.c
+++ b/src/say.c
@@ -502,6 +502,11 @@ log_syslog_init(struct log *log, const char *init_str)
 		log->syslog_ident = strdup("tarantool");
 	else
 		log->syslog_ident = strdup(opts.identity);
+	if (log->syslog_ident == NULL) {
+		diag_set(OutOfMemory, strlen(opts.identity), "malloc",
+		         "log->syslog_ident");
+		return -1;
+	}
 
 	if (opts.facility == syslog_facility_MAX)
 		log->syslog_facility = SYSLOG_LOCAL7;
-- 
2.14.3 (Apple Git-98)