Otapreopt: Fix property handling
Follow-up to commit 1b9d9a6006f4159e2cc2c41330f316b1fdc53fe1.
In the previous CL, a strncpy was translated incorrectly to a
strlcpy. Fix the glitch.
Bug: 36655947
Bug: 66996038
Test: manual A/B OTA
Change-Id: I387ff8436de351a3cec5458b3ef013e15905a046
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index a58ba41..e0d23da 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -150,10 +150,9 @@
value[kPropertyValueMax - 1] = 0;
return strlen(default_value);// TODO: Need to truncate?
}
- size_t size = std::min(kPropertyValueMax - 1, prop_value->length());
+ size_t size = std::min(kPropertyValueMax - 1, prop_value->length()) + 1;
strlcpy(value, prop_value->data(), size);
- value[size] = 0;
- return static_cast<int>(size);
+ return static_cast<int>(size - 1);
}
std::string GetOTADataDirectory() const {