diff mbox

[FFmpeg-devel,2/3] tools/crypto_bench: check malloc fail before using it

Message ID 1557336748-23144-2-git-send-email-mypopydev@gmail.com
State Accepted
Commit 153a6a67a93af0f0bd00d76670e59e741c9a13c7
Headers show

Commit Message

Jun Zhao May 8, 2019, 5:32 p.m. UTC 
From: Jun Zhao <barryjzhao@tencent.com>

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

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 tools/crypto_bench.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Comments

Nicolas George May 9, 2019, 8:53 a.m. UTC | #1 
Jun Zhao (12019-05-09):
> From: Jun Zhao <barryjzhao@tencent.com>
> 
> Need to check malloc fail before using it, so adjust the location
> in the code.
> 
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  tools/crypto_bench.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)

Ok.

Regards,
Jun Zhao May 9, 2019, 9:09 a.m. UTC | #2 
On Thu, May 9, 2019 at 4:53 PM Nicolas George <george@nsup.org> wrote:
>
> Jun Zhao (12019-05-09):
> > From: Jun Zhao <barryjzhao@tencent.com>
> >
> > Need to check malloc fail before using it, so adjust the location
> > in the code.
> >
> > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > ---
> >  tools/crypto_bench.c |    8 +++++---
> >  1 files changed, 5 insertions(+), 3 deletions(-)
>
> Ok.
>
Applied, Thanks
diff mbox

Patch

diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c
index aca8bbb..ac9fcc4 100644
--- a/tools/crypto_bench.c
+++ b/tools/crypto_bench.c
@@ -665,8 +665,8 @@  struct hash_impl implementations[] = {
 
 int main(int argc, char **argv)
 {
-    uint8_t *input = av_malloc(MAX_INPUT_SIZE * 2);
-    uint8_t *output = input + MAX_INPUT_SIZE;
+    uint8_t *input;
+    uint8_t *output;
     unsigned i, impl, size;
     int opt;
 
@@ -702,12 +702,14 @@  int main(int argc, char **argv)
             exit(opt != 'h');
         }
     }
-
+    input = av_malloc(MAX_INPUT_SIZE * 2);
     if (!input)
         fatal_error("out of memory");
     for (i = 0; i < MAX_INPUT_SIZE; i += 4)
         AV_WB32(input + i, i);
 
+    output = input + MAX_INPUT_SIZE;
+
     size = MAX_INPUT_SIZE;
     for (impl = 0; impl < FF_ARRAY_ELEMS(implementations); impl++)
         run_implementation(input, output, &implementations[impl], size);