[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8488c9642052a1abe0f5fe9ef08e7658552bf81e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 15:11:38 2002 +0000

    	- fixed a null-dereference I ran into while trying to reproduce bug 3107351
    
            * kjs/function.h: Change ActivationImp constructor to take context parameter.
            * kjs/function.cpp: (ActivationImp::ActivationImp): Take context parameter,
    	not execution state parameter.
    
            * kjs/internal.cpp: (ContextImp::ContextImp): Initialize activation object
    	from context, not execution state, because the new context is not yet in the
    	execution state.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7fe7305..1d94038 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed a null-dereference I ran into while trying to reproduce bug 3107351
+
+        * kjs/function.h: Change ActivationImp constructor to take context parameter.
+        * kjs/function.cpp: (ActivationImp::ActivationImp): Take context parameter,
+	not execution state parameter.
+
+        * kjs/internal.cpp: (ContextImp::ContextImp): Initialize activation object
+	from context, not execution state, because the new context is not yet in the
+	execution state.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- added a feature for Richard to use in his back/forward cache
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 7fe7305..1d94038 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed a null-dereference I ran into while trying to reproduce bug 3107351
+
+        * kjs/function.h: Change ActivationImp constructor to take context parameter.
+        * kjs/function.cpp: (ActivationImp::ActivationImp): Take context parameter,
+	not execution state parameter.
+
+        * kjs/internal.cpp: (ContextImp::ContextImp): Initialize activation object
+	from context, not execution state, because the new context is not yet in the
+	execution state.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- added a feature for Richard to use in his back/forward cache
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 7fe7305..1d94038 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-11-21  Darin Adler  <darin at apple.com>
+
+	- fixed a null-dereference I ran into while trying to reproduce bug 3107351
+
+        * kjs/function.h: Change ActivationImp constructor to take context parameter.
+        * kjs/function.cpp: (ActivationImp::ActivationImp): Take context parameter,
+	not execution state parameter.
+
+        * kjs/internal.cpp: (ContextImp::ContextImp): Initialize activation object
+	from context, not execution state, because the new context is not yet in the
+	execution state.
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
 	- added a feature for Richard to use in his back/forward cache
diff --git a/JavaScriptCore/kjs/function.cpp b/JavaScriptCore/kjs/function.cpp
index 2dda5c3..2b3345c 100644
--- a/JavaScriptCore/kjs/function.cpp
+++ b/JavaScriptCore/kjs/function.cpp
@@ -331,8 +331,8 @@ ArgumentsImp::ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args)
 const ClassInfo ActivationImp::info = {"Activation", 0, 0, 0};
 
 // ECMA 10.1.6
-ActivationImp::ActivationImp(ExecState *exec)
-    : _context(exec->context().imp()), _argumentsObject(0)
+ActivationImp::ActivationImp(ContextImp *context)
+    : _context(context), _argumentsObject(0)
 {
   // FIXME: Do we need to support enumerating the arguments property?
 }
diff --git a/JavaScriptCore/kjs/function.h b/JavaScriptCore/kjs/function.h
index 499866e..fc1f5cc 100644
--- a/JavaScriptCore/kjs/function.h
+++ b/JavaScriptCore/kjs/function.h
@@ -100,7 +100,7 @@ namespace KJS {
 
   class ActivationImp : public ObjectImp {
   public:
-    ActivationImp(ExecState *exec);
+    ActivationImp(ContextImp *);
 
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 93ace9f..e7e7c0a 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -365,7 +365,7 @@ ContextImp::ContextImp(Object &glob, ExecState *exec, Object &thisV, CodeType ty
 
   // create and initialize activation object (ECMA 10.1.6)
   if (type == FunctionCode || type == AnonymousCode ) {
-    activation = Object(new ActivationImp(exec));
+    activation = Object(new ActivationImp(this));
     variable = activation;
   } else {
     activation = Object();

-- 
WebKit Debian packaging