diff options
| -rw-r--r-- | fs_mgr/fs_mgr_boot_config.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr_boot_config.cpp b/fs_mgr/fs_mgr_boot_config.cpp index ab5beed81..911766752 100644 --- a/fs_mgr/fs_mgr_boot_config.cpp +++ b/fs_mgr/fs_mgr_boot_config.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include <string> + #include <android-base/file.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> @@ -51,9 +53,11 @@ bool fs_mgr_get_boot_config(const std::string& key, std::string* out_val) { // lastly, check the device tree if (is_dt_compatible()) { std::string file_name = kAndroidDtDir + "/" + key; - // DT entries terminate with '\0' but so do the properties if (android::base::ReadFileToString(file_name, out_val)) { - return true; + if (!out_val->empty()) { + out_val->pop_back(); // Trims the trailing '\0' out. + return true; + } } } |