[xiph-commits] r13217 - trunk/vorbis/lib

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-07-03 22:13:33 -0700 (Tue, 03 Jul 2007)
New Revision: 13217

Modified:
   trunk/vorbis/lib/vorbisfile.c
Log:
Well.  *that* deadlock bug has been lurking in seeking for a long time.  
A bigger chunksize + just the right annodex file finally reproduced it 
here.



Modified: trunk/vorbis/lib/vorbisfile.c
===================================================================
--- trunk/vorbis/lib/vorbisfile.c	2007-07-04 05:09:19 UTC (rev 13216)
+++ trunk/vorbis/lib/vorbisfile.c	2007-07-04 05:13:33 UTC (rev 13217)
@@ -511,12 +511,11 @@
 	    vorbis_comment_clear(vf->vc+i);
 	    break;
 	  }
-	  if(ogg_page_serialno(&og)!=vf->serialnos[i])
-	    continue;
-
-	  if(ogg_page_granulepos(&og)!=-1){
-	    vf->pcmlengths[i*2+1]=ogg_page_granulepos(&og)-vf->pcmlengths[i*2];
-	    break;
+	  if(ogg_page_serialno(&og)==vf->serialnos[i]){
+	    if(ogg_page_granulepos(&og)!=-1){
+	      vf->pcmlengths[i*2+1]=ogg_page_granulepos(&og)-vf->pcmlengths[i*2];
+	      break;
+	    }
 	  }
 	  vf->offset=ret;
 	}
@@ -1356,7 +1355,7 @@
 		result=_seek_helper(vf,bisect);
 		if(result) goto seek_error;
 	      }else{
-		end=result;
+		end=bisect;
 		endtime=granulepos;
 		break;
 	      }