diff options
| author | 2017-10-16 19:13:22 +0000 | |
|---|---|---|
| committer | 2017-10-16 19:13:22 +0000 | |
| commit | 16fbd3a1d821a375abbc23749b891489aecd53d7 (patch) | |
| tree | 65ca6d2403f5d5b8981d35abb514517401570a7b /tools/bit/util.cpp | |
| parent | ce1f9afb842555982474f8ef7a3d4f19257f5a8a (diff) | |
| parent | c7edf078f92c7ce083f8c243a79f8aecdfff4ac1 (diff) | |
Merge "Use -Werror in frameworks/base"
Diffstat (limited to 'tools/bit/util.cpp')
| -rw-r--r-- | tools/bit/util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/bit/util.cpp b/tools/bit/util.cpp index fc93bcb8c935..922393146b10 100644 --- a/tools/bit/util.cpp +++ b/tools/bit/util.cpp @@ -101,7 +101,6 @@ TrackedFile::HasChanged() const void get_directory_contents(const string& name, map<string,FileInfo>* results) { - int err; DIR* dir = opendir(name.c_str()); if (dir == NULL) { return; @@ -241,7 +240,9 @@ read_file(const string& filename) fseek(file, 0, SEEK_SET); char* buf = (char*)malloc(size); - fread(buf, 1, size, file); + if ((size_t) size != fread(buf, 1, size, file)) { + return string(); + } string result(buf, size); |