Cleaned up memory leaks in vorbisfile and libvorbis.

Monty

svn path=/trunk/vorbis/; revision=165

diff --git a/lib/block.c b/lib/block.c
index ffa574e..3f6e93d 100644 (file)
--- a/lib/block.c
+++ b/lib/block.c
@@ -111,6 +111,17 @@ int vorbis_block_clear(vorbis_block *vb){
       free(vb->pcm[i]);
     free(vb->pcm);
   }
+  if(vb->lpc){
+    for(i=0;i<vb->floor_channels;i++)
+      free(vb->lpc[i]);
+    free(vb->lpc);
+  }
+  if(vb->lsp){
+    for(i=0;i<vb->floor_channels;i++)
+      free(vb->lsp[i]);
+    free(vb->lsp);
+  }
+  if(vb->amp)free(vb->amp);
   if(vb->vd)
     if(vb->vd->analysisp)
       _oggpack_writeclear(&vb->opb);

diff --git a/lib/vorbisfile.c b/lib/vorbisfile.c
index f5b345d..3d5fff8 100644 (file)
--- a/lib/vorbisfile.c
+++ b/lib/vorbisfile.c
@@ -214,6 +214,7 @@ static int _fetch_headers(OggVorbis_File *vf,vorbis_info *vi,long *serialno){
   /* extract the initial header from the first page and verify that the
      Ogg bitstream is in fact Vorbis data */
   
+  vorbis_info_clear(vi);
   vorbis_info_init(vi);
   
   i=0;
@@ -238,6 +239,7 @@ static int _fetch_headers(OggVorbis_File *vf,vorbis_info *vi,long *serialno){
        goto bail_header;
       }
   }
+  ogg_stream_clear(&vf->os);
   return 0; 
 
  bail_header:
@@ -255,7 +257,7 @@ static void _prefetch_all_headers(OggVorbis_File *vf,vorbis_info *first,
   ogg_page og;
   int i,ret;
   
-  vf->vi=malloc(vf->links*sizeof(vorbis_info));
+  vf->vi=calloc(vf->links,sizeof(vorbis_info));
   vf->dataoffsets=malloc(vf->links*sizeof(long));
   vf->pcmlengths=malloc(vf->links*sizeof(size64));
   vf->serialnos=malloc(vf->links*sizeof(long));
@@ -319,6 +321,7 @@ static int _open_seekable(OggVorbis_File *vf){
   ogg_page og;
   
   /* is this even vorbis...? */
+  memset(&initial,0,sizeof(vorbis_info));
   ret=_fetch_headers(vf,&initial,&serialno);
   dataoffset=vf->offset;
   ogg_stream_clear(&vf->os);
@@ -768,13 +771,13 @@ int ov_pcm_seek(OggVorbis_File *vf,size64 pos){
       }
     
       _seek_helper(vf,bisect);
-      ret=_get_next_page(vf,&og,-1);
+      ret=_get_next_page(vf,&og,end-bisect);
       
       if(ret==-1){
        end=bisect;
       }else{
        size64 frameno=ogg_page_frameno(&og);
-       if(ogg_page_serialno(&og)==vf->serialnos[link] && frameno<target){
+       if(frameno<target){
          best=ret;  /* raw offset of packet with frameno */ 
          begin=vf->offset; /* raw offset of next packet */
        }else{