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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/11/20 05:53:59

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

Log message:
        * server/vm/AsHandlers.cpp: using to_string_versioned() for opcode 
ActionStringEq,
          fix bug21567.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4896&r2=1.4897
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.154&r2=1.155

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4896
retrieving revision 1.4897
diff -u -b -r1.4896 -r1.4897
--- ChangeLog   20 Nov 2007 01:32:33 -0000      1.4896
+++ ChangeLog   20 Nov 2007 05:53:58 -0000      1.4897
@@ -1,9 +1,14 @@
-2007-10-20 Chad Musick <address@hidden>
+2007-11-20 Zou Lunkai <address@hidden>
+
+       * server/vm/AsHandlers.cpp: using to_string_versioned() for opcode 
ActionStringEq,
+         fix bug21567.
+       
+2007-11-20 Chad Musick <address@hidden>
 
        * server/swf_function.h,.cpp: Remove getSuper function
        * server/as_object.cpp: Implement get_super function.
 
-2007-10-20 Chad Musick <address@hidden>
+2007-11-20 Chad Musick <address@hidden>
 
        * server/array.cpp as_value.cpp as_value.h character.cpp
          edit_text_character.cpp sprite_instance.cpp timers.cpp:

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- server/vm/ASHandlers.cpp    20 Nov 2007 00:44:05 -0000      1.154
+++ server/vm/ASHandlers.cpp    20 Nov 2007 05:53:58 -0000      1.155
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.154 2007/11/20 00:44:05 cmusick Exp $ */
+/* $Id: ASHandlers.cpp,v 1.155 2007/11/20 05:53:58 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -853,7 +853,11 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2);
-    env.top(1).set_bool(env.top(1).to_string() == env.top(0).to_string());
+       int version = env.get_version();
+       const std::string& str0 = env.top(0).to_string_versioned(version);
+       const std::string& str1 = env.top(1).to_string_versioned(version);
+
+       env.top(1).set_bool(str0 == str1);
     env.drop(1);
 }