diff mbox

[FFmpeg-devel,01/11] avfilter/unsharp: fix uninitialized pointer read

Message ID 20170611140551.11844-1-timo@rothenpieler.org
State Accepted
Commit 21583e936a06fa0c9dca99436c21d441d04e57f4
Headers show

Commit Message

Timo Rothenpieler June 11, 2017, 2:05 p.m. UTC 
Fixes CID 1396855
---
 libavfilter/unsharp_opencl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer June 12, 2017, 10:26 p.m. UTC | #1 
On Sun, Jun 11, 2017 at 04:05:43PM +0200, Timo Rothenpieler wrote:
> Fixes CID 1396855
> ---
>  libavfilter/unsharp_opencl.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

LGTM

thx

[...]
Timo Rothenpieler June 13, 2017, 5:53 p.m. UTC | #2 
Am 13.06.2017 um 00:26 schrieb Michael Niedermayer:
> On Sun, Jun 11, 2017 at 04:05:43PM +0200, Timo Rothenpieler wrote:
>> Fixes CID 1396855
>> ---
>>   libavfilter/unsharp_opencl.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> LGTM
> 
> thx

applied
diff mbox

Patch

diff --git a/libavfilter/unsharp_opencl.c b/libavfilter/unsharp_opencl.c
index d84920c590..1545455846 100644
--- a/libavfilter/unsharp_opencl.c
+++ b/libavfilter/unsharp_opencl.c
@@ -43,7 +43,7 @@  static int compute_mask(int step, uint32_t *mask)
 {
     int i, z, ret = 0;
     int counter_size = sizeof(uint32_t) * (2 * step + 1);
-    uint32_t *temp1_counter, *temp2_counter, **counter;
+    uint32_t *temp1_counter, *temp2_counter, **counter = NULL;
     temp1_counter = av_mallocz(counter_size);
     if (!temp1_counter) {
         ret = AVERROR(ENOMEM);
@@ -80,7 +80,7 @@  static int compute_mask(int step, uint32_t *mask)
 end:
     av_freep(&temp1_counter);
     av_freep(&temp2_counter);
-    for (i = 0; i < 2 * step + 1; i++) {
+    for (i = 0; counter && i < 2 * step + 1; i++) {
         av_freep(&counter[i]);
     }
     av_freep(&counter);