tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "identity/Util: Fix file write check" am: 61e8fb9442 am: 2f5ce9939d am: f9f02fde96

Browse source 
Change-Id: I53d2f39d0792c53cdbbad59b05457218a877d0b8
This commit is contained in:
Automerger Merge Worker 2020-01-27 18:52:40 +00:00
commit fe40207bd3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
identity/Util.cpp
View file

@ -60,7 +60,7 @@ optional<vector<uint8_t>> fileGetContents(const string& path) {
uint8_t* p = data.data();
size_t remaining = data.size();
while (remaining > 0) {
size_t numRead = TEMP_FAILURE_RETRY(read(fd, p, remaining));
ssize_t numRead = TEMP_FAILURE_RETRY(read(fd, p, remaining));
if (numRead <= 0) {
PLOG(ERROR) << "Failed reading from '" << path << "'";
close(fd);
@ -94,7 +94,7 @@ bool fileSetContents(const string& path, const vector<uint8_t>& data) {
const uint8_t* p = data.data();
size_t remaining = data.size();
while (remaining > 0) {
size_t numWritten = TEMP_FAILURE_RETRY(write(fd, p, remaining));
ssize_t numWritten = TEMP_FAILURE_RETRY(write(fd, p, remaining));
if (numWritten <= 0) {
PLOG(ERROR) << "Failed writing into temp file for '" << path << "'";
close(fd);