virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

libnut: NULL priv->nut after nut_demuxer_uninit() as a saftey precaution.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-07 23:35:57 +01:00
parent e21f8a07ca
commit 74436ad51e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/libnut.c
View File

@ -213,6 +213,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
if ((ret = nut_read_headers(nut, &s, NULL))) { if ((ret = nut_read_headers(nut, &s, NULL))) {
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret)); av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
nut_demuxer_uninit(nut); nut_demuxer_uninit(nut);
priv->nut = NULL;
return -1; return -1;
} }
@ -231,6 +232,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
st->codec->extradata = av_mallocz(st->codec->extradata_size); st->codec->extradata = av_mallocz(st->codec->extradata_size);
if(!st->codec->extradata){ if(!st->codec->extradata){
nut_demuxer_uninit(nut); nut_demuxer_uninit(nut);
priv->nut = NULL;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size); memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size);