[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.h [gnash_0_8_3_branch]

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Benjamin Wolsey <bwy>   08/05/14 05:40:59

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.h 

Log message:
                * server/parser/movie_def_impl.h: log malformed SWF and return
                  when more than one JPEGTABLES tag present. Fixes bug #23201.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.6&r2=1.6573.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.72&r2=1.72.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.6
retrieving revision 1.6573.2.7
diff -u -b -r1.6573.2.6 -r1.6573.2.7
--- ChangeLog   13 May 2008 23:57:37 -0000      1.6573.2.6
+++ ChangeLog   14 May 2008 05:40:56 -0000      1.6573.2.7
@@ -1,3 +1,8 @@
+2008-05-14 Benjamin Wolsey <address@hidden>
+
+       * server/parser/movie_def_impl.h: log malformed SWF and return
+         when more than one JPEGTABLES tag present. Fixes bug #23201.
+
 2008-05-13 Bastiaan Jacques <address@hidden>
 
        * server/asobj/NetStream.{h,cpp,Ffmpeg.cpp}: Mutex-protect 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -u -b -r1.72 -r1.72.2.1
--- server/parser/movie_def_impl.h      21 Apr 2008 11:27:45 -0000      1.72
+++ server/parser/movie_def_impl.h      14 May 2008 05:40:59 -0000      1.72.2.1
@@ -476,7 +476,17 @@
        /// images (JPEG images without the table info).
        void    set_jpeg_loader(std::auto_ptr<jpeg::input> j_in)
        {
-           assert(m_jpeg_in.get() == NULL);
+           if (m_jpeg_in.get())
+           {
+               /// There should be only one JPEGTABLES tag in an SWF (see: 
+               /// http://www.m2osw.com/en/swf_alexref.html#tag_jpegtables)
+               /// Discard any subsequent attempts to set the jpeg loader
+               /// to avoid crashing on very malformed SWFs. (No conclusive 
tests
+               /// for pp behaviour, though one version also crashes out on the
+               /// malformed SWF that triggers this assert in Gnash).
+               log_swferror(_("More than one JPEGTABLES tag found: not 
resetting JPEG loader"));
+               return;
+           }
            m_jpeg_in = j_in;
        }