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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 4f070f23e8d1f10dbc73b3236f6f3a0759dda95b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 31 06:48:51 2002 +0000

    	Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
    	apple.com)
    
    	* kjs/object.cpp: (ObjectImp::~ObjectImp): Don't call setGCAlloc
    	on object internals pointed to, because they may have already been
    	collected by the time this object is collected, and in that case
    	we would corrupt the malloc arena.
    
    	* Makefile.am: Make the stamp file depend on all the sources and
    	headers so the framework gets rebuilt properly.
    
    	* JavaScriptCore.pbproj/project.pbxproj: Some random numbers moved
    	around. No idea what I really changed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ff8d29f..1dcef3f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2002-03-30  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
+	apple.com)
+
+	* kjs/object.cpp: (ObjectImp::~ObjectImp): Don't call setGCAlloc
+	on object internals pointed to, because they may have already been
+	collected by the time this object is collected, and in that case
+	we would corrupt the malloc arena.
+
+	* Makefile.am: Make the stamp file depend on all the sources and
+	headers so the framework gets rebuilt properly.
+
+	* JavaScriptCore.pbproj/project.pbxproj: Some random numbers moved
+	around. No idea what I really changed.
+
 2002-03-30  Darin Adler  <darin at apple.com>
 
 	* kjs/grammar.y: Took out Id tag so we won't constantly need to
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index ff8d29f..1dcef3f 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-03-30  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
+	apple.com)
+
+	* kjs/object.cpp: (ObjectImp::~ObjectImp): Don't call setGCAlloc
+	on object internals pointed to, because they may have already been
+	collected by the time this object is collected, and in that case
+	we would corrupt the malloc arena.
+
+	* Makefile.am: Make the stamp file depend on all the sources and
+	headers so the framework gets rebuilt properly.
+
+	* JavaScriptCore.pbproj/project.pbxproj: Some random numbers moved
+	around. No idea what I really changed.
+
 2002-03-30  Darin Adler  <darin at apple.com>
 
 	* kjs/grammar.y: Took out Id tag so we won't constantly need to
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index ff8d29f..1dcef3f 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-03-30  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
+	apple.com)
+
+	* kjs/object.cpp: (ObjectImp::~ObjectImp): Don't call setGCAlloc
+	on object internals pointed to, because they may have already been
+	collected by the time this object is collected, and in that case
+	we would corrupt the malloc arena.
+
+	* Makefile.am: Make the stamp file depend on all the sources and
+	headers so the framework gets rebuilt properly.
+
+	* JavaScriptCore.pbproj/project.pbxproj: Some random numbers moved
+	around. No idea what I really changed.
+
 2002-03-30  Darin Adler  <darin at apple.com>
 
 	* kjs/grammar.y: Took out Id tag so we won't constantly need to
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index b8edf44..8941be7 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -81,9 +81,6 @@
 				089C1665FE841158C02AAC07,
 				0867D69AFE84028FC02AAC07,
 				034768DFFF38A50411DB9C8B,
-				F692A8C802555BA201FF60F7,
-				F692A8C902555BA201FF60F7,
-				F692A8CA02555BA201FF60F7,
 			);
 			isa = PBXGroup;
 			name = JavaScriptCore;
@@ -321,6 +318,9 @@
 				F692A85D0255597D01FF60F7,
 				F692A85E0255597D01FF60F7,
 				F692A85F0255597D01FF60F7,
+				F692A8C802555BA201FF60F7,
+				F692A8C902555BA201FF60F7,
+				F692A8CA02555BA201FF60F7,
 				F692A8610255597D01FF60F7,
 				F692A8620255597D01FF60F7,
 				F692A8630255597D01FF60F7,
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index b8adbf8..2c5d4fd 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -12,7 +12,7 @@ kjs_testkjs_LDFLAGS = -F$(SYMROOTS) -framework JavaScriptCore
 BUILT_SOURCES = JavaScriptCore-stamp
 CLEANFILES = $(BUILT_SOURCES)
 
-JavaScriptCore-stamp:
+JavaScriptCore-stamp: kjs/*.cpp kjs/*.h
 	pbxbuild -buildstyle $(BUILDSTYLE)
 	touch JavaScriptCore-stamp
 
diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index 28c43d3..f98c3e9 100644
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -201,12 +201,15 @@ ObjectImp::ObjectImp()
 ObjectImp::~ObjectImp()
 {
   //fprintf(stderr,"ObjectImp::~ObjectImp %p\n",(void*)this);
+#if 0 // Those could be already deleted. The collector ensures no order
+      // ### Check if this leads to memory leaks....
   if (_proto)
     _proto->setGcAllowed();
   if (_internalValue)
     _internalValue->setGcAllowed();
   if (_scope)
     _scope->setGcAllowed();
+#endif
   delete _prop;
 }
 

-- 
WebKit Debian packaging