shithub: libtags

Download patch

ref: 7e5799e354cf5d92b1017433884ff44018e0d715
parent: 54dcc13cc3bae0b07d5f5d52c0d0efbcd5b833fb
author: Sigrid Solveig Haflínudóttir <[email protected]>
date: Mon Jun 1 10:11:53 EDT 2020 

vorbis: skip trying to read tags when there is none


--- a/vorbis.c
+++ b/vorbis.c
@@ -71,34 +71,37 @@
 		ctx->seek(ctx, sz-1, 1);
 	}
 
-	if(ctx->read(ctx, &d[1], 10) != 10 || memcmp(&d[1], "vorbis", 6) != 0)
-		return -1;
-	sz = leuint(&d[7]);
-	if(ctx->seek(ctx, sz, 1) < 0 || ctx->read(ctx, h, 4) != 4)
-		return -1;
-	numtags = leuint(h);
-
-	for(i = 0; i < numtags; i++){
-		if(ctx->read(ctx, h, 4) != 4)
+	if(npages < 3) {
+		if(ctx->read(ctx, &d[1], 10) != 10 || memcmp(&d[1], "vorbis", 6) != 0)
 			return -1;
-		if((sz = leuint(h)) < 0)
+		sz = leuint(&d[7]);
+		if(ctx->seek(ctx, sz, 1) < 0 || ctx->read(ctx, h, 4) != 4)
 			return -1;
+		numtags = leuint(h);
 
-		if(ctx->bufsz < sz+1){
-			if(ctx->seek(ctx, sz, 1) < 0)
+		for(i = 0; i < numtags; i++){
+			if(ctx->read(ctx, h, 4) != 4)
 				return -1;
-			continue;
-		}
-		if(ctx->read(ctx, ctx->buf, sz) != sz)
-			return -1;
-		ctx->buf[sz] = 0;
+			if((sz = leuint(h)) < 0)
+				return -1;
 
-		if((v = strchr(ctx->buf, '=')) == nil)
-			return -1;
-		*v++ = 0;
-		cbvorbiscomment(ctx, ctx->buf, v);
+			if(ctx->bufsz < sz+1){
+				if(ctx->seek(ctx, sz, 1) < 0)
+					return -1;
+				continue;
+			}
+			if(ctx->read(ctx, ctx->buf, sz) != sz)
+				return -1;
+			ctx->buf[sz] = 0;
+
+			if((v = strchr(ctx->buf, '=')) == nil)
+				return -1;
+			*v++ = 0;
+			cbvorbiscomment(ctx, ctx->buf, v);
+		}
 	}
 
+notags:
 	/* calculate the duration */
 	if(ctx->samplerate > 0){
 		sz = ctx->bufsz <= 4096 ? ctx->bufsz : 4096;