Changeset 11802 in webkit for trunk/JavaScriptCore/kjs/nodes2string.cpp

Timestamp:

Dec 29, 2005, 3:16:11 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by mjs.

• Fixed <rdar://problem/4364705> run-javascriptcore-tests crashes in KJS::BlockNode::deref AKA ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6233 Reproducible stack-overflow crash in ~RefPtr<T> due to RefPtr<T> use in linked lists

This patch does four things:
(1) Standardizes all our linked list nodes to use "next" as their next
pointers.
(2) Creates the ListRefPtr<T> class, a subclass of RefPtr<T> specialized
to iteratively deref "next" pointers.
(3) Standardizes our linked list nodes to use ListRefPtr<T> and
implement the releaseNext() function used by ~ListRefPtr<T>().
(4) Adds to RefPtr<T> the release() method used by releaseNext().

• Modified existing mozilla test to ensure it would make deployment builds crash as well.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/nodes.cpp: (ElementNode::evaluate): (PropertyListNode::evaluate): (ArgumentListNode::evaluateList): (StatListNode::StatListNode): (StatListNode::execute): (StatListNode::processVarDecls): (VarDeclListNode::evaluate): (VarDeclListNode::processVarDecls): (VarStatementNode::execute): (VarStatementNode::processVarDecls): (BlockNode::BlockNode): (CaseClauseNode::evalStatements): (CaseClauseNode::processVarDecls): (ClauseListNode::processVarDecls): (CaseBlockNode::CaseBlockNode): (CaseBlockNode::evalBlock): (SourceElementsNode::SourceElementsNode): (SourceElementsNode::execute): (SourceElementsNode::processFuncDecl): (SourceElementsNode::processVarDecls):
• kjs/nodes.h: (KJS::ElementNode::ElementNode): (KJS::ElementNode::releaseNext): (KJS::ArrayNode::ArrayNode): (KJS::PropertyListNode::PropertyListNode): (KJS::PropertyListNode::releaseNext): (KJS::ObjectLiteralNode::ObjectLiteralNode): (KJS::ArgumentListNode::ArgumentListNode): (KJS::ArgumentListNode::releaseNext): (KJS::ArgumentsNode::ArgumentsNode): (KJS::StatListNode::releaseNext): (KJS::VarDeclListNode::VarDeclListNode): (KJS::VarDeclListNode::releaseNext): (KJS::VarStatementNode::VarStatementNode): (KJS::ForNode::ForNode): (KJS::CaseClauseNode::CaseClauseNode): (KJS::ClauseListNode::ClauseListNode): (KJS::ClauseListNode::getClause): (KJS::ClauseListNode::getNext): (KJS::ClauseListNode::releaseNext): (KJS::ParameterNode::ParameterNode): (KJS::ParameterNode::releaseNext): (KJS::SourceElementsNode::releaseNext):
• kjs/nodes2string.cpp: (ElementNode::streamTo): (PropertyListNode::streamTo): (ArgumentListNode::streamTo): (StatListNode::streamTo): (VarDeclListNode::streamTo): (VarStatementNode::streamTo): (CaseClauseNode::streamTo): (ClauseListNode::streamTo): (CaseBlockNode::streamTo): (SourceElementsNode::streamTo):
• kxmlcore/ListRefPtr.h: Added. (KXMLCore::ListRefPtr::ListRefPtr): (KXMLCore::ListRefPtr::~ListRefPtr): (KXMLCore::ListRefPtr::operator=):
• kxmlcore/RefPtr.h: (KXMLCore::RefPtr::release):

File:

• trunk/JavaScriptCore/kjs/nodes2string.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -133 +133 @@
 void ElementNode::streamTo(SourceStream &s) const
 {
-  for (const ElementNode *n = this; n; n = n->list.get()) {
+  for (const ElementNode *n = this; n; n = n->next.get()) {
     for (int i = 0; i < n->elision; i++)
       s << ",";
@@ -160 +160 @@
   s << node;
   
-  for (const PropertyListNode *n = list.get(); n; n = n->list.get())
+  for (const PropertyListNode *n = next.get(); n; n = n->next.get())
     s << ", " << n->node;
 }
@@ -205 +205 @@
 {
   s << expr;
-  for (ArgumentListNode *n = list.get(); n; n = n->list.get())
+  for (ArgumentListNode *n = next.get(); n; n = n->next.get())
     s << ", " << n->expr;
 }
@@ -526 +526 @@
 void StatListNode::streamTo(SourceStream &s) const
 {
-  for (const StatListNode *n = this; n; n = n->list.get())
+  for (const StatListNode *n = this; n; n = n->next.get())
     s << n->statement;
 }
@@ -543 +543 @@
 {
   s << var;
-  for (VarDeclListNode *n = list.get(); n; n = n->list.get())
+  for (VarDeclListNode *n = next.get(); n; n = n->next.get())
     s << ", " << n->var;
 }
@@ -549 +549 @@
 void VarStatementNode::streamTo(SourceStream &s) const
 {
-  s << SourceStream::Endl << "var " << list << ";";
+  s << SourceStream::Endl << "var " << next << ";";
 }
 
@@ -651 +651 @@
     s << "default";
   s << ":" << SourceStream::Indent;
-  if (list)
-    s << list;
+  if (next)
+    s << next;
   s << SourceStream::Unindent;
 }
@@ -658 +658 @@
 void ClauseListNode::streamTo(SourceStream &s) const
 {
-  for (const ClauseListNode *n = this; n; n = n->next())
-    s << n->clause();
+  for (const ClauseListNode *n = this; n; n = n->getNext())
+    s << n->getClause();
 }
 
 void CaseBlockNode::streamTo(SourceStream &s) const
 {
-  for (const ClauseListNode *n = list1.get(); n; n = n->next())
-    s << n->clause();
+  for (const ClauseListNode *n = list1.get(); n; n = n->getNext())
+    s << n->getClause();
   if (def)
     s << def;
-  for (const ClauseListNode *n = list2.get(); n; n = n->next())
-    s << n->clause();
+  for (const ClauseListNode *n = list2.get(); n; n = n->getNext())
+    s << n->getClause();
 }
 
@@ -718 +718 @@
 void SourceElementsNode::streamTo(SourceStream &s) const
 {
-  for (const SourceElementsNode *n = this; n; n = n->elements.get())
-    s << n->element;
-}
+  for (const SourceElementsNode *n = this; n; n = n->next.get())
+    s << n->node;
+}