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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/28 18:44:39

Modified files:
        .              : ChangeLog 
        server         : text.cpp 

Log message:
        robustness improvements.  Fixes bug #22149.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5510&r2=1.5511
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5510
retrieving revision 1.5511
diff -u -b -r1.5510 -r1.5511
--- ChangeLog   28 Jan 2008 17:20:01 -0000      1.5510
+++ ChangeLog   28 Jan 2008 18:44:38 -0000      1.5511
@@ -1,3 +1,8 @@
+2008-01-28 Sandro Santilli <address@hidden>
+
+       * server/text.cpp (text_glyph_record::read): robustness improvements.
+         Fixes bug #22149.
+
 2008-01-28 Bastiaan Jacques <address@hidden>
 
        * server/parser/video_stream_def.cpp: Make sure ffmpeg doesn't read

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/text.cpp     21 Jan 2008 20:55:52 -0000      1.42
+++ server/text.cpp     28 Jan 2008 18:44:38 -0000      1.43
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.42 2008/01/21 20:55:52 rsavoye Exp $ */
+/* $Id: text.cpp,v 1.43 2008/01/28 18:44:38 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -70,7 +70,9 @@
        void text_glyph_record::read(stream* in, int glyph_count,
                        int glyph_bits, int advance_bits)
        {
+               // TODO: shouldn't we take unsigned for *_bits ?
                m_glyphs.resize(glyph_count);
+               in->ensureBits(glyph_count * (glyph_bits+advance_bits));
                for (int i = 0; i < glyph_count; i++)
                {
                        m_glyphs[i].m_glyph_index = in->read_uint(glyph_bits);