RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

avformat/aadec: Use smaller scope for variables, remove initializations

Browse Source 
avio_get_str always zero terminates the strings it reads.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-03-02 09:48:14 +01:00
parent b6fe10fa39
commit 80038fd524
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/aadec.c
View File

@ -72,8 +72,8 @@ static int get_second_size(char *codec_name)
static int aa_read_header(AVFormatContext *s) static int aa_read_header(AVFormatContext *s)
{ {
int i, j, idx, largest_idx = -1; int i, j, idx, largest_idx = -1;
uint32_t nkey, nval, toc_size, npairs, header_seed = 0, start; uint32_t toc_size, npairs, header_seed = 0, start;
char key[128], val[128], codec_name[64] = {0}; char codec_name[64] = {0};
uint8_t output[24], dst[8], src[8]; uint8_t output[24], dst[8], src[8];
int64_t largest_size = -1, current_size = -1, chapter_pos; int64_t largest_size = -1, current_size = -1, chapter_pos;
struct toc_entry { struct toc_entry {
@ -104,8 +104,9 @@ static int aa_read_header(AVFormatContext *s)
if (npairs > MAX_DICTIONARY_ENTRIES) if (npairs > MAX_DICTIONARY_ENTRIES)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (i = 0; i < npairs; i++) { for (i = 0; i < npairs; i++) {
memset(val, 0, sizeof(val)); char key[128], val[128];
memset(key, 0, sizeof(key)); uint32_t nkey, nval;
avio_skip(pb, 1); // unidentified integer avio_skip(pb, 1); // unidentified integer
nkey = avio_rb32(pb); // key string length nkey = avio_rb32(pb); // key string length
nval = avio_rb32(pb); // value string length nval = avio_rb32(pb); // value string length