[FFmpeg-cvslog] tools/crypto_bench: check malloc fail before using it
Jun Zhao
git at videolan.org
Thu May 9 12:09:06 EEST 2019
ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Thu May 9 01:16:27 2019 +0800| [153a6a67a93af0f0bd00d76670e59e741c9a13c7] | committer: Jun Zhao
tools/crypto_bench: check malloc fail before using it
Need to check malloc fail before using it, so adjust the location
in the code.
Reviewed-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=153a6a67a93af0f0bd00d76670e59e741c9a13c7
---
tools/crypto_bench.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c
index aca8bbb1a8..ac9fcc465e 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);
More information about the ffmpeg-cvslog
mailing list