From: Kefu Chai <kchai@redhat.com>
Date: Sun, 6 May 2018 07:25:00 +0000 (+0800)
Subject: os/filestore: silence -Wformat-truncation= warning
X-Git-Tag: v13.1.1~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21862%2Fhead;p=ceph.git

os/filestore: silence -Wformat-truncation= warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3f3f378d3869b30da5d2dd5ae4dab3c0ced9e312)
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index dd77fd722336..5754075c5b0a 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -4892,7 +4892,11 @@ int FileStore::list_collections(vector<coll_t>& ls, bool include_temp)
       // d_type not supported (non-ext[234], btrfs), must stat
       struct stat sb;
       char filename[PATH_MAX];
-      snprintf(filename, sizeof(filename), "%s/%s", fn, de->d_name);
+      if (int n = snprintf(filename, sizeof(filename), "%s/%s", fn, de->d_name);
+	  n >= static_cast<int>(sizeof(filename))) {
+	derr << __func__ << " path length overrun: " << n << dendl;
+	assert(false);
+      }
 
       r = ::stat(filename, &sb);
       if (r < 0) {