har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: fix atom type to string conversion

Browse Source 
The conversion was endian-dependent, and it may contain non-printable
characters.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Zhao Zhili 2020-07-12 00:26:58 +08:00 committed by Michael Niedermayer
parent 663f024415
commit af7b1031e1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mov.c
View File

@ -297,7 +297,7 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len)
static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
char tmp_key[5]; char tmp_key[AV_FOURCC_MAX_STRING_SIZE] = {0};
char key2[32], language[4] = {0}; char key2[32], language[4] = {0};
char *str = NULL; char *str = NULL;
const char *key = NULL; const char *key = NULL;
@ -444,8 +444,7 @@ retry:
str_size = atom.size; str_size = atom.size;
if (c->export_all && !key) { if (c->export_all && !key) {
snprintf(tmp_key, 5, "%.4s", (char*)&atom.type); key = av_fourcc_make_string(tmp_key, atom.type);
key = tmp_key;
} }
if (!key) if (!key)
@ -7024,8 +7023,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_skip(pb, left); avio_skip(pb, left);
else if (left < 0) { else if (left < 0) {
av_log(c->fc, AV_LOG_WARNING, av_log(c->fc, AV_LOG_WARNING,
"overread end of atom '%.4s' by %"PRId64" bytes\n", "overread end of atom '%s' by %"PRId64" bytes\n",
(char*)&a.type, -left); av_fourcc2str(a.type), -left);
avio_seek(pb, left, SEEK_CUR); avio_seek(pb, left, SEEK_CUR);
} }
} }