From: Olga Arkhangelskaia <arkholga@tarantool.org> To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia <arkholga@tarantool.org> Subject: [tarantool-patches] [PATCH 2/2] Added strdup fail checks in say Date: Tue, 17 Jul 2018 18:15:21 +0300 [thread overview] Message-ID: <20180717151521.34679-3-arkholga@tarantool.org> (raw) In-Reply-To: <20180717151521.34679-1-arkholga@tarantool.org> Strdup may silently fail without any message from tarantool. Patch adds this checks. v2: there is no v1 for this changes --- src/say.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/say.c b/src/say.c index 501095b3e..d824e778b 100644 --- a/src/say.c +++ b/src/say.c @@ -498,10 +498,21 @@ log_syslog_init(struct log *log, const char *init_str) if (say_parse_syslog_opts(init_str, &opts) < 0) return -1; - if (opts.identity == NULL) + if (opts.identity == NULL) { log->syslog_ident = strdup("tarantool"); - else + if (log->syslog_ident == NULL) { + diag_set(OutOfMemory, strlen("tarantool"), "malloc", + "log->syslog_ident"); + return -1; + } + } 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)
next prev parent reply other threads:[~2018-07-17 15:15 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-17 15:15 [tarantool-patches] [PATCH v2 0/2] Refactor in box and say modules Olga Arkhangelskaia 2018-07-17 15:15 ` [tarantool-patches] [PATCH 1/2] Ractoring in string validation of log parametrs Olga Arkhangelskaia 2018-07-18 12:18 ` Vladimir Davydov 2018-07-17 15:15 ` Olga Arkhangelskaia [this message] 2018-07-18 12:21 ` [tarantool-patches] [PATCH 2/2] Added strdup fail checks in say Vladimir Davydov
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=20180717151521.34679-3-arkholga@tarantool.org \ --to=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH 2/2] Added strdup fail checks in say' \ /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