[FFmpeg-cvslog] avfilter/tests/integral: Check malloc fail before using it

Jun Zhao git at videolan.org
Tue Feb 12 03:14:44 EET 2019


ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Sun Feb 10 12:57:44 2019 +0800| [6382d0334775c0a2d8b945ea5f007e7106431d6d] | committer: Jun Zhao

avfilter/tests/integral: Check malloc fail before using it

Need to check malloc fail before using it, so adjust the location
in the code.

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jun Zhao <mypopydev at gmail.com>

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

 libavfilter/tests/integral.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/tests/integral.c b/libavfilter/tests/integral.c
index 2a8e8ff55f..361bfd51e5 100644
--- a/libavfilter/tests/integral.c
+++ b/libavfilter/tests/integral.c
@@ -54,6 +54,9 @@ int main(void)
     uint32_t *ii  = av_mallocz_array(ii_h + 1, ii_lz_32 * sizeof(*ii));
     uint32_t *ii2 = av_mallocz_array(ii_h + 1, ii_lz_32 * sizeof(*ii2));
 
+    if (!ii || !ii2)
+        return -1;
+
     uint32_t *ii_start  = ii  + ii_lz_32 + 1; // skip top 0-line and left 0-column
     uint32_t *ii_start2 = ii2 + ii_lz_32 + 1; // skip top 0-line and left 0-column
 
@@ -61,9 +64,6 @@ int main(void)
 
     ff_nlmeans_init(&dsp);
 
-    if (!ii || !ii2)
-        return -1;
-
     for (yoff = -e; yoff <= e; yoff++) {
         for (xoff = -e; xoff <= e; xoff++) {
             printf("xoff=%d yoff=%d\n", xoff, yoff);



More information about the ffmpeg-cvslog mailing list