livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle invalid/corrupt VFS files in animation loading.

Nicky 2013-01-02 18:59:42 +01:00
parent 3be4e07442
commit d6ebfd7c73
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llcharacter/llkeyframemotion.cpp
View File

@ -44,6 +44,8 @@
#include "message.h"
#include "lltimer.h"
#include <ndexceptions.h> // <FS:ND/> For nd::exceptions::xran
//-----------------------------------------------------------------------------
// Static Definitions
//-----------------------------------------------------------------------------
@ -2177,7 +2179,12 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
file.read((U8*)buffer, size); /*Flawfinder: ignore*/
lldebugs << "Loading keyframe data for: " << motionp->getName() << ":" << motionp->getID() << " (" << size << " bytes)" << llendl;
// <FS:ND> Handle invalid files that cannot be properly loaded
try
{
// </FS:ND>
LLDataPackerBinaryBuffer dp(buffer, size);
if (motionp->deserialize(dp))
{
@ -2188,6 +2195,17 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
llwarns << "Failed to decode asset for animation " << motionp->getName() << ":" << motionp->getID() << llendl;
motionp->mAssetStatus = ASSET_FETCH_FAILED;
}
// <FS:ND> Handle invalid files that cannot be properly loaded
}
catch( nd::exceptions::xran &ex )
{
// Maybe delete the file from the VFS here? It's corrupt, deleting it should be harmless?
llwarns << "Failed to decode asset for animation " << motionp->getName() << ":" << motionp->getID() << " error: " << ex.what() << llendl;
motionp->mAssetStatus = ASSET_FETCH_FAILED;
}
// </FS:ND>
delete[] buffer;
}