Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/adts_parser.c')
-rw-r--r--libavcodec/adts_parser.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c
index 4a1a8fd5f4..f2e155fc99 100644
--- a/libavcodec/adts_parser.c
+++ b/libavcodec/adts_parser.c
@@ -47,24 +47,30 @@ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_
{
#if CONFIG_ADTS_HEADER
int ret = 0;
+ int allocated = 0;
GetBitContext gb;
if (!phdr || !buf || size < AV_AAC_ADTS_HEADER_SIZE)
return AVERROR_INVALIDDATA;
- *phdr = av_mallocz(sizeof(AACADTSHeaderInfo));
+ if (!*phdr) {
+ allocated = 1;
+ *phdr = av_mallocz(sizeof(AACADTSHeaderInfo));
+ }
if (!*phdr)
return AVERROR(ENOMEM);
ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE);
if (ret < 0) {
- av_freep(phdr);
+ if (allocated)
+ av_freep(phdr);
return ret;
}
ret = ff_adts_header_parse(&gb, *phdr);
if (ret < 0) {
- av_freep(phdr);
+ if (allocated)
+ av_freep(phdr);
return ret;
}