Changeset 34177 in webkit for trunk/JavaScriptCore

Timestamp:

May 28, 2008, 11:13:37 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-05-28 Anders Carlsson <​[email protected]>

Reviewed by Oliver.

<rdar://problem/5968071> "const f" crashes in JavaScriptCore

Make sure to null check the initializer.

• kjs/nodes.cpp: (KJS::ConstDeclNode::emitCodeSingle):

LayoutTests:

2008-05-28 Anders Carlsson <​[email protected]>

Reviewed by Oliver.

<rdar://problem/5968071> "const f" crashes in JavaScriptCore

• fast/js/const-without-initializer-expected.txt: Added.
• fast/js/const-without-initializer.html: Added.
• fast/js/resources/const-without-initializer.js: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-28  Anders Carlsson  <[email protected]>
+
+        Reviewed by Oliver.
+
+        <rdar://problem/5968071> "const f" crashes in JavaScriptCore
+        
+        Make sure to null check the initializer.
+        
+        * kjs/nodes.cpp:
+        (KJS::ConstDeclNode::emitCodeSingle):
+
 2008-05-28  Adam Roben  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -4691 +4691 @@
 RegisterID* ConstDeclNode::emitCodeSingle(CodeGenerator& generator)
 {
-    if (RegisterID* local = generator.registerForLocalConstInit(m_ident))
+    if (RegisterID* local = generator.registerForLocalConstInit(m_ident)) {
+        if (!m_init)
+            return local;
+
         return generator.emitNode(local, m_init.get());
-
+    }
+    
     // FIXME: While this code should only be hit in eval code, it will potentially
     // assign to the wrong base if m_ident exists in an intervening dynamic scope.