OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031274: Data Exchange - RWObj_Reader ignores usemtl with empty name

Browse Source 
Fixed out of range access within pushMaterial().
This commit is contained in:
kgv 2019-12-25 19:36:48 +03:00 committed by bugmaster
parent 0da2ecac41
commit d415125a68
2 changed files with 61 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/RWObj/RWObj_Reader.cxx
View File

@ -220,9 +220,9 @@ Standard_Boolean RWObj_Reader::read (const TCollection_AsciiString& theFile,
if (theToProbe)
{
if (::memcmp (aLine, "mtllib", 6) == 0)
if (::strncmp (aLine, "mtllib", 6) == 0)
{
readMaterialLib (aLine + 7);
readMaterialLib (IsSpace (aLine[6]) ? aLine + 7 : "");
}
else if (aLine[0] == 'v' && RWObj_Tools::isSpaceChar (aLine[1]))
{
@ -269,13 +269,13 @@ Standard_Boolean RWObj_Reader::read (const TCollection_AsciiString& theFile,
{
pushObject (aLine + 2);
}
else if (::memcmp (aLine, "mtllib", 6) == 0)
else if (::strncmp (aLine, "mtllib", 6) == 0)
{
readMaterialLib (aLine + 7);
readMaterialLib (IsSpace (aLine[6]) ? aLine + 7 : "");
}
else if (::memcmp (aLine, "usemtl", 6) == 0)
else if (::strncmp (aLine, "usemtl", 6) == 0)
{
pushMaterial (aLine + 7);
pushMaterial (IsSpace (aLine[6]) ? aLine + 7 : "");
}
if (!checkMemory())

55
tests/de_mesh/obj_read/usemtl Normal file
View File

@ -0,0 +1,55 @@
puts "========"
puts "0031274: Data Exchange - RWObj_Reader ignores usemtl with empty name"
puts "========"
set material_mtl {newmtl Red
Kd 1.0 0.0 0.0
newmtl Green
Kd 0.0 1.0 0.0
newmtl Blue
Kd 0.0 0.0 1.0}
set ml_obj {
mtllib usemtl_material.mtl
v 0 0 0
v 2 0 0
v 2 1 0
v 1 2 0
v 0 1 0
v 0 0 2
v 2 0 2
v 2 1 2
v 1 2 2
v 0 1 2
g Red
usemtl Red
f 5 4 3 2 1
g Gren
usemtl Green
f 7 8 9 10 6
g Blue
usemtl Blue
f 10 9 4 5
g Gray
usemtl
f 9 8 3 4
f 6 10 5 1
f 2 3 8 7
f 1 2 7 6}
set fd [open ${imagedir}/${casename}_material.mtl w]
fconfigure $fd -translation lf
puts $fd $material_mtl
close $fd
set fd [open ${imagedir}/${casename}.obj w]
fconfigure $fd -translation lf
puts $fd $ml_obj
close $fd
ReadObj D ${imagedir}/${casename}.obj
XGetOneShape s D
explode s
set md [XGetVisMaterial D s_4]
if { [string trimright $md] != "EMPTY" } { puts "Error: EMPTY material is expected for last group" }