Merge pull request #5168 from sashashura/4879958521806848
Fix UNKNOWN READ in Assimp::SMDImporter::ParseNodeInfopull/5154/head^2
commit
9a94b26cdc
|
@ -837,7 +837,10 @@ void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut
|
||||||
unsigned int iBone = 0;
|
unsigned int iBone = 0;
|
||||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||||
if ( !ParseUnsignedInt(szCurrent,&szCurrent,iBone) || !SkipSpaces(szCurrent,&szCurrent)) {
|
if ( !ParseUnsignedInt(szCurrent,&szCurrent,iBone) || !SkipSpaces(szCurrent,&szCurrent)) {
|
||||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone index");
|
throw DeadlyImportError("Unexpected EOF/EOL while parsing bone index");
|
||||||
|
}
|
||||||
|
if (iBone == UINT_MAX) {
|
||||||
|
LogErrorNoThrow("Invalid bone number while parsing bone index");
|
||||||
SMDI_PARSE_RETURN;
|
SMDI_PARSE_RETURN;
|
||||||
}
|
}
|
||||||
// add our bone to the list
|
// add our bone to the list
|
||||||
|
|
Loading…
Reference in New Issue