Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/ico: use avmalloc(z)_array()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/66/head
Michael Niedermayer 11 years ago
parent 11b36b1ee0
commit dd77f6469a
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/icodec.c
  2. 2
      libavformat/icoenc.c

2
libavformat/icodec.c
Unescape View File

@ -58,7 +58,7 @@ static int read_header(AVFormatContext *s)
avio_skip(pb, 4); avio_skip(pb, 4);
ico->nb_images = avio_rl16(pb); ico->nb_images = avio_rl16(pb);
ico->images = av_malloc(ico->nb_images * sizeof(IcoImage)); ico->images = av_malloc_array(ico->nb_images, sizeof(IcoImage));
if (!ico->images) if (!ico->images)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

2
libavformat/icoenc.c
Unescape View File

@ -101,7 +101,7 @@ static int ico_write_header(AVFormatContext *s)
avio_skip(pb, 16); avio_skip(pb, 16);
} }
ico->images = av_mallocz(ico->nb_images * sizeof(IcoMuxContext)); ico->images = av_mallocz_array(ico->nb_images, sizeof(IcoMuxContext));
if (!ico->images) if (!ico->images)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

Write Preview
Loading…
Cancel
Save