forked from mirrors/gecko-dev
Bug 550184. Avoid using uninitialized data. r=doublec
This commit is contained in:
parent
22aee9c460
commit
eb01c12ace
4 changed files with 21 additions and 1 deletions
|
|
@ -11,3 +11,4 @@ file names with other Mozilla libraries.
|
|||
alloca.diff - Bug 469639 - Failed to build firefox trunk on OpenSolaris
|
||||
bug487519.patch: fix for bug 487519.
|
||||
bug498855.patch: fix for bug 498855
|
||||
bug550184.patch: fix for bug 550184 (Xiph trac 1656)
|
||||
|
|
|
|||
18
media/libvorbis/bug550184.patch
Normal file
18
media/libvorbis/bug550184.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/media/libvorbis/lib/vorbis_info.c b/media/libvorbis/lib/vorbis_info.c
|
||||
index 30088d8..8583224 100644
|
||||
--- a/media/libvorbis/lib/vorbis_info.c
|
||||
+++ b/media/libvorbis/lib/vorbis_info.c
|
||||
@@ -628,12 +628,12 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
|
||||
oggpack_writeclear(&opb);
|
||||
return(0);
|
||||
err_out:
|
||||
- oggpack_writeclear(&opb);
|
||||
memset(op,0,sizeof(*op));
|
||||
memset(op_comm,0,sizeof(*op_comm));
|
||||
memset(op_code,0,sizeof(*op_code));
|
||||
|
||||
if(b){
|
||||
+ oggpack_writeclear(&opb);
|
||||
if(b->header)_ogg_free(b->header);
|
||||
if(b->header1)_ogg_free(b->header1);
|
||||
if(b->header2)_ogg_free(b->header2);
|
||||
|
|
@ -628,12 +628,12 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
|
|||
oggpack_writeclear(&opb);
|
||||
return(0);
|
||||
err_out:
|
||||
oggpack_writeclear(&opb);
|
||||
memset(op,0,sizeof(*op));
|
||||
memset(op_comm,0,sizeof(*op_comm));
|
||||
memset(op_code,0,sizeof(*op_code));
|
||||
|
||||
if(b){
|
||||
oggpack_writeclear(&opb);
|
||||
if(b->header)_ogg_free(b->header);
|
||||
if(b->header1)_ogg_free(b->header1);
|
||||
if(b->header2)_ogg_free(b->header2);
|
||||
|
|
|
|||
|
|
@ -49,3 +49,4 @@ cp $1/AUTHORS ./AUTHORS
|
|||
patch -p3 < ./alloca.diff
|
||||
patch -p3 <bug487519.patch
|
||||
patch -p3 <bug498855.patch
|
||||
patch -p3 <bug550184.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue