[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: |
Tue, 15 May 2007 14:02:22 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/15 14:02:21
Modified files:
. : ChangeLog
server/swf : tag_loaders.cpp
Log message:
* server/swf/tag_loaders.cpp (inflate_wrapper): fix infinite
loop
on inflate errors.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3230&r2=1.3231
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.100&r2=1.101
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3230
retrieving revision 1.3231
diff -u -b -r1.3230 -r1.3231
--- ChangeLog 15 May 2007 13:54:58 -0000 1.3230
+++ ChangeLog 15 May 2007 14:02:21 -0000 1.3231
@@ -1,5 +1,7 @@
2007-05-15 Sandro Santilli <address@hidden>
+ * server/swf/tag_loaders.cpp (inflate_wrapper): fix infinite loop
+ on inflate errors.
* server/parser/morph2_character_def.cpp (read): don't abort
if number of edges in start and end shapes are not equal.
Just raise an SWF error.
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/swf/tag_loaders.cpp 15 May 2007 10:47:51 -0000 1.100
+++ server/swf/tag_loaders.cpp 15 May 2007 14:02:21 -0000 1.101
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.100 2007/05/15 10:47:51 tgc Exp $ */
+/* $Id: tag_loaders.cpp,v 1.101 2007/05/15 14:02:21 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -339,7 +339,9 @@
int err = inflateInit(&d_stream);
if (err != Z_OK) {
- log_error(_("inflate_wrapper() inflateInit() returned %d"), err);
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror(_("inflate_wrapper() inflateInit() returned %d"), err);
+ );
return;
}
@@ -355,7 +357,10 @@
if (err == Z_STREAM_END) break;
if (err != Z_OK)
{
- log_error(_("inflate_wrapper() inflate() returned %d"), err);
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror(_("inflate_wrapper() inflate() returned %d"), err);
+ );
+ break;
}
}
- [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp,
Sandro Santilli <=