Attachment 341618 Details for Bug 186114 – Patch v2

[patch] Patch v2

bug-186114-20180530163413.patch (text/plain), 3.07 KB, created by David Kilzer (:ddkilzer) on 2018-05-30 16:34:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-05-30 16:34:15 PDT

Size: 3.07 KB

patch

obsolete

>Subversion Revision: 232304
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index d18a8650ade79c053df13249e575e4c06d0dd71b..26c7f5db745fb8b8ad071bef930667ce4c29887c 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-30  David Kilzer  <ddkilzer@apple.com>
>+
>+        Fix leak of a CVPixelBufferRef due to early rerturn in -[RTCVideoEncoderH264 encode:codecSpecificInfo:frameTypes:]
>+        <https://webkit.org/b/186114>
>+        <rdar://problem/40668097>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:
>+        (-[RTCVideoEncoderH264 encode:codecSpecificInfo:frameTypes:]):
>+        Call CVBufferRelease(pixelBuffer) before early return to free
>+        it.
>+        * WebKit/0010-Fix-RTCVideoEncoderH264-CVPixelBuffer-leak.patch: Add.
>+
> 2018-05-27  David Kilzer  <ddkilzer@apple.com>
> 
>         [iOS] Fix warnings about leaks found by clang static analyzer
>diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>index 42f940426ae6b605102e9e1f8198a25c693eb0e7..16a841d94580533c771350b4875cbd696a69e9f8 100644
>--- a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>@@ -429,6 +429,7 @@ - (NSInteger)encode:(RTCVideoFrame *)frame
>       }
>       _frameScaleBuffer.shrink_to_fit();
>       if (![rtcPixelBuffer cropAndScaleTo:pixelBuffer withTempBuffer:_frameScaleBuffer.data()]) {
>+        CVBufferRelease(pixelBuffer);
>         return WEBRTC_VIDEO_CODEC_ERROR;
>       }
>     }
>diff --git a/Source/ThirdParty/libwebrtc/WebKit/0010-Fix-RTCVideoEncoderH264-CVPixelBuffer-leak.patch b/Source/ThirdParty/libwebrtc/WebKit/0010-Fix-RTCVideoEncoderH264-CVPixelBuffer-leak.patch
>new file mode 100644
>index 0000000000000000000000000000000000000000..83098c349c6907932a726c1d5451bc05e73ef463
>--- /dev/null
>+++ b/Source/ThirdParty/libwebrtc/WebKit/0010-Fix-RTCVideoEncoderH264-CVPixelBuffer-leak.patch
>@@ -0,0 +1,12 @@
>+diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>+index 42f940426ae..16a841d9458 100644
>+--- a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>++++ b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>+@@ -429,6 +429,7 @@ - (NSInteger)encode:(RTCVideoFrame *)frame
>+       }
>+       _frameScaleBuffer.shrink_to_fit();
>+       if (![rtcPixelBuffer cropAndScaleTo:pixelBuffer withTempBuffer:_frameScaleBuffer.data()]) {
>++        CVBufferRelease(pixelBuffer);
>+         return WEBRTC_VIDEO_CODEC_ERROR;
>+       }
>+     }

Actions: View | Formatted Diff | Diff

Attachments on bug 186114: 341615 | 341618