FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of null pointer

Browse Source
This commit is contained in:
Robert Osfield
2016-06-29 18:01:29 +01:00
parent fb537e089b
commit a24cdb59de
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgPlugins/txp/trpage_readbuf.cpp
View File

@@ -639,19 +639,21 @@ trpgrAppFile *trpgrAppFileCache::GetFile(trpgEndian ness,int id,int col,int row)
}
// Found it in cache, just return
if (foundID != -1) {
if (foundID != -1)
{
OpenFile &of = files[foundID];
if (of.afile->isValid())
if (of.afile)
{
of.lastUsed = timeCount;
return of.afile;
}
else
{
if (of.afile)
if (of.afile->isValid())
{
of.lastUsed = timeCount;
return of.afile;
}
else
{
delete of.afile;
of.afile = NULL;
of.afile = NULL;
}
}
}