[Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/26 11:30:43

Modified files:
        .              : ChangeLog 
        server/vm      : ActionExec.cpp 

Log message:
                * server/vm/ActionExec.cpp (call operator): 
                  include PC of last jump in maxBranchCount exception.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4421&r2=1.4422
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4421
retrieving revision 1.4422
diff -u -b -r1.4421 -r1.4422
--- ChangeLog   26 Sep 2007 11:09:46 -0000      1.4421
+++ ChangeLog   26 Sep 2007 11:30:42 -0000      1.4422
@@ -1,7 +1,8 @@
 2007-09-26 Sandro Santilli <[EMAIL PROTECTED]>
 
        * server/vm/ActionExec.cpp (call operator): initialize maxBranchCount
-         once at start of function.
+         once at start of function; include PC of last jump in maxBranchCount
+         exception.
 
 2007-09-26 Benjamin Wolsey <[EMAIL PROTECTED]>
 

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/vm/ActionExec.cpp    26 Sep 2007 11:09:47 -0000      1.48
+++ server/vm/ActionExec.cpp    26 Sep 2007 11:30:43 -0000      1.49
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.48 2007/09/26 11:09:47 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.49 2007/09/26 11:30:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -374,8 +374,8 @@
                if ( ++branchCount > maxBranchCount )
                {
                        char buf[256];
-                       snprintf(buf, 255, _("Loop iterations count exceeded 
limit of " SIZET_FMT),
-                               maxBranchCount);
+                       snprintf(buf, 255, _("Loop iterations count exceeded 
limit of " SIZET_FMT ". Last branch was from pc %d to %d."),
+                               maxBranchCount, oldPc, pc);
                        throw ActionLimitException(buf);
                }
                //log_debug("Branch count: %u", branchCount);


_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit