[Gnash-commit] /srv/bzr/gnash/trunk r10738: Don't close_tag if open_tag wasn't successful.

[Sandro Santilli]

------------------------------------------------------------
revno: 10738
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Thu 2009-03-26 08:40:02 +0100
message:
  Don't close_tag if open_tag wasn't successful.
modified:
  libcore/parser/SWFMovieDefinition.cpp

=== modified file 'libcore/parser/SWFMovieDefinition.cpp'
--- a/libcore/parser/SWFMovieDefinition.cpp     2009-03-23 14:34:35 +0000
+++ b/libcore/parser/SWFMovieDefinition.cpp     2009-03-26 07:40:02 +0000
@@ -558,9 +558,12 @@
             return;
         }
 
+        bool tagOpened=false;
+
         try {
 
             SWF::TagType tag = str.open_tag();
+            tagOpened=true;
 
 parse_tag:
 
@@ -591,7 +594,9 @@
                 if (floaded == m_frame_count)
                 {
                     str.close_tag();
+                    tagOpened=false;
                     tag = str.open_tag();
+                    tagOpened=true;
                     if (tag != SWF::END )
                     {
                         IF_VERBOSE_MALFORMED_SWF(
@@ -626,7 +631,7 @@
             log_error(_("Parsing exception: %s"), e.what());
         }
 
-        str.close_tag();
+        if ( tagOpened ) str.close_tag();
 
         setBytesLoaded(str.tell());
     }