opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-03 06:27:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

libvorbis: do not flush libvorbis analysis if dsp state was not initialized

Browse Source 
Fixes a segfault if init() fails before initializing the dsp state
This commit is contained in:
Justin Ruggles
2012-02-28 19:51:25 -05:00
parent 147ff24a0e
commit f15c4281dc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/libvorbis.c
View File

@ -52,6 +52,7 @@ typedef struct OggVorbisContext {
uint8_t buffer[BUFFER_SIZE]; /**< output packet buffer */ uint8_t buffer[BUFFER_SIZE]; /**< output packet buffer */
int buffer_index; /**< current buffer position */ int buffer_index; /**< current buffer position */
int eof; /**< end-of-file flag */ int eof; /**< end-of-file flag */
int dsp_initialized; /**< vd has been initialized */
vorbis_comment vc; /**< VorbisComment info */ vorbis_comment vc; /**< VorbisComment info */
ogg_packet op; /**< ogg packet */ ogg_packet op; /**< ogg packet */
double iblock; /**< impulse block bias option */ double iblock; /**< impulse block bias option */
@ -148,6 +149,7 @@ static av_cold int oggvorbis_encode_close(AVCodecContext *avctx)
OggVorbisContext *s = avctx->priv_data; OggVorbisContext *s = avctx->priv_data;
/* notify vorbisenc this is EOF */ /* notify vorbisenc this is EOF */
if (s->dsp_initialized)
vorbis_analysis_wrote(&s->vd, 0); vorbis_analysis_wrote(&s->vd, 0);
vorbis_block_clear(&s->vb); vorbis_block_clear(&s->vb);
@ -177,6 +179,7 @@ static av_cold int oggvorbis_encode_init(AVCodecContext *avctx)
ret = vorbis_error_to_averror(ret); ret = vorbis_error_to_averror(ret);
goto error; goto error;
} }
s->dsp_initialized = 1;
if ((ret = vorbis_block_init(&s->vd, &s->vb))) { if ((ret = vorbis_block_init(&s->vd, &s->vb))) {
ret = vorbis_error_to_averror(ret); ret = vorbis_error_to_averror(ret);
goto error; goto error;