diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-07 14:05:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-06 14:41:41 +0200 |
| commit | 4866d2a9ee36dfd242d6afa496649d52fd2f462e (patch) | |
| tree | 88045c72e1592ad5110480533c977ac28e56dec2 | |
| parent | 89c62d5cdd82003c81c335f53db6e049fcdfe73c (diff) | |
| download | ffmpeg-4866d2a9ee36dfd242d6afa496649d52fd2f462e.tar.gz | |
swscale/slice: Check slice for allocation failure
Fixes: null pointer dereference
Fixes: alloc_slice.mp4
Found-by: Rafael Dutra <rafael.dutra@cispa.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 997f9cfc1295769be8d3180860ceebbc16f59069)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/slice.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/slice.c b/libswscale/slice.c index 7849b70f4d..995ef745aa 100644 --- a/libswscale/slice.c +++ b/libswscale/slice.c @@ -292,7 +292,8 @@ int ff_init_filters(SwsContext * c) if (!c->desc) return AVERROR(ENOMEM); c->slice = av_mallocz_array(sizeof(SwsSlice), c->numSlice); - + if (!c->slice) + goto cleanup; res = alloc_slice(&c->slice[0], c->srcFormat, c->srcH, c->chrSrcH, c->chrSrcHSubSample, c->chrSrcVSubSample, 0); if (res < 0) goto cleanup; |