[xiph-commits] r17572 - trunk/Tremor

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-10-27 07:53:14 -0700 (Wed, 27 Oct 2010)
New Revision: 17572

Modified:
   trunk/Tremor/vorbisfile.c
Log:
Fix for Trac #1578; alter open1 so that serialnos[0] and 
vf->current_serialno matches on return.



Modified: trunk/Tremor/vorbisfile.c
===================================================================
--- trunk/Tremor/vorbisfile.c	2010-10-27 13:28:20 UTC (rev 17571)
+++ trunk/Tremor/vorbisfile.c	2010-10-27 14:53:14 UTC (rev 17572)
@@ -910,7 +910,7 @@
        for second stage of seekable stream open; this saves having to
        seek/reread first link's serialnumber data then. */
     vf->serialnos=_ogg_calloc(serialno_list_size+2,sizeof(*vf->serialnos));
-    vf->serialnos[0]=vf->current_serialno;
+    vf->serialnos[0]=vf->current_serialno=vf->os.serialno;
     vf->serialnos[1]=serialno_list_size;
     memcpy(vf->serialnos+2,serialno_list,serialno_list_size*sizeof(*vf->serialnos));
 
@@ -918,7 +918,6 @@
     vf->dataoffsets=_ogg_calloc(1,sizeof(*vf->dataoffsets));
     vf->offsets[0]=0;
     vf->dataoffsets[0]=vf->offset;
-    vf->current_serialno=vf->os.serialno;
 
     vf->ready_state=PARTOPEN;
   }