CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/02/15 09:17:35
Modified files:
. : ChangeLog
server/swf : tag_loaders.cpp
Log message:
* server/swf/tag_loaders.cpp: (define_bits_lossless_2_loader)
log
malformed SWF error and return if height or width is 0
(prevents
assertion failure in image.cpp (rgba).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5659&r2=1.5660
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.184&r2=1.185
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5659
retrieving revision 1.5660
diff -u -b -r1.5659 -r1.5660
--- ChangeLog 15 Feb 2008 08:59:55 -0000 1.5659
+++ ChangeLog 15 Feb 2008 09:17:33 -0000 1.5660
@@ -1,3 +1,9 @@
+2008-02-15 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * server/swf/tag_loaders.cpp: (define_bits_lossless_2_loader) log
+ malformed SWF error and return if height or width is 0 (prevents
+ assertion failure in image.cpp (rgba).
+
2008-02-15 Sandro Santilli <[EMAIL PROTECTED]>
* server/parser/sprite_definition.cpp: handle END tags before
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- server/swf/tag_loaders.cpp 12 Feb 2008 18:52:32 -0000 1.184
+++ server/swf/tag_loaders.cpp 15 Feb 2008 09:17:34 -0000 1.185
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.184 2008/02/12 18:52:32 bwy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.185 2008/02/15 09:17:34 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -530,6 +530,14 @@
tag, character_id, bitmap_format, width, height);
);
+ if (width == 0 || height == 0)
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror(_("Bitmap character %d has a height or width of 0."),
character_id);
+ );
+ return;
+ }
+
// TODO: there's a lot of duplicated code in this function, we should
clean it up
//bitmap_info* bi = NULL;
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
