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

Submitted by Jun Zhao on Feb. 10, 2019, 5:07 a.m.

Details

Message ID 1549775240-31806-1-git-send-email-mypopydev@gmail.com
State Accepted
Commit 6382d0334775c0a2d8b945ea5f007e7106431d6d
Headers show

Commit Message

Jun Zhao Feb. 10, 2019, 5:07 a.m.
Need to check malloc fail before using it, so adjust the location
in the code.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
---
 libavfilter/tests/integral.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Feb. 11, 2019, 5:48 p.m.
On Sun, Feb 10, 2019 at 01:07:20PM +0800, Jun Zhao wrote:
> Need to check malloc fail before using it, so adjust the location
> in the code.
> 
> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> ---
>  libavfilter/tests/integral.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

LGTM

thx

[...]
mypopy@gmail.com Feb. 12, 2019, 1:16 a.m.
On Tue, Feb 12, 2019 at 1:48 AM Michael Niedermayer <michaelni@gmx.at> wrote:
>
> On Sun, Feb 10, 2019 at 01:07:20PM +0800, Jun Zhao wrote:
> > Need to check malloc fail before using it, so adjust the location
> > in the code.
> >
> > Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> > ---
> >  libavfilter/tests/integral.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
>
> LGTM
>
> thx
>
>


Pushed, Tks

Patch hide | download patch | download mbox

diff --git a/libavfilter/tests/integral.c b/libavfilter/tests/integral.c
index 2a8e8ff..361bfd5 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);