[FFmpeg-cvslog] avfilter/unsharp: fix uninitialized pointer read

Timo Rothenpieler git at videolan.org
Tue Jun 13 20:52:47 EEST 2017


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Sun Jun 11 14:50:01 2017 +0200| [21583e936a06fa0c9dca99436c21d441d04e57f4] | committer: Timo Rothenpieler

avfilter/unsharp: fix uninitialized pointer read

Fixes CID 1396855

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21583e936a06fa0c9dca99436c21d441d04e57f4
---

 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(&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);



More information about the ffmpeg-cvslog mailing list