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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/23 19:29:35

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp 

Log message:
                * server/as_object.cpp ({get,set}_member_default):
                  handle ActionExceptions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2161&r2=1.2162
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2161
retrieving revision 1.2162
diff -u -b -r1.2161 -r1.2162
--- ChangeLog   23 Jan 2007 18:02:45 -0000      1.2161
+++ ChangeLog   23 Jan 2007 19:29:35 -0000      1.2162
@@ -1,5 +1,7 @@
 2007-01-23 Sandro Santilli <address@hidden>
 
+       * server/as_object.cpp ({get,set}_member_default):
+         handle ActionExceptions.
        * testsuite/generic-testrunner.sh: be more verbose about
          exit failures.
 

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/as_object.cpp        23 Jan 2007 12:12:29 -0000      1.28
+++ server/as_object.cpp        23 Jan 2007 19:29:35 -0000      1.29
@@ -29,6 +29,7 @@
 #include "as_environment.h" // for enumerateProperties
 #include "Property.h" // for findGetterSetter
 #include "VM.h"
+#include "GnashException.h"
 
 #include <set>
 #include <string>
@@ -114,8 +115,16 @@
        Property* prop = findProperty(name);
        if ( ! prop ) return false;
 
+       try 
+       {
        *val = prop->getValue(*this);
        return true;
+       }
+       catch (ActionException& exc)
+       {
+               log_warning("%s", exc.what());
+               return false;
+       }
        
 }
 
@@ -191,12 +200,19 @@
        Property* prop = findGetterSetter(key);
        if ( prop )
        {
+               try 
+               {
                //log_msg("Found a getter/setter property for key %s", 
key.c_str());
                // TODO: have setValue check for read-only property 
                //       and warn if failed
                prop->setValue(*this, val);
                return;
        }
+               catch (ActionException& exc)
+               {
+                       log_warning("%s", exc.what());
+               }
+       }
 
        //log_msg("Found NO getter/setter property for key %s", key.c_str());