Title: [189015] trunk/Source/WebKit2
- Revision
- 189015
- Author
- [email protected]
- Date
- 2015-08-27 00:59:43 -0700 (Thu, 27 Aug 2015)
Log Message
Fix WKMutableArray creations in WKUserMediaPermissionRequest
https://bugs.webkit.org/show_bug.cgi?id=148489
Reviewed by Carlos Garcia Campos.
Call WKMutableArrayCreate() to create the WKMutableArray objects.
WKMutableArrayRef type is a pointer, so calling 'WKMutableArrayRef()'
just sets a null value to the variable that is then returned and
queried for size in WebKitTestRunner's TestController, resulting
in a crash.
* UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
(WKUserMediaPermissionRequestDeviceNamesVideo):
(WKUserMediaPermissionRequestDeviceNamesAudio):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (189014 => 189015)
--- trunk/Source/WebKit2/ChangeLog 2015-08-27 07:23:29 UTC (rev 189014)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-27 07:59:43 UTC (rev 189015)
@@ -1,3 +1,20 @@
+2015-08-27 Zan Dobersek <[email protected]>
+
+ Fix WKMutableArray creations in WKUserMediaPermissionRequest
+ https://bugs.webkit.org/show_bug.cgi?id=148489
+
+ Reviewed by Carlos Garcia Campos.
+
+ Call WKMutableArrayCreate() to create the WKMutableArray objects.
+ WKMutableArrayRef type is a pointer, so calling 'WKMutableArrayRef()'
+ just sets a null value to the variable that is then returned and
+ queried for size in WebKitTestRunner's TestController, resulting
+ in a crash.
+
+ * UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
+ (WKUserMediaPermissionRequestDeviceNamesVideo):
+ (WKUserMediaPermissionRequestDeviceNamesAudio):
+
2015-08-26 Emanuele Aina <[email protected]>
[ThreadedCompositor] Use WTF::Condition together with WTF::Lock
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp (189014 => 189015)
--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-27 07:23:29 UTC (rev 189014)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-27 07:59:43 UTC (rev 189015)
@@ -52,7 +52,7 @@
WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef userMediaPermissionRef)
{
- WKMutableArrayRef array = WKMutableArrayRef();
+ WKMutableArrayRef array = WKMutableArrayCreate();
#if ENABLE(MEDIA_STREAM)
for (auto& name : toImpl(userMediaPermissionRef)->videoDeviceUIDs()) {
String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Video);
@@ -64,7 +64,7 @@
WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef userMediaPermissionRef)
{
- WKMutableArrayRef array = WKMutableArrayRef();
+ WKMutableArrayRef array = WKMutableArrayCreate();
#if ENABLE(MEDIA_STREAM)
for (auto& name : toImpl(userMediaPermissionRef)->audioDeviceUIDs()) {
String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Audio);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
