From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, Alexander Turenko <alexander.turenko@tarantool.org> Subject: [Tarantool-patches] [PATCH 5/6] xlog: xlog_cursor -- use sizeof with snprintf for safety Date: Thu, 18 Jun 2020 01:03:34 +0300 [thread overview] Message-ID: <20200617220335.836265-6-gorcunov@gmail.com> (raw) In-Reply-To: <20200617220335.836265-1-gorcunov@gmail.com> This is more consistent than relying that array size will remain PATH_MAX forever. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/xlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/box/xlog.c b/src/box/xlog.c index 1685a4cf7..94f7838bf 100644 --- a/src/box/xlog.c +++ b/src/box/xlog.c @@ -1970,7 +1970,7 @@ xlog_cursor_openfd(struct xlog_cursor *i, int fd, const char *name) diag_set(XlogError, "Unexpected end of file, run with 'force_recovery = true'"); goto error; } - snprintf(i->name, PATH_MAX, "%s", name); + snprintf(i->name, sizeof(i->name), "%s", name); i->zdctx = ZSTD_createDStream(); if (i->zdctx == NULL) { diag_set(ClientError, ER_DECOMPRESSION, @@ -2027,7 +2027,7 @@ xlog_cursor_openmem(struct xlog_cursor *i, const char *data, size_t size, diag_set(XlogError, "Unexpected end of file"); goto error; } - snprintf(i->name, PATH_MAX, "%s", name); + snprintf(i->name, sizeof(i->name), "%s", name); i->zdctx = ZSTD_createDStream(); if (i->zdctx == NULL) { diag_set(ClientError, ER_DECOMPRESSION, -- 2.26.2
next prev parent reply other threads:[~2020-06-17 22:04 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-17 22:03 [Tarantool-patches] [PATCH 0/6] xlog: cleanup patches Cyrill Gorcunov 2020-06-17 22:03 ` [Tarantool-patches] [PATCH 1/6] box: drop inline from box_cfg_xc Cyrill Gorcunov 2020-06-17 22:03 ` [Tarantool-patches] [PATCH 2/6] xlog: xlog_cursor -- eliminate redundant pad in the structure Cyrill Gorcunov 2020-06-17 22:03 ` [Tarantool-patches] [PATCH 3/6] xlog: xdir -- use PATH_MAX for dirname Cyrill Gorcunov 2020-06-17 22:03 ` [Tarantool-patches] [PATCH 4/6] xlog: use PATH_MAX for filename Cyrill Gorcunov 2020-06-18 23:14 ` Vladislav Shpilevoy 2020-06-19 7:19 ` Cyrill Gorcunov 2020-06-17 22:03 ` Cyrill Gorcunov [this message] 2020-06-17 22:03 ` [Tarantool-patches] [PATCH 6/6] xlog: xdir_format_filename -- use PATH_MAX Cyrill Gorcunov 2020-06-19 23:17 ` [Tarantool-patches] [PATCH 0/6] xlog: cleanup patches Vladislav Shpilevoy 2020-06-22 7:43 ` 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=20200617220335.836265-6-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 5/6] xlog: xlog_cursor -- use sizeof with snprintf for safety' \ /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