[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp |
Date: |
Sun, 01 Apr 2007 10:23:47 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/04/01 10:23:47
Modified files:
. : ChangeLog
server/swf : tag_loaders.cpp
Log message:
* server/swf/tag_loaders.cpp (define_bits_jpeg_loader,
define_bits_jpeg2_loader, define_bits_lossless_2_loader):
Handle duplicate character id. "Fixes" bug #19474.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2739&r2=1.2740
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.82&r2=1.83
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2739
retrieving revision 1.2740
diff -u -b -r1.2739 -r1.2740
--- ChangeLog 31 Mar 2007 21:16:49 -0000 1.2739
+++ ChangeLog 1 Apr 2007 10:23:46 -0000 1.2740
@@ -1,3 +1,9 @@
+2007-04-01 Sandro Santilli <address@hidden>
+
+ * server/swf/tag_loaders.cpp (define_bits_jpeg_loader,
+ define_bits_jpeg2_loader, define_bits_lossless_2_loader):
+ Handle duplicate character id. "Fixes" bug #19474.
+
2007-03-31 Sandro Santilli <address@hidden>
* gui/Makefile.am, testsuite/server/Makefile.am,
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/swf/tag_loaders.cpp 29 Mar 2007 07:36:17 -0000 1.82
+++ server/swf/tag_loaders.cpp 1 Apr 2007 10:23:47 -0000 1.83
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: tag_loaders.cpp,v 1.82 2007/03/29 07:36:17 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.83 2007/04/01 10:23:47 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,8 +251,17 @@
bitmap_character_def* ch = new bitmap_character_def(im);
+ if ( m->get_bitmap_character_def(character_id) )
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror("DEFINEBITS: Duplicate id (%d) for bitmap
character - discarding it", character_id);
+ );
+ }
+ else
+ {
m->add_bitmap_character_def(character_id, ch);
}
+ }
}
@@ -288,10 +297,18 @@
//assert(bi->get_ref_count() == 0);
+ if ( m->get_bitmap_character_def(character_id) )
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror("DEFINEBITSJPEG2: Duplicate id (%d) for
bitmap character - discarding it", character_id);
+ );
+ }
+ else
+ {
bitmap_character_def* ch = new bitmap_character_def(im);
-
m->add_bitmap_character_def(character_id, ch);
}
+ }
}
@@ -535,13 +552,20 @@
delete [] buffer;
}
+ if ( m->get_bitmap_character_def(character_id) )
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror("DEFINEBITSLOSSLESS: Duplicate id
(%d) for bitmap character - discarding it", character_id);
+ );
+ }
+ else
+ {
bitmap_character_def* ch = new bitmap_character_def(image);
- //bi = render::create_bitmap_info_rgb(image);
- //delete image;
// add image to movie, under character id.
m->add_bitmap_character_def(character_id, ch);
}
+ }
else
{
// RGBA image data.
- [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp,
Sandro Santilli <=