From ae0148ff60cbf0e1d81f86f7300280bb48056c71 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 12 Jun 2015 14:39:28 +0200
Subject: [PATCH] swscale: Assert that pixel format descriptor is not NULL
This may help static analyzers, the pixel format is checked
during initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libswscale/swscale.c | 2 ++
libswscale/utils.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 5312016927f..1945e1dc9bb 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -784,6 +784,8 @@ static int check_image_pointers(const uint8_t * const data[4], enum AVPixelForma
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
int i;
+ av_assert2(desc);
+
for (i = 0; i < 4; i++) {
int plane = desc->comp[i].plane;
if (!data[plane] || !linesizes[plane])
diff --git a/libswscale/utils.c b/libswscale/utils.c
index f9f4ec6cb70..0c78d7515b0 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1036,6 +1036,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
return AVERROR(EINVAL);
}
}
+ av_assert2(desc_src && desc_dst);
i = flags & (SWS_POINT |
SWS_AREA |
--
GitLab