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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/07 15:08:13

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

Log message:
                * server/vm/ASHandlers.cpp (ActionSubString):
                  when size argument is too big fix it rather
                  then returning undefined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1879&r2=1.1880
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -b -r1.1879 -r1.1880
--- ChangeLog   7 Dec 2006 14:35:24 -0000       1.1879
+++ ChangeLog   7 Dec 2006 15:08:13 -0000       1.1880
@@ -1,5 +1,8 @@
 2006-12-07 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionSubString):
+         when size argument is too big fix it rather
+         then returning undefined.
        * server/as_environment.cpp (find_target):
          fixed handling of paths ending with a slash
          (example: '../').

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/vm/ASHandlers.cpp    7 Dec 2006 14:35:25 -0000       1.10
+++ server/vm/ASHandlers.cpp    7 Dec 2006 15:08:13 -0000       1.11
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.10 2006/12/07 14:35:25 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.11 2006/12/07 15:08:13 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -957,11 +957,11 @@
 
     if ( base+size > str.length() )
     {
-       log_warning("size+based go beyond input string in ActionSubString, "
-               "returning undefined");
-       env.drop(2);
-       env.top(0).set_undefined();
-       return;
+       IF_VERBOSE_ASCODING_ERRORS (
+       log_warning("base+size goes beyond input string in ActionSubString, "
+               "adjusting size");
+       );
+       size = str.length()-base;
     }