CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/11 19:31:50
Modified files:
. : ChangeLog
server : as_object.cpp as_object.h
Log message:
* server/as_object.{cpp,h} (copyProperties): don't copy
__proto__.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4274&r2=1.4275
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.67&r2=1.68
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4274
retrieving revision 1.4275
diff -u -b -r1.4274 -r1.4275
--- ChangeLog 11 Sep 2007 17:41:11 -0000 1.4274
+++ ChangeLog 11 Sep 2007 19:31:49 -0000 1.4275
@@ -1,5 +1,9 @@
2007-09-11 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/as_object.{cpp,h} (copyProperties): don't copy __proto__.
+
+2007-09-11 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/actionscript.all/AsBroadcaster.as: a couple more tests
for return from broadcastMessage.
* server/asobj/AsBroadcaster.cpp: fix return from broadcastMessage.
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/as_object.cpp 11 Sep 2007 17:01:23 -0000 1.60
+++ server/as_object.cpp 11 Sep 2007 19:31:50 -0000 1.61
@@ -64,7 +64,8 @@
///
void operator() (const std::string& name, const as_value& val)
{
- //log_msg(_("Setting member '%s' to value '%s'"), name.c_str(),
val.to_string());
+ if ( name == "__proto__" ) return;
+ //log_msg(_("Setting member '%s' to value '%s'"), name.c_str(),
val.to_debug_string().c_str());
_tgt.set_member(name, val);
}
};
Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/as_object.h 11 Sep 2007 17:01:23 -0000 1.67
+++ server/as_object.h 11 Sep 2007 19:31:50 -0000 1.68
@@ -410,7 +410,11 @@
/// Get the properties of this objects
PropertyList &get_properties() { return _members; };
#endif
+
/// Copy properties from the given object
+ //
+ /// NOTE: the __proto__ member will NOT be copied.
+ ///
void copyProperties(const as_object& o);
/// Drop all properties from this object
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
