Added new ReadFileToString API with a max_size argument

base/file_util.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #endif
 #include <stdio.h>
@@ skipping 108 matching lines @@
     else if (end2 + 1 < line2.length())
       line2.erase(end2 + 1);
 
     if (line1 != line2)
       return false;
   } while (!file1.eof() || !file2.eof());
 
   return true;
 }
 
-bool ReadFileToString(const FilePath& path, std::string* contents) {
+bool ReadFileToString(const FilePath& path,
+                             std::string* contents,

[bartfab (slow), 2014/02/11 12:51:12]

Nit: Align the arguments.

[kaliamoorthi, 2014/02/11 16:29:16]

Done.

+                             size_t maxsize) {
   if (path.ReferencesParent())
     return false;
   FILE* file = OpenFile(path, "rb");
   if (!file) {
     return false;
   }
 
   char buf[1 << 16];
   size_t len;
+  size_t size = 0;
+
+  // Many files supplied in path have incorrect size (proc files, streams etc)

[bartfab (slow), 2014/02/11 12:51:12]

Nit: What do you mean by incorrect size? IIUC, the size is not incorrect, it
just cannot reliably be determined because it may change at any time.

[kaliamoorthi, 2014/02/11 16:29:16]

Some files especially procfs have incorrect size (reported as 0)

+  // hence the file is read sequentially as opposed to one-shot read.
   while ((len = fread(buf, 1, sizeof(buf), file)) > 0) {
+    if ((maxsize - size) < len) {

[bartfab (slow), 2014/02/11 12:51:12]

Nit: A matter of taste but I think |len > maxsize - size| would be easier to
parse: "If the amount of data read (len) is larger than the amount still
permitted (maxsize - size), report an error."

[kaliamoorthi, 2014/02/11 16:29:16]

Since it is not a coding guideline, I think the current one is fine

+      if (contents)
+        contents->clear();
+      CloseFile(file);
+      return false;
+    }
+    size += len;
     if (contents)
       contents->append(buf, len);
   }
   CloseFile(file);
 
   return true;
 }
 
+bool ReadFileToString(const FilePath& path, std::string* contents) {
+  return ReadFileToString(path, contents, std::numeric_limits<size_t>::max());

[bartfab (slow), 2014/02/11 12:51:12]

Nit: #include <limits>

[kaliamoorthi, 2014/02/11 16:29:16]

Done.

+}
+
 bool IsDirectoryEmpty(const FilePath& dir_path) {
   FileEnumerator files(dir_path, false,
       FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
   if (files.Next().empty())
     return true;
   return false;
 }
 
 FILE* CreateAndOpenTemporaryFile(FilePath* path) {
   FilePath directory;
@@ skipping 82 matching lines @@
     if (!PathExists(new_path) &&
         (!have_suffix || !PathExists(FilePath(new_path.value() + suffix)))) {
       return count;
     }
   }
 
   return -1;
 }
 
 }  // namespace file_util