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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Benjamin Wolsey <bwy>   08/05/26 07:56:59

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

Log message:
                 * server/vm/ASHandlers.cpp: commit the proper fix for bug 
#23331
                   (segfault in enumerateProperties).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.41&r2=1.6573.2.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.236.2.1&r2=1.236.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.41
retrieving revision 1.6573.2.42
diff -u -b -r1.6573.2.41 -r1.6573.2.42
--- ChangeLog   25 May 2008 18:13:02 -0000      1.6573.2.41
+++ ChangeLog   26 May 2008 07:56:57 -0000      1.6573.2.42
@@ -1,3 +1,8 @@
+2008-05-26 Benjamin Wolsey <address@hidden>
+
+        * server/vm/ASHandlers.cpp: commit the proper fix for bug #23331
+          (segfault in enumerateProperties).
+
 2008-05-25 Sandro Santilli <address@hidden>
 
        * gui/Player.cpp: don't forget to initialize hasOverriddenBaseUrl.

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