[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/14 23:10:17

Modified files:
        .              : ChangeLog 
        server/swf     : tag_loaders.cpp 

Log message:
        immediately store bitmap_character_def instances into an instrusive_ptr 
to make
        add_bitmap_character_def calls safe. Should fix bug #21377.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5180&r2=1.5181
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.173&r2=1.174

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5180
retrieving revision 1.5181
diff -u -b -r1.5180 -r1.5181
--- ChangeLog   14 Dec 2007 22:21:20 -0000      1.5180
+++ ChangeLog   14 Dec 2007 23:10:17 -0000      1.5181
@@ -1,5 +1,11 @@
 2007-12-14 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp: immediately store bitmap_character_def
+         instances into an instrusive_ptr to make add_bitmap_character_def
+         calls safe. Should fix bug #21377.
+
+2007-12-14 Sandro Santilli <address@hidden>
+
        * server/parser/shape_character_def.cpp: fix compiler warnings,
          one of which about possible use of uninitialized value...
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- server/swf/tag_loaders.cpp  14 Dec 2007 16:31:49 -0000      1.173
+++ server/swf/tag_loaders.cpp  14 Dec 2007 23:10:17 -0000      1.174
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.173 2007/12/14 16:31:49 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.174 2007/12/14 23:10:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -319,7 +319,7 @@
     }
     
     
-    bitmap_character_def* ch = new bitmap_character_def(im);
+    boost::intrusive_ptr<bitmap_character_def> ch = new 
bitmap_character_def(im);
     
     if ( m->get_bitmap_character_def(character_id) )
     {
@@ -329,7 +329,7 @@
     }
     else
     {
-        m->add_bitmap_character_def(character_id, ch);
+        m->add_bitmap_character_def(character_id, ch.get());
     }
 }
 
@@ -365,8 +365,8 @@
        }
        else
        {
-           bitmap_character_def* ch = new bitmap_character_def(im);
-           m->add_bitmap_character_def(character_id, ch);
+           boost::intrusive_ptr<bitmap_character_def> ch = new 
bitmap_character_def(im);
+           m->add_bitmap_character_def(character_id, ch.get());
        }
     }
 }
@@ -511,9 +511,9 @@
        }
 
        // Create bitmap character.
-       bitmap_character_def* ch = new bitmap_character_def(im);
+       boost::intrusive_ptr<bitmap_character_def> ch = new 
bitmap_character_def(im);
 
-       m->add_bitmap_character_def(character_id, ch);
+       m->add_bitmap_character_def(character_id, ch.get());
 #endif
     }
 }
@@ -656,10 +656,10 @@
            }
            else
            {
-               bitmap_character_def* ch = new bitmap_character_def(image);
+               boost::intrusive_ptr<bitmap_character_def> ch = new 
bitmap_character_def(image);
 
                // add image to movie, under character id.
-               m->add_bitmap_character_def(character_id, ch);
+               m->add_bitmap_character_def(character_id, ch.get());
            }
        }
        else
@@ -757,10 +757,10 @@
                }
            }
 
-           bitmap_character_def* ch = new bitmap_character_def(image);
+           boost::intrusive_ptr<bitmap_character_def> ch = new 
bitmap_character_def(image);
 
            // add image to movie, under character id.
-           m->add_bitmap_character_def(character_id, ch);
+           m->add_bitmap_character_def(character_id, ch.get());
        }
 #endif // HAVE_ZLIB_H