[Gnash-commit] gnash ChangeLog server/as_object.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/15 11:48:18

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp 

Log message:
        (tostring_method): don't check size of string returned by 
get_string_value,
        just return it as is.  Fixes bug #22024.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5401&r2=1.5402
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.90&r2=1.91

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5401
retrieving revision 1.5402
diff -u -b -r1.5401 -r1.5402
--- ChangeLog   15 Jan 2008 11:15:14 -0000      1.5401
+++ ChangeLog   15 Jan 2008 11:48:17 -0000      1.5402
@@ -1,5 +1,8 @@
 2008-01-15 Sandro Santilli <address@hidden>
 
+       * server/as_object.cpp (tostring_method): don't check size of string
+         returned by get_string_value, just return it as is.
+         Fixes bug #22024.
        * testsuite/actionscript.all/String.as: test string concatenation
          between a primitive string and a string object.
 

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/as_object.cpp        5 Jan 2008 12:28:22 -0000       1.90
+++ server/as_object.cpp        15 Jan 2008 11:48:18 -0000      1.91
@@ -829,14 +829,7 @@
        boost::intrusive_ptr<as_object> obj = fn.this_ptr;
 
        std::string text_val = obj->get_text_value();
-       if ( ! text_val.empty() ) // TODO: check if still possible
-       {
                return as_value(text_val);
-       }
-       else
-       {
-               return as_value("[object Object]");
-       }
 }
 
 as_value