Skip whitespaces between usemtl and name. Fixes tinyobjloader#246

syoyo · syoyo · commit 4b62a197a8d0 · 2019-11-28T16:16:09.000+09:00
diff --git a/tests/tester.cc b/tests/tester.cc
@@ -1252,6 +1252,34 @@ void test_mtl_searchpaths_issue244() {
   TEST_CHECK(4 == shapes[1].mesh.indices[0].vertex_index);
 }
 
+void test_usemtl_whitespace_issue246() {
+  tinyobj::attrib_t attrib;
+  std::vector<tinyobj::shape_t> shapes;
+  std::vector<tinyobj::material_t> materials;
+
+  std::string warn;
+  std::string err;
+  bool ret = tinyobj::LoadObj(
+      &attrib, &shapes, &materials, &warn, &err,
+      "../models/issue-246-usemtl-whitespace.obj",
+      gMtlBasePath);
+
+  TEST_CHECK(warn.empty());
+
+  if (!warn.empty()) {
+    std::cout << "WARN: " << warn << std::endl;
+  }
+
+  if (!err.empty()) {
+    std::cerr << "ERR: " << err << std::endl;
+  }
+
+  TEST_CHECK(true == ret);
+  TEST_CHECK(1 == shapes.size());
+  TEST_CHECK(1 == materials.size());
+  TEST_CHECK(0 == shapes[0].mesh.material_ids[0]);
+}
+
 // Fuzzer test.
 // Just check if it does not crash.
 // Disable by default since Windows filesystem can't create filename of afl
@@ -1347,4 +1375,6 @@ TEST_LIST = {
      test_usemtl_then_o_issue235},
     {"mtl_searchpaths_issue244",
      test_mtl_searchpaths_issue244},
+    {"usemtl_whitespece_issue246",
+     test_usemtl_whitespace_issue246},
     {NULL, NULL}};
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -2353,19 +2353,17 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
     }
 
     // use mtl
-    if ((0 == strncmp(token, "usemtl", 6)) && IS_SPACE((token[6]))) {
-      token += 7;
-      std::stringstream ss;
-      ss << token;
-      std::string namebuf = ss.str();
+    if ((0 == strncmp(token, "usemtl", 6))) {
+      token += 6;      
+      std::string namebuf = parseString(&token);
 
       int newMaterialId = -1;
       if (material_map.find(namebuf) != material_map.end()) {
         newMaterialId = material_map[namebuf];
       } else {
         // { error!! material not found }
         if (warn) {
-          (*warn) += "material [ " + namebuf + " ] not found in .mtl\n";
+          (*warn) += "material [ '" + namebuf + "' ] not found in .mtl\n";
         }
       }
 
