[Gnash-commit] gnash ChangeLog server/parser/shape_character_d...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/11 09:10:25

Modified files:
        .              : ChangeLog 
        server/parser  : shape_character_def.cpp 

Log message:
        still read an additional byte even if fill and line bits are zero if 
we're
        reading a morph shape.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5126&r2=1.5127
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.57&r2=1.58

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5126
retrieving revision 1.5127
diff -u -b -r1.5126 -r1.5127
--- ChangeLog   11 Dec 2007 04:13:46 -0000      1.5126
+++ ChangeLog   11 Dec 2007 09:10:24 -0000      1.5127
@@ -1,9 +1,14 @@
+2007-12-11 Sandro Santilli <address@hidden>
+
+       * server/parser/shape_character_def.cpp (read): still read an
+         additional byte even if fill and line bits are zero if we're
+         reading a morph shape.
+
 2007-12-10  Rob Savoye  <address@hidden>
 
        * cygnal/testsuite/cygnal.all/test_http.cpp: Add extracing fields
        from an HTTP header tests to go with the ones that create the same
        fields.
-
        * cygnal/cygnal.cpp: Use a cygnal-dbg.log file instead of
        gnash-dbg.log. Use boost bind variables for all threads.
        * cygnal/http.{cpp,h}: Add methods for encoding HTTP header
@@ -14,7 +19,6 @@
        for anything but win32 anyway. Add testsuite directory.
        * cygnal/testsuite: New testsuite directory. It's here rather than
        in gnash/testsuite since these tests are very different from
-
        ones gnash needs for most things.
        * cygnal/testsuite/Makefile.am: New Makefile for Cygnal test
        directories.
@@ -33,7 +37,6 @@
        * testsuite/actionscript.all/Makefile.am: fix abs_mediadir to
          contain quotes. Prior version failed building XML-*.swf files,
          dunno if this patch breaks POSIX compatibility.
-
        * utilities/processor.cpp: check for quit request right
          after calling movie_root::setRootMovie, as that would
          execute actions in first frame.

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/parser/shape_character_def.cpp       6 Dec 2007 00:32:54 -0000       
1.57
+++ server/parser/shape_character_def.cpp       11 Dec 2007 09:10:24 -0000      
1.58
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.57 2007/12/06 00:32:54 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.58 2007/12/11 09:10:24 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <address@hidden> 
2003
 
@@ -227,6 +227,19 @@
 
     if ( !num_fill_bits && !num_line_bits )
     {
+        /// When reading font glyphs it happens to read 1 byte
+        /// past end boundary of a glyph due to fill/line bits being
+        ///
+        /// Returning here seems to break morphs
+        /// See https://savannah.gnu.org/bugs/?21747
+        ///
+        /// So for now we only return if NOT reading a morph shape.
+        /// Pretty ugly... till next bug report.
+        /// 
+        ///
+       if (tag_type != SWF::DEFINEMORPHSHAPE
+                       && tag_type != SWF::DEFINEMORPHSHAPE2
+                       && tag_type != SWF::DEFINEMORPHSHAPE2_)
        return;
     }