diff options
| author | Lakshman Annadorai <lakshmana@google.com> | 2022-01-26 22:24:29 +0000 |
|---|---|---|
| committer | Lakshman Annadorai <lakshmana@google.com> | 2022-01-28 23:26:19 +0000 |
| commit | d0ddc759e4840632642b06f2a67c0ee9abb7ac0f (patch) | |
| tree | 9e330334b85a5a6fbbfffcdf95bda34d1f90b041 /cpp/watchdog | |
| parent | bc4fd00f3c44314995bd3dcb69bdec0403be56c2 (diff) | |
| download | Car-d0ddc759e4840632642b06f2a67c0ee9abb7ac0f.tar.gz | |
Fix memset size in PackageInfoResolverTest.
Bug: 207508335
Test: WITH_TIDY=1 mm; atest libwatchdog_test
Change-Id: I3e1546ce1b0ee09cec3345a93a4243a0cac4936b
Merged-In: I3e1546ce1b0ee09cec3345a93a4243a0cac4936b
(cherry picked from commit 9a4a33690b5c622f6ad17d6a0dd394125ea2589a)
Diffstat (limited to 'cpp/watchdog')
| -rw-r--r-- | cpp/watchdog/server/tests/PackageInfoResolverTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/watchdog/server/tests/PackageInfoResolverTest.cpp b/cpp/watchdog/server/tests/PackageInfoResolverTest.cpp index cf68ddae50..cf8e4c4b14 100644 --- a/cpp/watchdog/server/tests/PackageInfoResolverTest.cpp +++ b/cpp/watchdog/server/tests/PackageInfoResolverTest.cpp @@ -108,12 +108,13 @@ private: const std::unordered_map<uid_t, std::string>& mapping) { clearMappingCache(); for (const auto& it : mapping) { - char* packageName = new char[it.second.size() + 1]; + size_t packageNameLen = it.second.size() + 1; + char* packageName = new char[packageNameLen]; if (packageName == nullptr) { continue; } - memset(packageName, 0, sizeof(packageName)); - snprintf(packageName, it.second.size() + 1, "%s", it.second.c_str()); + memset(packageName, 0, packageNameLen); + snprintf(packageName, packageNameLen, "%s", it.second.c_str()); struct passwd pwd { .pw_name = packageName, .pw_uid = it.first |