highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfdec: Don't pretend array to be bigger than it is

Browse Source 
mxf_match_uid() accepts two const UID and a len parameter.
UID is a typedef for an array of 16 uint8_t, so the const UID
parameter is actually a pointer to const uint8_t.

The point of mxf_match_uid() is to check whether the initial
part of two UIDs match; the length of said part is given
by the len parameter. Once an incomplete UID has been passed
to mxf_match_uid() (albeit with the correct len, so safe),
which makes GCC emit -Wstringop-overread warnings.

Fix this by using a const uint8_t[] as type; it is more
natural for incomplete UIDs.

Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-11 17:43:40 +02:00
parent 740ce93fae
commit 58aaa83fa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mxfdec.c
View File

@ -1544,11 +1544,11 @@ static int mxf_read_tagged_value(void *arg, AVIOContext *pb, int tag, int size,
* Match an uid independently of the version byte and up to len common bytes * Match an uid independently of the version byte and up to len common bytes
* Returns: boolean * Returns: boolean
*/ */
static int mxf_match_uid(const UID key, const UID uid, int len) static int mxf_match_uid(const UID key, const uint8_t uid_prefix[], int len)
{ {
int i; int i;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (i != 7 && key[i] != uid[i]) if (i != 7 && key[i] != uid_prefix[i])
return 0; return 0;
} }
return 1; return 1;