Fix FormID equality comparison

Where one FormID's plugin is a substring of the other's.
Ortham · Nov 25, 2015 · 187960e · 187960e
1 parent ff15dfa
commit 187960e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/include/libespm/FormId.h b/include/libespm/FormId.h
@@ -66,10 +66,9 @@ namespace libespm {
     inline bool operator == (const FormId& rhs) const {
       std::string rhsPluginName = rhs.getPluginName();
 
-      return objectIndex == rhs.getObjectIndex() && std::equal(begin(pluginName),
-                                                               end(pluginName),
-                                                               begin(rhs.getPluginName()),
-                                                               [](char lhs, char rhs) {
+      return objectIndex == rhs.getObjectIndex()
+        && pluginName.size() == rhs.getPluginName().size()
+        && std::equal(begin(pluginName), end(pluginName), begin(rhs.getPluginName()), [](char lhs, char rhs) {
         return tolower(lhs) == tolower(rhs);
       });
     }

diff --git a/src/tests/FormIdTest.h b/src/tests/FormIdTest.h
@@ -91,6 +91,13 @@ namespace libespm {
       EXPECT_NE(formId, otherFormId);
     }
 
+    TEST_F(FormIdTest, formIdsWithEqualModIndicesAndNoMastersAndDifferentParentPluginNamesShouldNotBeEqual) {
+        FormId formId(parentPluginName, std::vector<std::string>(), 0x01);
+        FormId otherFormId(parentPluginName + ".ghost", std::vector<std::string>(), 0x01);
+
+        EXPECT_NE(formId, otherFormId);
+    }
+
     TEST_F(FormIdTest, identicalFormIdsShouldBeEqual) {
       FormId formId(parentPluginName, masters, 0x01);
       FormId otherFormId(parentPluginName, masters, 0x01);