Title: [89857] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (89856 => 89857)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-27 21:21:50 UTC (rev 89856)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-27 21:22:13 UTC (rev 89857)
@@ -1,5 +1,20 @@
2011-06-27 Lucas Forschler <[email protected]>
+ Merged 89748.
+
+ 2011-06-25 Jer Noble <[email protected]>
+
+ Reviewed by Maciej Stachowiak.
+
+ SOFT_LINK_POINTER_OPTIONAL isn't optional.
+ https://bugs.webkit.org/show_bug.cgi?id=63378
+
+ Continuation of r89718. SOFT_LINK_POINTER_OPTIONAL should check the value returned by dlsym before dereferencing it.
+
+ * platform/mac/SoftLinking.h:
+
+2011-06-27 Lucas Forschler <[email protected]>
+
Merged 89718.
2011-06-24 Jer Noble <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/platform/mac/SoftLinking.h (89856 => 89857)
--- branches/safari-534-branch/Source/WebCore/platform/mac/SoftLinking.h 2011-06-27 21:21:50 UTC (rev 89856)
+++ branches/safari-534-branch/Source/WebCore/platform/mac/SoftLinking.h 2011-06-27 21:22:13 UTC (rev 89857)
@@ -137,7 +137,8 @@
static type init##name() \
{ \
void** pointer = static_cast<void**>(dlsym(framework##Library(), #name)); \
- pointer##name = static_cast<type>(*pointer); \
+ if (pointer) \
+ pointer##name = static_cast<type>(*pointer); \
get##name = name##Function; \
return pointer##name; \
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
