[Gnash-commit] gnash ChangeLog server/font.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/09 14:19:46

Modified files:
        .              : ChangeLog 
        server         : font.cpp 

Log message:
                * server/font.cpp (readDefineFont2): allow seek-back in stream
                  while reading shape glyphs (fixes bug #16311).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1571&r2=1.1572
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1571
retrieving revision 1.1572
diff -u -b -r1.1571 -r1.1572
--- ChangeLog   9 Nov 2006 13:04:32 -0000       1.1571
+++ ChangeLog   9 Nov 2006 14:19:46 -0000       1.1572
@@ -1,3 +1,8 @@
+2006-11-09 Sandro Santilli <address@hidden>
+
+       * server/font.cpp (readDefineFont2): allow seek-back in stream
+         while reading shape glyphs (fixes bug #16311).
+
 2006-11-09 Bastiaan Jacques <address@hidden>
 
        * libbase/curl_adapter.cpp: Allow libcurl to follow HTTP redirects.

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/font.cpp     26 Sep 2006 13:10:55 -0000      1.22
+++ server/font.cpp     9 Nov 2006 14:19:46 -0000       1.23
@@ -239,8 +239,11 @@
                        {
                                // Seek to the start of the shape data.
                                int     new_pos = table_base + offsets[i];
-                               // if we're seeking backwards, then that looks 
like a bug.
-                               assert(new_pos >= in->get_position());
+
+                               // It seems completely possible to
+                               // have such seeks-back, see bug #16311
+                               //assert(new_pos >= in->get_position());
+
                                in->set_position(new_pos);
 
                                // Create & read the shape.