benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #89 from adishavit/develop

Browse Source 
Crash bug fix + optimizations in LoadObjWithCallback()
This commit is contained in:
Syoyo Fujita
2016-07-27 16:30:36 +09:00
committed by GitHub
parent 75e64cd47a 3736a5791f
commit e456cc949d
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tiny_obj_loader.h
View File

@@ -1323,8 +1323,15 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
std::map<std::string, int> material_map; std::map<std::string, int> material_map;
int material_id = -1; // -1 = invalid int material_id = -1; // -1 = invalid
std::vector<index_t> indices;
std::vector<material_t> materials;
std::vector<std::string> names;
names.reserve(2);
std::string name;
std::vector<const char *> names_out;
std::string linebuf;
while (inStream->peek() != -1) { while (inStream->peek() != -1) {
std::string linebuf;
std::getline(*inStream, linebuf); std::getline(*inStream, linebuf);
// Trim newline '\r\n' or '\n' // Trim newline '\r\n' or '\n'
@@ -1389,7 +1396,7 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
token += 2; token += 2;
token += strspn(token, " \t"); token += strspn(token, " \t");
std::vector<index_t> indices; indices.clear();
while (!IS_NEW_LINE(token[0])) { while (!IS_NEW_LINE(token[0])) {
vertex_index vi = parseRawTriple(&token); vertex_index vi = parseRawTriple(&token);
@@ -1440,37 +1447,38 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
// load mtl // load mtl
if ((0 == strncmp(token, "mtllib", 6)) && IS_SPACE((token[6]))) { if ((0 == strncmp(token, "mtllib", 6)) && IS_SPACE((token[6]))) {
char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE]; if (readMatFn) {
token += 7; char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
token += 7;
#ifdef _MSC_VER #ifdef _MSC_VER
sscanf_s(token, "%s", namebuf, (unsigned)_countof(namebuf)); sscanf_s(token, "%s", namebuf, (unsigned)_countof(namebuf));
#else #else
sscanf(token, "%s", namebuf); sscanf(token, "%s", namebuf);
#endif #endif
std::string err_mtl; std::string err_mtl;
std::vector<material_t> materials; materials.clear();
bool ok = (*readMatFn)(namebuf, &materials, &material_map, &err_mtl); bool ok = (*readMatFn)(namebuf, &materials, &material_map, &err_mtl);
if (err) { if (err) {
(*err) += err_mtl; (*err) += err_mtl;
} }
if (!ok) { if (!ok) {
return false; return false;
} }
if (callback.mtllib_cb) { if (callback.mtllib_cb) {
callback.mtllib_cb(user_data, &materials.at(0), callback.mtllib_cb(user_data, &materials.at(0),
static_cast<int>(materials.size())); static_cast<int>(materials.size()));
} }
}
continue; continue;
} }
// group name // group name
if (token[0] == 'g' && IS_SPACE((token[1]))) { if (token[0] == 'g' && IS_SPACE((token[1]))) {
std::vector<std::string> names; names.clear();
names.reserve(2);
while (!IS_NEW_LINE(token[0])) { while (!IS_NEW_LINE(token[0])) {
std::string str = parseString(&token); std::string str = parseString(&token);
@@ -1480,23 +1488,22 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
assert(names.size() > 0); assert(names.size() > 0);
std::string name;
// names[0] must be 'g', so skip the 0th element. // names[0] must be 'g', so skip the 0th element.
if (names.size() > 1) { if (names.size() > 1) {
name = names[1]; name = names[1];
} else { } else {
name = ""; name.clear();
} }
if (callback.group_cb) { if (callback.group_cb) {
if (names.size() > 1) { if (names.size() > 1) {
// create const char* array. // create const char* array.
std::vector<const char *> tmp(names.size() - 1); names_out.resize(names.size() - 1);
for (size_t j = 0; j < tmp.size(); j++) { for (size_t j = 0; j < names_out.size(); j++) {
tmp[j] = names[j + 1].c_str(); names_out[j] = names[j + 1].c_str();
} }
callback.group_cb(user_data, &tmp.at(0), callback.group_cb(user_data, &names_out.at(0),
static_cast<int>(tmp.size())); static_cast<int>(names_out.size()));
} else { } else {
callback.group_cb(user_data, NULL, 0); callback.group_cb(user_data, NULL, 0);