Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 15:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

strtoul result shouldn't be narrowed to uint32_t before checking for ULONG_MAX

Browse Source 
... otherwise this is always false.

Test: presubmit
Bug: 72331526
Change-Id: Ie1262ebf2eff4143bbef7b9d473c8ac5b7c9ffe4
This commit is contained in:
Yi Kong
2019-10-04 12:18:24 -07:00
parent 60d9b98423
commit 69e8325e5d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
power/stats/1.0/default/PowerStats.cpp
View File

@@ -87,7 +87,7 @@ size_t PowerStats::parsePowerRails() {
std::string railFileName; std::string railFileName;
std::string spsFileName; std::string spsFileName;
uint32_t index = 0; uint32_t index = 0;
uint32_t samplingRate; unsigned long samplingRate;
for (const auto& path : mPm.devicePaths) { for (const auto& path : mPm.devicePaths) {
railFileName = path + "/enabled_rails"; railFileName = path + "/enabled_rails";
spsFileName = path + "/sampling_rate"; spsFileName = path + "/sampling_rate";
@@ -109,10 +109,11 @@ size_t PowerStats::parsePowerRails() {
while (std::getline(railNames, line)) { while (std::getline(railNames, line)) {
std::vector<std::string> words = android::base::Split(line, ":"); std::vector<std::string> words = android::base::Split(line, ":");
if (words.size() == 2) { if (words.size() == 2) {
mPm.railsInfo.emplace(words[0], RailData{.devicePath = path, mPm.railsInfo.emplace(
.index = index, words[0], RailData{.devicePath = path,
.subsysName = words[1], .index = index,
.samplingRate = samplingRate}); .subsysName = words[1],
.samplingRate = static_cast<uint32_t>(samplingRate)});
index++; index++;
} else { } else {
ALOGW("Unexpected format in file: %s", railFileName.c_str()); ALOGW("Unexpected format in file: %s", railFileName.c_str());