[Gnash-commit] gnash ChangeLog gui/Player.cpp server/vm/ASHand... [gnash_0_8_3_branch]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Sandro Santilli <strk>  08/05/25 18:13:05

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

Log message:
        * gui/Player.cpp: don't forget to initialize hasOverriddenBaseUrl.
          (thanks Bastiaan for finding out)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.40&r2=1.6573.2.41
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.109.2.2&r2=1.109.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.236&r2=1.236.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.40
retrieving revision 1.6573.2.41
diff -u -b -r1.6573.2.40 -r1.6573.2.41
--- ChangeLog   24 May 2008 21:40:31 -0000      1.6573.2.40
+++ ChangeLog   25 May 2008 18:13:02 -0000      1.6573.2.41
@@ -1,3 +1,8 @@
+2008-05-25 Sandro Santilli <address@hidden>
+
+       * gui/Player.cpp: don't forget to initialize hasOverriddenBaseUrl.
+         (thanks Bastiaan for finding out)
+
 2008-05-24 Bastiaan Jacques <address@hidden>
 
        * server/matrix.cpp: Use std::max instead of fmax, to fix build on BSD

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.109.2.2
retrieving revision 1.109.2.3
diff -u -b -r1.109.2.2 -r1.109.2.3
--- gui/Player.cpp      21 May 2008 08:20:31 -0000      1.109.2.2
+++ gui/Player.cpp      25 May 2008 18:13:03 -0000      1.109.2.3
@@ -324,7 +324,7 @@
     // These flags are here so we can construct
     // the correct URL for base url later.
     // If the URL class was not immutable we could do something smarter...
-    bool hasOverriddenBaseUrl;
+    bool hasOverriddenBaseUrl=false;
     std::string overriddenBaseUrl;
 
     // Parse parameters

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.236
retrieving revision 1.236.2.1
diff -u -b -r1.236 -r1.236.2.1
--- server/vm/ASHandlers.cpp    7 May 2008 09:41:14 -0000       1.236
+++ server/vm/ASHandlers.cpp    25 May 2008 18:13:04 -0000      1.236.2.1
@@ -3810,17 +3810,17 @@
        // as we copied that as_value.
        env.top(0).set_null();
 
-       if ( ! obj_val.is_object() )
+       boost::intrusive_ptr<as_object> obj = obj_val.to_object();
+       if ( ! obj )
        {
                IF_VERBOSE_ASCODING_ERRORS(
-               log_aserror(_("Top of stack not an object %s at ActionEnum2 "
-                       " execution"),
-                       obj_val.to_debug_string().c_str());
+               log_aserror(_("Top of stack (%s) doesn't cast to an object "
+                       "at ActionEnum2 execution"),
+                       obj_val);
                );
                return;
        }
 
-       boost::intrusive_ptr<as_object> obj = obj_val.to_object();
 
        enumerateObject(env, *obj);