v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into kimkulling-oss_fuzz29168

kimkulling-oss_fuzz29168
Kim Kulling 2021-01-19 21:21:28 +01:00 committed by GitHub
parent 5b325af79f 62e231b452
commit 22f632d8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/AMF/AMFImporter_Geometry.cpp
View File

@ -61,12 +61,12 @@ namespace Assimp {
void AMFImporter::ParseNode_Mesh(XmlNode &node) { void AMFImporter::ParseNode_Mesh(XmlNode &node) {
AMFNodeElementBase *ne = nullptr; AMFNodeElementBase *ne = nullptr;
// create new mesh object.
ne = new AMFMesh(mNodeElement_Cur);
// Check for child nodes // Check for child nodes
if (0 != ASSIMP_stricmp(node.name(), "mesh")) { if (0 != ASSIMP_stricmp(node.name(), "mesh")) {
return; return;
} }
// create new mesh object.
ne = new AMFMesh(mNodeElement_Cur);
bool found_verts = false, found_volumes = false; bool found_verts = false, found_volumes = false;
if (!node.empty()) { if (!node.empty()) {
ParseHelper_Node_Enter(ne); ParseHelper_Node_Enter(ne);

8
code/AssetLib/AMF/AMFImporter_Material.cpp
View File

@ -165,15 +165,15 @@ void AMFImporter::ParseNode_Texture(XmlNode &node) {
std::string type = node.attribute("type").as_string(); std::string type = node.attribute("type").as_string();
bool tiled = node.attribute("tiled").as_bool(); bool tiled = node.attribute("tiled").as_bool();
if (node.empty()) {
return;
}
// create new texture object. // create new texture object.
AMFNodeElementBase *ne = new AMFTexture(mNodeElement_Cur); AMFNodeElementBase *ne = new AMFTexture(mNodeElement_Cur);
AMFTexture& als = *((AMFTexture*)ne);// alias for convenience AMFTexture& als = *((AMFTexture*)ne);// alias for convenience
if (node.empty()) {
return;
}
std::string enc64_data = node.value(); std::string enc64_data = node.value();
// Check for child nodes // Check for child nodes