Changeset 10178 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 14, 2005, 9:04:19 AM (20 years ago)

Author:

darin

Message:

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4344 REGRESSION: JavaScript crash when going back from viewing a thread (NULL protoype)

• kjs/error_object.cpp: (NativeErrorImp::NativeErrorImp): Set proto in a more straightforward way. The old code set the proto to 0 and then to the correct value. This showed up as a "false positive" when searching for places that set prototype to NULL/0 so I fixed it.

• kjs/function_object.cpp: (FunctionPrototypeImp::FunctionPrototypeImp): Change to not pass an explicit "0" to the base class (InternalFunctionImp) constructor.

• kjs/internal.h: Added a default constructor for InternalFunctionImp.
• kjs/internal.cpp: (KJS::InternalFunctionImp::InternalFunctionImp): Added the default constructor (empty body, just calls base class's default constructor).

• kjs/object.h: (KJS::ObjectImp::ObjectImp): Add an assertion to catch NULL prototypes earlier in Development builds. (KJS::ObjectImp::setPrototype): Ditto.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• kjs/error_object.cpp (modified) (1 diff)
• kjs/function_object.cpp (modified) (1 diff)
• kjs/internal.cpp (modified) (1 diff)
• kjs/internal.h (modified) (1 diff)
• kjs/object.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-08-14  Darin Adler  <[email protected]>
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4344
+          REGRESSION: JavaScript crash when going back from viewing a thread (NULL protoype)
+
+        * kjs/error_object.cpp: (NativeErrorImp::NativeErrorImp): Set proto in a more
+        straightforward way. The old code set the proto to 0 and then to the correct value.
+        This showed up as a "false positive" when searching for places that set prototype
+        to NULL/0 so I fixed it.
+
+        * kjs/function_object.cpp: (FunctionPrototypeImp::FunctionPrototypeImp): Change to
+        not pass an explicit "0" to the base class (InternalFunctionImp) constructor.
+
+        * kjs/internal.h: Added a default constructor for InternalFunctionImp.
+        * kjs/internal.cpp: (KJS::InternalFunctionImp::InternalFunctionImp): Added the
+        default constructor (empty body, just calls base class's default constructor).
+
+        * kjs/object.h:
+        (KJS::ObjectImp::ObjectImp): Add an assertion to catch NULL prototypes earlier
+        in Development builds.
+        (KJS::ObjectImp::setPrototype): Ditto.
+
 2005-08-12  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/Makefile.am

@@ -2 +2 @@
         defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
         defaults write com.apple.Xcode PBXIntermediatesDirectory "$(SYMROOTS)"
+        ../WebKitTools/Scripts/set-webkit-configuration --$(BUILDSTYLE)
         xcodebuild -target All -configuration $(BUILDSTYLE)
 clean-am:
         defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
         defaults write com.apple.Xcode PBXIntermediatesDirectory "$(SYMROOTS)"
-        xcodebuild -target All clean -configuration ${BUILDSTYLE}
+        ../WebKitTools/Scripts/set-webkit-configuration --$(BUILDSTYLE)
+        xcodebuild -target All clean -configuration $(BUILDSTYLE)

trunk/JavaScriptCore/kjs/error_object.cpp

@@ -146 +146 @@
 NativeErrorImp::NativeErrorImp(ExecState *exec, FunctionPrototypeImp *funcProto,
                                ObjectImp *prot)
-  : InternalFunctionImp(funcProto), proto(0)
+  : InternalFunctionImp(funcProto), proto(prot)
 {
-  proto = static_cast<ObjectImp*>(prot);
-
   putDirect(lengthPropertyName, jsOne(), DontDelete|ReadOnly|DontEnum); // ECMA 15.11.7.5
   putDirect(prototypePropertyName, proto, DontDelete|ReadOnly|DontEnum);

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -39 +39 @@
 
 FunctionPrototypeImp::FunctionPrototypeImp(ExecState *exec)
-  : InternalFunctionImp(0)
 {
   putDirect(lengthPropertyName,   jsZero(),                                                       DontDelete|ReadOnly|DontEnum);

trunk/JavaScriptCore/kjs/internal.cpp

@@ -858 +858 @@
 const ClassInfo InternalFunctionImp::info = {"Function", 0, 0, 0};
 
+InternalFunctionImp::InternalFunctionImp()
+{
+}
+
 InternalFunctionImp::InternalFunctionImp(FunctionPrototypeImp *funcProto)
   : ObjectImp(funcProto)

trunk/JavaScriptCore/kjs/internal.h

@@ -393 +393 @@
   class InternalFunctionImp : public ObjectImp {
   public:
+    InternalFunctionImp();
     InternalFunctionImp(FunctionPrototypeImp *funcProto);
     bool implementsHasInstance() const;

trunk/JavaScriptCore/kjs/object.h

@@ -623 +623 @@
     : _proto(proto), _internalValue(0)
 {
+    assert(proto);
 }
 
@@ -647 +648 @@
 inline void ObjectImp::setPrototype(ValueImp *proto)
 {
+    assert(proto);
     _proto = proto;
 }