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 3/6] xlog: xdir -- use PATH_MAX for dirname
Date: Thu, 18 Jun 2020 01:03:32 +0300 [thread overview]
Message-ID: <20200617220335.836265-4-gorcunov@gmail.com> (raw)
In-Reply-To: <20200617220335.836265-1-gorcunov@gmail.com>
The PATH_MAX is the longest path including end
of string, no need for +1 byte.
Same time use sizeof(dirname) to not bound how
exactly dirname is declared.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/box/xlog.c | 2 +-
src/box/xlog.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/box/xlog.c b/src/box/xlog.c
index 8254cce20..8b2818326 100644
--- a/src/box/xlog.c
+++ b/src/box/xlog.c
@@ -335,7 +335,7 @@ xdir_create(struct xdir *dir, const char *dirname, enum xdir_type type,
/* Default mode. */
dir->mode = 0660;
dir->instance_uuid = instance_uuid;
- snprintf(dir->dirname, PATH_MAX, "%s", dirname);
+ snprintf(dir->dirname, sizeof(dir->dirname), "%s", dirname);
dir->open_wflags = 0;
switch (type) {
case SNAP:
diff --git a/src/box/xlog.h b/src/box/xlog.h
index 47df3a549..329d78c77 100644
--- a/src/box/xlog.h
+++ b/src/box/xlog.h
@@ -162,7 +162,7 @@ struct xdir {
/**
* Directory path.
*/
- char dirname[PATH_MAX+1];
+ char dirname[PATH_MAX];
/** Snapshots or xlogs */
enum xdir_type type;
};
--
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 ` Cyrill Gorcunov [this message]
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 ` [Tarantool-patches] [PATCH 5/6] xlog: xlog_cursor -- use sizeof with snprintf for safety Cyrill Gorcunov
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-4-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 3/6] xlog: xdir -- use PATH_MAX for dirname' \
/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