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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/21 17:13:44

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 
        testsuite/misc-ming.all: eventSoundTest1-Runner.cpp 

Log message:
                * server/vm/ASHandlers.cpp: Store number of arguments
                  into an unsigned integer. Fixes an abort with a malformed
                  SWF.
                * testsuite/misc-ming.all/eventSoundTest1-Runner.cpp:
                  Don't expect failures anymore !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2422&r2=1.2423
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2422
retrieving revision 1.2423
diff -u -b -r1.2422 -r1.2423
--- ChangeLog   21 Feb 2007 14:51:00 -0000      1.2422
+++ ChangeLog   21 Feb 2007 17:13:44 -0000      1.2423
@@ -1,3 +1,11 @@
+2007-02-21 Sandro Santilli <address@hidden>
+
+       * server/vm/ASHandlers.cpp: Store number of arguments
+         into an unsigned integer. Fixes an abort with a malformed
+         SWF.
+       * testsuite/misc-ming.all/eventSoundTest1-Runner.cpp:
+         Don't expect failures anymore !
+
 2007-02-21 Tomas Groth Christensen <address@hidden>
 
        * configure.ac, macros/ffmpeg.m4: Output warning when old ffmpeg-version

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/vm/ASHandlers.cpp    20 Feb 2007 20:05:41 -0000      1.37
+++ server/vm/ASHandlers.cpp    21 Feb 2007 17:13:44 -0000      1.38
@@ -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: ASHandlers.cpp,v 1.37 2007/02/20 20:05:41 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.38 2007/02/21 17:13:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2180,7 +2180,7 @@
                        );
                }
        }
-       int     nargs = (int)env.top(1).to_number();
+       unsigned nargs = unsigned(env.top(1).to_number());
 
        thread.ensureStack(2+nargs); // func name, nargs, args
 
@@ -2273,7 +2273,7 @@
                        classname.c_str());
        );
 
-       int     nargs = (int) env.pop().to_number();
+       unsigned nargs = unsigned(env.pop().to_number());
 
        thread.ensureStack(nargs); // previous 2 entries popped
 
@@ -2666,7 +2666,7 @@
     as_object *obj = obj_value.to_object();
 
     // Get number of arguments
-    int nargs = static_cast<int>(env.top(2).to_number());
+    unsigned nargs = unsigned(env.top(2).to_number());
 
     thread.ensureStack(3+nargs); // actual args
 
@@ -2743,7 +2743,7 @@
 
        as_value method_name = env.pop().to_string();
        as_value obj_val = env.pop();
-       int nargs = (int)env.pop().to_number();
+       unsigned nargs = unsigned(env.pop().to_number());
 
        thread.ensureStack(nargs); // previous 3 entries popped
 
@@ -3010,7 +3010,7 @@
        //cerr << " name:" << name << endl;
 
        // Get number of arguments.
-       int nargs = code.read_int16(i);
+       unsigned nargs = code.read_int16(i);
        i += 2;
 
        //cerr << " nargs:" << nargs << endl;
@@ -3030,7 +3030,7 @@
        func->set_function2_flags(flags);
 
        // Get the register assignments and names of the arguments.
-       for (int n = 0; n < nargs; n++)
+       for (unsigned n = 0; n < nargs; n++)
        {
                uint8 arg_register = code[i];
                ++i;
@@ -3174,13 +3174,13 @@
        //cerr << " name:" << name << endl;
 
        // Get number of arguments.
-       int nargs = code.read_int16(i);
+       unsigned nargs = code.read_int16(i);
        i += 2;
 
        //cerr << " nargs:" << nargs << endl;
 
        // Get the names of the arguments.
-       for (int n = 0; n < nargs; n++)
+       for (unsigned n = 0; n < nargs; n++)
        {
                const char* arg = code.read_string(i);
                //cerr << " arg" << n << " : " << arg << endl;

Index: testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/eventSoundTest1-Runner.cpp  20 Feb 2007 17:55:59 
-0000      1.3
+++ testsuite/misc-ming.all/eventSoundTest1-Runner.cpp  21 Feb 2007 17:13:44 
-0000      1.4
@@ -71,12 +71,12 @@
        int sounds = 1;
        while (frame < 21) {
 //             check_equals(root->get_current_frame(), frame);
-               xcheck_equals(tester.soundsStarted(), sounds);
+               check_equals(tester.soundsStarted(), sounds);
                tester.advance();
                frame++;
 
 //             check_equals(root->get_current_frame(), frame);
-               xcheck_equals(tester.soundsStopped(), sounds);
+               check_equals(tester.soundsStopped(), sounds);
                tester.advance();
                frame++;
                sounds++;