[webkit-changes] cvs commit: WebCore/khtml/misc
main_thread_malloc.cpp
Adele
adele at opensource.apple.com
Fri Sep 2 15:27:41 PDT 2005
adele 05/09/02 15:27:41
Modified: . Tag: Safari-2-0-branch ChangeLog
kjs Tag: Safari-2-0-branch fast_malloc.cpp
. Tag: Safari-2-0-branch ChangeLog
khtml/misc Tag: Safari-2-0-branch main_thread_malloc.cpp
Log:
JavaScriptCore:
Merged fix from TOT to Safari-2-0-branch
2005-09-02 Beth Dakin <bdakin at apple.com>
Fix for <rdar://problem/4235531> Regression: Safari crash in KWQStringData::makeUnicode
The other half of the fix is in WebCore.
Fix written by Maciej and Darin.
Reviewed by me/Maciej
As Maciej said in Radar: These problems was caused by a conflict between some of our custom
allocators, causing them to return null. Symptom is typically a null pointer dereference in
a place where it might be expected an allocation has just occurred.
* kjs/fast_malloc.cpp: Added #define for MORECORE_CONTIGUOUS, MORECORE_CANNOT_TRIM,
and MALLOC_FAILURE_ACTION.
WebCore:
Merged fix from TOT to Safari-2-0-branch
2005-09-02 Beth Dakin <bdakin at apple.com>
Fix for <rdar://problem/4235531> Denver Regression: Safari crash in KWQStringData::makeUnicode
The other half of the fix is in JavaScriptCore
Fix written by Maciej and Darin.
Reviewed by me/Maciej
As Maciej said in Radar: These problems was caused by a conflict between some of our custom
allocators, causing them to return null. Symptom is typically a null pointer dereference in
a place where it might be expected an allocation has just occurred.
* khtml/misc/main_thread_malloc.cpp: Added #define for MORECORE_CONTIGUOUS, MORECORE_CANNOT_TRIM,
and MALLOC_FAILURE_ACTION.
Revision Changes Path
No revision
No revision
1.677.6.33 +19 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.677.6.32
retrieving revision 1.677.6.33
diff -u -r1.677.6.32 -r1.677.6.33
--- ChangeLog 29 Aug 2005 01:54:39 -0000 1.677.6.32
+++ ChangeLog 2 Sep 2005 22:27:38 -0000 1.677.6.33
@@ -1,3 +1,22 @@
+2005-09-02 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ 2005-09-02 Beth Dakin <bdakin at apple.com>
+
+ Fix for <rdar://problem/4235531> Regression: Safari crash in KWQStringData::makeUnicode
+ The other half of the fix is in WebCore.
+
+ Fix written by Maciej and Darin.
+ Reviewed by me/Maciej
+
+ As Maciej said in Radar: These problems was caused by a conflict between some of our custom
+ allocators, causing them to return null. Symptom is typically a null pointer dereference in
+ a place where it might be expected an allocation has just occurred.
+
+ * kjs/fast_malloc.cpp: Added #define for MORECORE_CONTIGUOUS, MORECORE_CANNOT_TRIM,
+ and MALLOC_FAILURE_ACTION.
+
=== Safari-416.5 ===
2005-08-28 Adele Peterson <adele at apple.com>
No revision
No revision
1.1.6.1 +10 -0 JavaScriptCore/kjs/fast_malloc.cpp
Index: fast_malloc.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/fast_malloc.cpp,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- fast_malloc.cpp 15 Apr 2005 01:26:26 -0000 1.1
+++ fast_malloc.cpp 2 Sep 2005 22:27:39 -0000 1.1.6.1
@@ -224,6 +224,10 @@
probably don't want to touch unless you are extending or adapting malloc.
*/
+#define MORECORE_CONTIGUOUS 0
+#define MORECORE_CANNOT_TRIM 1
+#define MALLOC_FAILURE_ACTION abort()
+
namespace KJS {
/*
@@ -2498,7 +2502,9 @@
#if __STD_C
static Void_t* sYSMALLOc(INTERNAL_SIZE_T, mstate);
+#ifndef MORECORE_CANNOT_TRIM
static int sYSTRIm(size_t, mstate);
+#endif
static void malloc_consolidate(mstate);
static Void_t** iALLOc(size_t, size_t*, int, Void_t**);
#else
@@ -3288,6 +3294,8 @@
returns 1 if it actually released any memory, else 0.
*/
+#ifndef MORECORE_CANNOT_TRIM
+
#if __STD_C
static int sYSTRIm(size_t pad, mstate av)
#else
@@ -3345,6 +3353,8 @@
return 0;
}
+#endif
+
/*
------------------------------ malloc ------------------------------
*/
No revision
No revision
1.1.2.19 +19 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- ChangeLog 2 Sep 2005 22:14:07 -0000 1.1.2.18
+++ ChangeLog 2 Sep 2005 22:27:40 -0000 1.1.2.19
@@ -2,6 +2,25 @@
Merged fix from TOT to Safari-2-0-branch
+ 2005-09-02 Beth Dakin <bdakin at apple.com>
+
+ Fix for <rdar://problem/4235531> Denver Regression: Safari crash in KWQStringData::makeUnicode
+ The other half of the fix is in JavaScriptCore
+
+ Fix written by Maciej and Darin.
+ Reviewed by me/Maciej
+
+ As Maciej said in Radar: These problems was caused by a conflict between some of our custom
+ allocators, causing them to return null. Symptom is typically a null pointer dereference in
+ a place where it might be expected an allocation has just occurred.
+
+ * khtml/misc/main_thread_malloc.cpp: Added #define for MORECORE_CONTIGUOUS, MORECORE_CANNOT_TRIM,
+ and MALLOC_FAILURE_ACTION.
+
+2005-09-02 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
2005-09-02 Adele Peterson <adele at apple.com>
Reviewed by Darin.
No revision
No revision
1.1.2.1 +11 -0 WebCore/khtml/misc/main_thread_malloc.cpp
Index: main_thread_malloc.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/main_thread_malloc.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- main_thread_malloc.cpp 26 Apr 2005 18:46:04 -0000 1.1
+++ main_thread_malloc.cpp 2 Sep 2005 22:27:40 -0000 1.1.2.1
@@ -224,6 +224,11 @@
probably don't want to touch unless you are extending or adapting malloc.
*/
+#define MORECORE_CONTIGUOUS 0
+#define MORECORE_CANNOT_TRIM 1
+#define MALLOC_FAILURE_ACTION abort()
+
+
namespace khtml {
/*
@@ -2498,7 +2503,9 @@
#if __STD_C
static Void_t* sYSMALLOc(INTERNAL_SIZE_T, mstate);
+#ifndef MORECORE_CANNOT_TRIM
static int sYSTRIm(size_t, mstate);
+#endif
static void malloc_consolidate(mstate);
static Void_t** iALLOc(size_t, size_t*, int, Void_t**);
#else
@@ -3288,6 +3295,8 @@
returns 1 if it actually released any memory, else 0.
*/
+#ifndef MORECORE_CANNOT_TRIM
+
#if __STD_C
static int sYSTRIm(size_t pad, mstate av)
#else
@@ -3345,6 +3354,8 @@
return 0;
}
+#endif
+
/*
------------------------------ malloc ------------------------------
*/
More information about the webkit-changes
mailing list