summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-08-21 22:53:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-08-21 22:53:40 +0000
commit4a96de79393efca9b916b97bab3f8fbd641d62b2 (patch)
treee51441fac49507439d66c22dfba4ac169997195f
parent17ac2efeb7d676c108355823b9e57cceb55845cc (diff)
parente9db937f4008f097f4ee9dc341a3afc219a96fd9 (diff)
Merge "Fix integer overflow in make_timestamp_ns_locked"
-rw-r--r--cmds/incidentd/src/WorkDirectory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp
index 0570c3a039ae..8dcb86537487 100644
--- a/cmds/incidentd/src/WorkDirectory.cpp
+++ b/cmds/incidentd/src/WorkDirectory.cpp
@@ -664,7 +664,7 @@ int64_t WorkDirectory::make_timestamp_ns_locked() {
nanosleep(&spec, nullptr);
}
clock_gettime(CLOCK_REALTIME, &spec);
- timestampNs = (spec.tv_sec) * 1000 + spec.tv_nsec;
+ timestampNs = int64_t(spec.tv_sec) * 1000 + spec.tv_nsec;
} while (file_exists_locked(timestampNs));
return timestampNs;
}