[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1640-gf641ed1

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f641ed19f3aeff439463534e738bf5b41a6dea7c (commit)
      from  f8ca64af0783985a55ac98fc7b001ffa6dccbe71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f641ed19f3aeff439463534e738bf5b41a6dea7c


commit f641ed19f3aeff439463534e738bf5b41a6dea7c
Author: Sandro Santilli <address@hidden>
Date:   Fri Jul 5 14:04:09 2013 +0200

    Revert "Initialize NetStream prototype only once"
    
    This reverts commit 404343a510a88352b465ae37026102cd1df705e0.
    
    Statics are not allowed, if we want to do this it'll need
    a flag in VM or something like that.
    
    Ideally we should have tests checking the behavior more closely,
    in particular if it is possible for users to somehow delete those
    properties from the prototype we should test what happens on next
    NetStream initialization.

diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 034e85c..b915df9 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -1590,13 +1590,11 @@ netstream_new(const fn_call& fn)
         if (isNativeType(toObject(fn.arg(0), getVM(fn)), nc)) {
             ns->setNetCon(nc);
             if ( nc->isConnected() ) {
-                static as_object* proto = NULL;
-                // initialize prototype only once
-                if ( ! proto ) {
-                    proto = obj->get_prototype();
-                    if ( proto ) {
-                        attachPrototypeProperties(*proto);
-                    }
+                // TODO: initialize only once ?
+                // Test it (but keep re-entrancy, in case)
+                as_object* proto = obj->get_prototype();
+                if ( proto ) {
+                    attachPrototypeProperties(*proto);
                 }
             }
         }

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/NetStream_as.cpp |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash