diff --git a/static/item_updater_static.cpp b/static/item_updater_static.cpp
index fe872f0..d5940b6 100644
--- a/static/item_updater_static.cpp
+++ b/static/item_updater_static.cpp
@@ -147,13 +147,36 @@
         // ID=06 MVPD 0x0012d000..0x001bd000 (actual=0x00090000) [E--P--F-C-]
         // Flag 'F' means REPROVISION
         // Flag 'C' means CLEARECC
-        auto flags = line.substr(line.find('['));
+        auto pos = line.find('[');
+        if (pos == std::string::npos)
+        {
+            continue;
+        }
+        auto flags = line.substr(pos);
         if (flags.find('F') != std::string::npos)
         {
             // This is a partition to be cleared
-            line = line.substr(line.find_first_of(' '));     // Skiping "ID=xx"
-            line = line.substr(line.find_first_not_of(' ')); // Skipping spaces
-            line = line.substr(0, line.find_first_of(' '));  // The part name
+            pos = line.find_first_of(' '); // After "ID=xx"
+            if (pos == std::string::npos)
+            {
+                continue;
+            }
+            line = line.substr(pos); // Skiping "ID=xx"
+
+            pos = line.find_first_not_of(' '); // After spaces
+            if (pos == std::string::npos)
+            {
+                continue;
+            }
+            line = line.substr(pos); // Skipping spaces
+
+            pos = line.find_first_of(' '); // The end of part name
+            if (pos == std::string::npos)
+            {
+                continue;
+            }
+            line = line.substr(0, pos); // The part name
+
             bool ecc = flags.find('C') != std::string::npos;
             ret.emplace_back(line, ecc);
         }
diff --git a/test/Makefile.am b/test/Makefile.am
index da477d2..467c7d9 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -42,6 +42,7 @@
 	../static/activation_static.cpp \
 	test_signature.cpp \
 	test_version.cpp \
+	test_item_updater_static.cpp \
 	msl_verify.cpp
 
 utest_LDADD = -lstdc++fs
diff --git a/test/test_item_updater_static.cpp b/test/test_item_updater_static.cpp
new file mode 100644
index 0000000..d4385c2
--- /dev/null
+++ b/test/test_item_updater_static.cpp
@@ -0,0 +1,129 @@
+#include <string>
+#include <utility>
+
+#include <gtest/gtest.h>
+
+using PartClear = std::pair<std::string, bool>;
+namespace utils
+{
+extern std::vector<PartClear> getPartsToClear(const std::string& info);
+}
+
+TEST(TestItemUpdaterStatic, getPartsToClearOK)
+{
+    constexpr auto info =
+        "Flash info:\n"
+        "-----------\n"
+        "Name          = /dev/mtd6\n"
+        "Total size    = 64MB     Flags E:ECC, P:PRESERVED, R:READONLY, "
+        "B:BACKUP\n"
+        "Erase granule = 64KB           F:REPROVISION, V:VOLATILE, C:CLEARECC\n"
+        "\n"
+        "TOC@0x00000000 Partitions:\n"
+        "-----------\n"
+        "ID=00        part 0x00000000..0x00002000 (actual=0x00002000) "
+        "[----------]\n"
+        "ID=01        HBEL 0x00008000..0x0002c000 (actual=0x00024000) "
+        "[E-----F-C-]\n"
+        "ID=02       GUARD 0x0002c000..0x00031000 (actual=0x00005000) "
+        "[E--P--F-C-]\n"
+        "ID=03       NVRAM 0x00031000..0x000c1000 (actual=0x00090000) "
+        "[---P--F---]\n"
+        "ID=04     SECBOOT 0x000c1000..0x000e5000 (actual=0x00024000) "
+        "[E--P------]\n"
+        "ID=05       DJVPD 0x000e5000..0x0012d000 (actual=0x00048000) "
+        "[E--P--F-C-]\n"
+        "ID=06        MVPD 0x0012d000..0x001bd000 (actual=0x00090000) "
+        "[E--P--F-C-]\n"
+        "ID=07        CVPD 0x001bd000..0x00205000 (actual=0x00048000) "
+        "[E--P--F-C-]\n"
+        "ID=08         HBB 0x00205000..0x00305000 (actual=0x00100000) "
+        "[EL--R-----]\n"
+        "ID=09         HBD 0x00305000..0x00425000 (actual=0x00120000) "
+        "[EL--------]\n"
+        "ID=10         HBI 0x00425000..0x013e5000 (actual=0x00fc0000) "
+        "[EL--R-----]\n"
+        "ID=11         SBE 0x013e5000..0x014a1000 (actual=0x000bc000) "
+        "[ELI-R-----]\n"
+        "ID=12       HCODE 0x014a1000..0x015c1000 (actual=0x00120000) "
+        "[EL--R-----]\n"
+        "ID=13        HBRT 0x015c1000..0x01bc1000 (actual=0x00600000) "
+        "[EL--R-----]\n"
+        "ID=14     PAYLOAD 0x01bc1000..0x01cc1000 (actual=0x00100000) "
+        "[-L--R-----]\n"
+        "ID=15  BOOTKERNEL 0x01cc1000..0x02bc1000 (actual=0x00f00000) "
+        "[-L--R-----]\n"
+        "ID=16         OCC 0x02bc1000..0x02ce1000 (actual=0x00120000) "
+        "[EL--R-----]\n"
+        "ID=17     FIRDATA 0x02ce1000..0x02ce4000 (actual=0x00003000) "
+        "[E-----F-C-]\n"
+        "ID=18        CAPP 0x02ce4000..0x02d08000 (actual=0x00024000) "
+        "[EL--R-----]\n"
+        "ID=19     BMC_INV 0x02d08000..0x02d11000 (actual=0x00009000) "
+        "[------F---]\n"
+        "ID=20        HBBL 0x02d11000..0x02d18000 (actual=0x00007000) "
+        "[EL--R-----]\n"
+        "ID=21    ATTR_TMP 0x02d18000..0x02d20000 (actual=0x00008000) "
+        "[------F---]\n"
+        "ID=22   ATTR_PERM 0x02d20000..0x02d28000 (actual=0x00008000) "
+        "[E-----F-C-]\n"
+        "ID=23     VERSION 0x02d28000..0x02d2a000 (actual=0x00002000) "
+        "[-L--R-----]\n"
+        "ID=24 IMA_CATALOG 0x02d2a000..0x02d6a000 (actual=0x00040000) "
+        "[EL--R-----]\n"
+        "ID=25     RINGOVD 0x02d6a000..0x02d8a000 (actual=0x00020000) "
+        "[----------]\n"
+        "ID=26     WOFDATA 0x02d8a000..0x0308a000 (actual=0x00300000) "
+        "[EL--R-----]\n"
+        "ID=27 HB_VOLATILE 0x0308a000..0x0308f000 (actual=0x00005000) "
+        "[E-----F-CV]\n"
+        "ID=28        MEMD 0x0308f000..0x0309d000 (actual=0x0000e000) "
+        "[EL--R-----]\n"
+        "ID=29        SBKT 0x0309d000..0x030a1000 (actual=0x00004000) "
+        "[EL--R-----]\n"
+        "ID=30        HDAT 0x030a1000..0x030a9000 (actual=0x00008000) "
+        "[EL--R-----]\n"
+        "ID=31      UVISOR 0x030a9000..0x031a9000 (actual=0x00100000) "
+        "[-L--R-----]\n"
+        "ID=32      OCMBFW 0x031a9000..0x031f4000 (actual=0x0004b000) "
+        "[EL--R-----]\n"
+        "ID=33    UVBWLIST 0x031f4000..0x03204000 (actual=0x00010000) "
+        "[-L--R-----]\n"
+        "ID=34 BACKUP_PART 0x03ff7000..0x03fff000 (actual=0x00000000) "
+        "[-----B----]";
+    auto parts = utils::getPartsToClear(info);
+    EXPECT_EQ(11, parts.size());
+
+    EXPECT_EQ("HBEL", parts[0].first);
+    EXPECT_TRUE(parts[0].second);
+
+    EXPECT_EQ("GUARD", parts[1].first);
+    EXPECT_TRUE(parts[1].second);
+
+    EXPECT_EQ("NVRAM", parts[2].first);
+    EXPECT_FALSE(parts[2].second);
+
+    EXPECT_EQ("HB_VOLATILE", parts[10].first);
+    EXPECT_TRUE(parts[10].second);
+}
+
+TEST(TestItemUpdaterStatic, getPartsToClearNotOK)
+{
+    // Verify the it does not crash on malformed texts
+    constexpr auto info =
+        "0x0308a000..0x0308f000(actual=0x00005000)"
+        "[E-----F-CV]\n" // missing ID and name with F
+        "ID=27 HB_VOLATILE 0x0308a000..0x0308f000 (actual=0x00005000) "
+        "E-----F-CV]\n" // missing [
+        "ID=22   ATTR_PERM 0x02d20000..0x02d28000 (actual=0x00008000) "
+        "[E-----F-C-]\n" // The only valid one
+        "ID=28        MEMD 0x0308f000..0x0309d000 (actual=0x0000e000) "
+        "[----]\n" // missing flags
+        "SBKT 0x0309d000..0x030a1000 (actual=0x00004000) "
+        "[EL--R-----]\n"; // missing ID
+
+    auto parts = utils::getPartsToClear(info);
+    EXPECT_EQ(1, parts.size());
+    EXPECT_EQ("ATTR_PERM", parts[0].first);
+    EXPECT_TRUE(parts[0].second);
+}