Przeglądaj źródła

Update ColladaParser.cpp

Fix review findings.
Kim Kulling 5 lat temu
rodzic
commit
53bf442beb
1 zmienionych plików z 8 dodań i 2 usunięć
  1. 8 2
      code/Collada/ColladaParser.cpp

+ 8 - 2
code/Collada/ColladaParser.cpp

@@ -438,13 +438,19 @@ void ColladaParser::ReadContributorInfo()
     }
     }
 }
 }
 
 
-bool FindCommonKey(const char *collada_key, const MetaKeyPairVector &key_renaming, size_t &found_index) {
+static bool FindCommonKey(const char *collada_key, const MetaKeyPairVector &key_renaming, size_t &found_index) {
+    found_index = 9999999u;
+    if ( nullptr == collada_key ) {
+        return false;
+    }
+    
     for (size_t i = 0; i < key_renaming.size(); ++i) {
     for (size_t i = 0; i < key_renaming.size(); ++i) {
-		if (strcmp(key_renaming[i].first, collada_key) == 0) {
+		if (strncmp(key_renaming[i].first, collada_key, strlen(collada_key)) == 0) {
             found_index = i;
             found_index = i;
             return true;
             return true;
 		}
 		}
 	}
 	}
+    
     return false;
     return false;
 }
 }