Attachment 343186 Details for Bug 186865 – Patch v1

[patch] Patch v1

bug-186865-20180620155547.patch (text/plain), 3.21 KB, created by David Kilzer (:ddkilzer) on 2018-06-20 15:56:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-06-20 15:56:05 PDT

Size: 3.21 KB

patch

obsolete

>Subversion Revision: 233009
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cbcea186bf77038ff52e995b6821b4a99624004d..cb2fa4cdb8ec48e3ab269c4b187ddca45e217523 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-20  David Kilzer  <ddkilzer@apple.com>
>+
>+        Fix leaks in WebCore found by clang static analyzer in deep mode
>+        <https://webkit.org/b/186865>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/mac/WebCoreNSURLExtras.mm:
>+        (WebCore::mapHostNames): Fix leak of an empty NSMutableArray
>+        during an early return.  RetainPtr<> is not used here since
>+        a pointer to the NSMutableArray * is passed around.
>+        * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:
>+        (WebCore::ScreenDisplayCaptureSourceMac::createDisplayStream):
>+        Fix leak of a CGDisplayModeRef during an early return.
>+
> 2018-06-20  Miguel Gomez  <magomez@igalia.com>
> 
>         [GTK][ThreadedRendering][Nicosia] Themed elements cannot be rendered using threaded rendering
>diff --git a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm b/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>index bd777f0fcb9d59b5d2a7d281a129039043cc8e96..ec64ea91cf72aa5256c9a56aee3262f82edb00fb 100644
>--- a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>+++ b/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm
>@@ -777,8 +777,10 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
>     if (!hostNameRanges)
>         return string;
> 
>-    if (![hostNameRanges count])
>+    if (![hostNameRanges count]) {
>+        [hostNameRanges release];
>         return nil;
>+    }
>     
>     // Do the mapping.
>     NSMutableString *mutableCopy = [string mutableCopy];
>diff --git a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm
>index cf494b87b027d7e6f9d4a0909f1262615c3ca211..36d1e84aabbb2ffcf3aadfc1dfb4c601d5b41bea 100644
>--- a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm
>+++ b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm
>@@ -133,9 +133,9 @@ bool ScreenDisplayCaptureSourceMac::createDisplayStream()
>     if (!m_displayStream) {
> 
>         if (size().isEmpty()) {
>-            CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(m_displayID);
>-            auto screenWidth = CGDisplayModeGetPixelsWide(displayMode);
>-            auto screenHeight = CGDisplayModeGetPixelsHigh(displayMode);
>+            RetainPtr<CGDisplayModeRef> displayMode = adoptCF(CGDisplayCopyDisplayMode(m_displayID));
>+            auto screenWidth = CGDisplayModeGetPixelsWide(displayMode.get());
>+            auto screenHeight = CGDisplayModeGetPixelsHigh(displayMode.get());
>             if (!screenWidth || !screenHeight) {
>                 RELEASE_LOG(Media, "ScreenDisplayCaptureSourceMac::createDisplayStream(%p), unable to get screen width/height", this);
>                 captureFailed();
>@@ -143,7 +143,6 @@ bool ScreenDisplayCaptureSourceMac::createDisplayStream()
>             }
>             setWidth(screenWidth);
>             setHeight(screenHeight);
>-            CGDisplayModeRelease(displayMode);
>         }
> 
>         if (!m_captureQueue)

Actions: View | Formatted Diff | Diff

Attachments on bug 186865: 343186 | 343190