Fix bug: "decryption: Fetch file encryption from applied fstab [1/2]"
There is a problem with double deletion.
This commit 446ccbfeb20f52f949e255d7fefb2f06ac5963ba
Change-Id: Ie1f9f9b68c875d3394b8f4639fd5ca153d565b7b
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 9a2a3aa..8aede55 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -288,11 +288,17 @@
if (parse_userdata) {
if (strstr(fstab_line, "/metadata") && !strstr(fstab_line, "/data")) {
- Partitions.erase(std::find(Partitions.begin(), Partitions.end(), meta));
- delete meta;
+ if (meta) {
+ Partitions.erase(std::find(Partitions.begin(), Partitions.end(), meta));
+ delete meta;
+ meta = NULL;
+ }
} else if (strstr(fstab_line, "/data")) {
- Partitions.erase(std::find(Partitions.begin(), Partitions.end(), data));
- delete data;
+ if (data) {
+ Partitions.erase(std::find(Partitions.begin(), Partitions.end(), data));
+ delete data;
+ data = NULL;
+ }
} else {
continue;
}