Changeset 11122 for OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp

Timestamp:

02/26/10 10:23:28 (3 years ago)

Author:

robert

Message:

From Ryan Kawicki, "I guess I missed these during my testing, but if the database pager has outstanding requests while the application is shutting down, the archive can become invalidated through unsafe calls to ReaderWriterTXP::getArchive. I've made this function return a ref_ptr and change other locations to as needed to conform to the change. I've tested this and no more crashes.

Following files from revision 11057 have been attached."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp

@@ -59 +59 @@
         //the txpNode.
         int id = ++_archiveId;
-        TXPArchive* archive = getArchive(id,osgDB::getFilePath(fileName));
+        osg::ref_ptr< TXPArchive > archive = getArchive(id,osgDB::getFilePath(fileName));
 
         if (archive != NULL)
@@ -70 +70 @@
             }
 
-            txpNode->loadArchive(archive);
-            
+            txpNode->loadArchive(archive.get());
+
             return txpNode.get();
         }
@@ -86 +86 @@
         unsigned int id;
         sscanf(name.c_str(),"tile%d_%dx%d_%u",&lod,&x,&y,&id);
-        TXPArchive* archive = getArchive(id,osgDB::getFilePath(file));
+        osg::ref_ptr< TXPArchive > archive = getArchive(id,osgDB::getFilePath(file));
 
         // The way this is done a 'tile' should only be created for lod 0 only,
@@ -107 +107 @@
 
         std::vector<TXPArchive::TileLocationInfo> childrenLoc;
-        osg::ref_ptr<osg::Node> tileContent = getTileContent(info,x,y,lod,archive, childrenLoc);
+        osg::ref_ptr<osg::Node> tileContent = getTileContent(info,x,y,lod,archive.get(), childrenLoc);
         
         tileContent->setName("TileContent");
@@ -199 +199 @@
         unsigned int id;
         sscanf(name.c_str(),"subtiles%d_%dx%d_%u",&lod,&x,&y,&id);
-        TXPArchive* archive = getArchive(id,osgDB::getFilePath(file));
+        osg::ref_ptr< TXPArchive > archive = getArchive(id,osgDB::getFilePath(file));
 
         int majorVersion, minorVersion;
@@ -259 +259 @@
                     continue;
 
-                osg::ref_ptr<osg::Node> tileContent = getTileContent(info, loc, archive, childrenChildLoc);
+                osg::ref_ptr<osg::Node> tileContent = getTileContent(info, loc, archive.get(), childrenChildLoc);
 
                 tileContent->setName("TileContent");
@@ -361 +361 @@
                     continue;
 
-                    osg::ref_ptr<osg::Node> tileContent = getTileContent(info,tileX,tileY,tileLOD,archive, childrenLoc);
+                    osg::ref_ptr<osg::Node> tileContent = getTileContent(info,tileX,tileY,tileLOD,archive.get(), childrenLoc);
 
                     tileContent->setName("TileContent");
@@ -564 +564 @@
 }
 
-TXPArchive *ReaderWriterTXP::getArchive(int id, const std::string& dir)
-{
-    TXPArchive* archive = NULL;
+osg::ref_ptr< TXPArchive > ReaderWriterTXP::getArchive(int id, const std::string& dir)
+{
+    osg::ref_ptr< TXPArchive > archive = NULL;
 
     std::map< int,osg::ref_ptr<TXPArchive> >::iterator iter = _archives.find(id);