Skip to content

F
ffmpeg.wasm-core
Commit c571424c authored by Alexandra Hájková's avatar Alexandra Hájková Committed by Anton Khirnov
Browse files
Options

asfdec: prevent memory leaks found with Coverity Scan 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 1b9a8e5f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
libavformat/asfdec.c
View file @ c571424c
...@@ -281,8 +281,10 @@ static int asf_read_value(AVFormatContext *s, uint8_t *name, uint16_t name_len, ...@@ -281,8 +281,10 @@ static int asf_read_value(AVFormatContext *s, uint8_t *name, uint16_t name_len,
av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n");
} else { } else {
char buf[256]; char buf[256];
if (val_len > sizeof(buf)) if (val_len > sizeof(buf)) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto failed;
}
if ((ret = avio_read(pb, value, val_len)) < 0) if ((ret = avio_read(pb, value, val_len)) < 0)
goto failed; goto failed;
if (ret < 2 * val_len) if (ret < 2 * val_len)
...@@ -404,8 +406,10 @@ static int asf_read_picture(AVFormatContext *s, int len) ...@@ -404,8 +406,10 @@ static int asf_read_picture(AVFormatContext *s, int len)
} }
asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st)); asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st));
asf_st = asf->asf_st[asf->nb_streams]; asf_st = asf->asf_st[asf->nb_streams];
if (!asf_st) if (!asf_st) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
st->codec->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment