[Gnash-commit] /srv/bzr/gnash/trunk r11770: Simple fix for crash.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11770 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-18 19:53:52 +0100
message:
  Simple fix for crash.
modified:
  libcore/vm/Machine.cpp

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2010-01-13 07:48:30 +0000
+++ b/libcore/vm/Machine.cpp    2010-01-18 18:24:16 +0000
@@ -477,8 +477,12 @@
 
                     ENSURE_OBJECT(_stack.top(0));
                     
-                    as_object* super = _stack.pop().to_object(*_global)->
-                        get_prototype();
+                    // This is all wrong. It needs fixing once supers are
+                    // correctly implemented.
+                    as_object* obj = _stack.pop().to_object(*_global);
+                    if (!obj) throw ASReferenceError();
+
+                    as_object* super = obj->get_prototype();
                     if (!super) throw ASReferenceError();
 
                     const ObjectURI uri(a.getGlobalName(),