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

2017-06-13 Thread Timo Rothenpieler 

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
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-06-12 Thread 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

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-06-11 Thread Timo Rothenpieler 
Fixes CID 1396855
---
 libavfilter/unsharp_opencl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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(_counter);
 av_freep(_counter);
-for (i = 0; i < 2 * step + 1; i++) {
+for (i = 0; counter && i < 2 * step + 1; i++) {
 av_freep([i]);
 }
 av_freep();
-- 
2.13.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel