Detecting and fixing stringprintf.h format bugs

chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/storage/storage_schema_manifest_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 31 matching lines @@
   std::string path;
   extension->manifest()->GetString(kStorageManagedSchema, &path);
   base::FilePath file = base::FilePath::FromUTF8Unsafe(path);
   if (file.IsAbsolute() || file.ReferencesParent()) {
     *error = base::StringPrintf("%s must be a relative path without ..",
                                 kStorageManagedSchema);
     return policy::Schema();
   }
   file = extension->path().AppendASCII(path);
   if (!base::PathExists(file)) {
+#ifdef OS_WIN

[Lei Zhang, 2015/09/29 03:16:17]

#if defined(OS_WIN), ditto elsewhere, but maybe just do:

#if defined(OS_WIN)
#define FP_MACRO ls
#else
#define FP_MACRO s
#endif
*error = base::StringPrintf("File does not exist: %" FP_MACRO,
file.value().c_str());

[brucedawson, 2015/09/29 21:39:39]

Yes. That is much better. It is cleaner and by defining FP_MACRO near
FilePath::StringType it localizes that knowledge.

[Lei Zhang, 2015/09/29 21:42:37]

SGTM

+    // FilePath::StringType is std::wstring on Windows
+    *error =
+        base::StringPrintf("File does not exist: %ls", file.value().c_str());
+#else
     *error =
         base::StringPrintf("File does not exist: %s", file.value().c_str());
+#endif
     return policy::Schema();
   }
   std::string content;
   if (!base::ReadFileToString(file, &content)) {
+#ifdef OS_WIN
+    // FilePath::StringType is std::wstring on Windows
+    *error = base::StringPrintf("Can't read %ls", file.value().c_str());
+#else
     *error = base::StringPrintf("Can't read %s", file.value().c_str());
+#endif
     return policy::Schema();
   }
   return policy::Schema::Parse(content, error);
 }
 #endif
 
 bool StorageSchemaManifestHandler::Parse(Extension* extension,
                                          base::string16* error) {
   std::string path;
   if (!extension->manifest()->GetString(kStorageManagedSchema, &path)) {
@@ skipping 18 matching lines @@
 #else
   return true;
 #endif
 }
 
 const std::vector<std::string> StorageSchemaManifestHandler::Keys() const {
   return SingleKey(kStorageManagedSchema);
 }
 
 }  // namespace extensions