Title: [261469] trunk
- Revision
- 261469
- Author
- [email protected]
- Date
- 2020-05-11 02:05:01 -0700 (Mon, 11 May 2020)
Log Message
[WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.html is crashing
https://bugs.webkit.org/show_bug.cgi?id=181225
Reviewed by Darin Adler.
Source/WebCore:
WebCore::CDM::createInstance assumes its private instance always
produces a valid pointer. This is not the case in the testing
mocks. Guard against it.
Test: media/encrypted-media/mock-MediaKeySystemAccess.html
* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::createInstance): Guard against null pointers in
mock scenarios.
LayoutTests:
* platform/gtk/TestExpectations: The test is no longer crashing.
* platform/wpe/TestExpectations: Ditto.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (261468 => 261469)
--- trunk/LayoutTests/ChangeLog 2020-05-11 06:57:27 UTC (rev 261468)
+++ trunk/LayoutTests/ChangeLog 2020-05-11 09:05:01 UTC (rev 261469)
@@ -1,3 +1,13 @@
+2020-05-11 Charlie Turner <[email protected]>
+
+ [WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.html is crashing
+ https://bugs.webkit.org/show_bug.cgi?id=181225
+
+ Reviewed by Darin Adler.
+
+ * platform/gtk/TestExpectations: The test is no longer crashing.
+ * platform/wpe/TestExpectations: Ditto.
+
2020-05-10 Diego Pino Garcia <[email protected]>
[GTK] Gardening, update test expectations
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (261468 => 261469)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-11 06:57:27 UTC (rev 261468)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-11 09:05:01 UTC (rev 261469)
@@ -1582,7 +1582,6 @@
webkit.org/b/188406 [ Debug ] imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/dir.html [ Crash ]
-webkit.org/b/190578 media/encrypted-media/mock-MediaKeySystemAccess.html [ Crash ]
webkit.org/b/190738 imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html [ Crash Pass Failure ]
webkit.org/b/191882 fast/forms/validation-message-clone.html [ Failure Crash Pass ]
webkit.org/b/191882 fast/forms/validation-message-in-relative-body.html [ Failure Crash ]
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (261468 => 261469)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-11 06:57:27 UTC (rev 261468)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-11 09:05:01 UTC (rev 261469)
@@ -1101,8 +1101,6 @@
# 5. TESTS CRASHING
#////////////////////////////////////////////////////////////////////////////////////////
-webkit.org/b/181225 media/encrypted-media/mock-MediaKeySystemAccess.html [ Crash ]
-
webkit.org/b/185591 [ Debug ] imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html [ Crash ]
webkit.org/b/188161 [ Debug ] fast/canvas/webgl/context-lost-restored.html [ Crash ]
Modified: trunk/Source/WebCore/ChangeLog (261468 => 261469)
--- trunk/Source/WebCore/ChangeLog 2020-05-11 06:57:27 UTC (rev 261468)
+++ trunk/Source/WebCore/ChangeLog 2020-05-11 09:05:01 UTC (rev 261469)
@@ -1,3 +1,20 @@
+2020-05-11 Charlie Turner <[email protected]>
+
+ [WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.html is crashing
+ https://bugs.webkit.org/show_bug.cgi?id=181225
+
+ Reviewed by Darin Adler.
+
+ WebCore::CDM::createInstance assumes its private instance always
+ produces a valid pointer. This is not the case in the testing
+ mocks. Guard against it.
+
+ Test: media/encrypted-media/mock-MediaKeySystemAccess.html
+
+ * Modules/encryptedmedia/CDM.cpp:
+ (WebCore::CDM::createInstance): Guard against null pointers in
+ mock scenarios.
+
2020-05-10 Rob Buis <[email protected]>
Fix base64.any.html test
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (261468 => 261469)
--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2020-05-11 06:57:27 UTC (rev 261468)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2020-05-11 09:05:01 UTC (rev 261469)
@@ -113,7 +113,8 @@
if (!m_private)
return nullptr;
auto instance = m_private->createInstance();
- instance->setStorageDirectory(storageDirectory());
+ if (instance)
+ instance->setStorageDirectory(storageDirectory());
return instance;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
