Add -Wformat-security

9 files changed, 16 insertions, 18 deletions

diff --git a/build_settings.cmake b/build_settings.cmake
index 425a2eddda7..2cccea9b64f 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -21,7 +21,7 @@ set(C_WARN_OPTS "-Winline -Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wc
 
 # Warnings that are specific to C++ compilation
 # Note: this is not a union of C_WARN_OPTS, since CMAKE_CXX_FLAGS already includes CMAKE_C_FLAGS, which in turn includes C_WARN_OPTS transitively
-set(CXX_SPECIFIC_WARN_OPTS "-Wsuggest-override -Wnon-virtual-dtor")
+set(CXX_SPECIFIC_WARN_OPTS "-Wsuggest-override -Wnon-virtual-dtor -Wformat-security")
 
 # C and C++ compiler flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} -mtune=intel ${EXTRA_C_FLAGS}")
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
index 9668e09bcc8..6455d6e67ae 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
@@ -285,7 +285,7 @@ FileDownloader::pathToCompletedFile(const std::string& fileReference) const {
 
 boost::optional<FileDownloader::ResumeDataBuffer>
 FileDownloader::getResumeData(const std::string& fileReference) {
-    LOG(debug, ("Reading resume data for " + fileReference).c_str());
+    LOG(debug, "%s", ("Reading resume data for " + fileReference).c_str());
     try {
         fs::path path = (_dbPath / fileReference).string() + resumeDataSuffix;
         if (fs::exists(path)) {
@@ -294,7 +294,7 @@ FileDownloader::getResumeData(const std::string& fileReference) {
 
             std::istream_iterator<char> iterator(file), end;
             std::copy(iterator, end, std::back_inserter(result));
-            LOG(debug, ("Successfully retrieved resume data for " + fileReference).c_str());
+            LOG(debug, "%s", ("Successfully retrieved resume data for " + fileReference).c_str());
             if (result.size() < 50) {
                 LOG(info, "Very small resume file %zu bytes.", result.size());
             }
@@ -303,7 +303,7 @@ FileDownloader::getResumeData(const std::string& fileReference) {
         }
     } catch(...) {
         //resume data is only an optimization
-        LOG(info, ("Error while reading resume data for " + fileReference).c_str());
+        LOG(info, "%s", ("Error while reading resume data for " + fileReference).c_str());
     }
     return boost::optional<ResumeDataBuffer>();
 }
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
index 669cc550003..1763b798f03 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
@@ -14,10 +14,10 @@ using filedistribution::Path;
 namespace {
 void logStartDownload(const std::set<std::string> & filesToDownload) {
     std::ostringstream msg;
-    msg <<"StartDownloads:" <<std::endl;
+    msg << "StartDownloads:" << std::endl;
     std::copy(filesToDownload.begin(), filesToDownload.end(),
               std::ostream_iterator<std::string>(msg, "\n"));
-    LOG(debug, msg.str().c_str());
+    LOG(debug, "%s", msg.str().c_str());
 }
 } //anonymous namespace
 
diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
index 9ce31e0dd3a..b01acb10f87 100644
--- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
@@ -111,7 +111,7 @@ FileDistributionModelImpl::getPeers(const std::string& fileReference, size_t max
         LOG(debug, "Found %zu peers for path '%s'", result.size(), path.string().c_str());
         return result;
     } catch(ZKNodeDoesNotExistsException&) {
-        LOG(debug, ("No peer entries available for " + fileReference).c_str());
+        LOG(debug, "%s", ("No peer entries available for " + fileReference).c_str());
         return PeerEntries();
     }
 }
@@ -119,8 +119,7 @@ FileDistributionModelImpl::getPeers(const std::string& fileReference, size_t max
 fs::path
 FileDistributionModelImpl::getPeerEntryPath(const std::string& fileReference) {
     std::ostringstream entry;
-    entry <<_hostName
-          <<ZKFileDBModel::_peerEntrySeparator <<_port;
+    entry <<_hostName << ZKFileDBModel::_peerEntrySeparator <<_port;
 
     return _fileDBModel.getPeersPath(fileReference) / entry.str();
 }
diff --git a/vespalog/src/test/bufferedlogtest.cpp b/vespalog/src/test/bufferedlogtest.cpp
index 3e974057361..9b69d9d3a14 100644
--- a/vespalog/src/test/bufferedlogtest.cpp
+++ b/vespalog/src/test/bufferedlogtest.cpp
@@ -71,12 +71,11 @@ void spamLog2(uint64_t& time, int diff) {
         time += diff;
         std::ostringstream ost;
         ost << "Message " << i;
-        LOGBT(info, ost.str(), ost.str().c_str());
+        LOGBT(info, ost.str(), "%s", ost.str().c_str());
     }
 }
 
-void testThatEntriesWithHighCountIsKept(const std::string& file,
-                                        uint64_t& timer)
+void testThatEntriesWithHighCountIsKept(const std::string& file, uint64_t& timer)
 {
     std::cerr << "testThatEntriesWithHighCountIsKept ...\n";
     timer = 10 * 1000000 + 4;
diff --git a/vespalog/src/test/bufferedlogtest.logger1.cpp b/vespalog/src/test/bufferedlogtest.logger1.cpp
index 24b9237a71d..dde5f2edbb5 100644
--- a/vespalog/src/test/bufferedlogtest.logger1.cpp
+++ b/vespalog/src/test/bufferedlogtest.logger1.cpp
@@ -5,7 +5,7 @@
 
 LOG_SETUP(".logger1");
 
-void logWithLogger1(const std::string& token, const std::string message)
+void logWithLogger1(const std::string& token, const std::string & message)
 {
-    LOGBT(info, token, message.c_str());
+    LOGBT(info, token, "%s", message.c_str());
 }
diff --git a/vespalog/src/test/bufferedlogtest.logger1.h b/vespalog/src/test/bufferedlogtest.logger1.h
index acbd67e8c3e..1ec8f9acad4 100644
--- a/vespalog/src/test/bufferedlogtest.logger1.h
+++ b/vespalog/src/test/bufferedlogtest.logger1.h
@@ -4,5 +4,5 @@
 
 #include <string>
 
-void logWithLogger1(const std::string& token, const std::string message);
+void logWithLogger1(const std::string& token, const std::string & message);
 
diff --git a/vespalog/src/test/bufferedlogtest.logger2.cpp b/vespalog/src/test/bufferedlogtest.logger2.cpp
index 8d6ca97130e..992eeb70481 100644
--- a/vespalog/src/test/bufferedlogtest.logger2.cpp
+++ b/vespalog/src/test/bufferedlogtest.logger2.cpp
@@ -5,7 +5,7 @@
 
 LOG_SETUP(".logger2");
 
-void logWithLogger2(const std::string& token, const std::string message)
+void logWithLogger2(const std::string& token, const std::string & message)
 {
-    LOGBT(info, token, message.c_str());
+    LOGBT(info, token, "%s", message.c_str());
 }
diff --git a/vespalog/src/test/bufferedlogtest.logger2.h b/vespalog/src/test/bufferedlogtest.logger2.h
index 398d799a2b3..cd88d8ea0be 100644
--- a/vespalog/src/test/bufferedlogtest.logger2.h
+++ b/vespalog/src/test/bufferedlogtest.logger2.h
@@ -4,5 +4,5 @@
 
 #include <string>
 
-void logWithLogger2(const std::string& token, const std::string message);
+void logWithLogger2(const std::string& token, const std::string & message);