From 22e7dba47e27d130a2720ea9ca256867fa67ee21 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Sun, 13 Nov 2005 19:56:08 +0000
Subject: [PATCH] fixed text field parsing

---
 lib/modules/swftools.c |   56 ++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 1099bc3..3aadf8d 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -629,39 +629,39 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    advancebits = swf_GetU8(tag); //advancebits
 	    while(1) {
 		U16 flags;
+		int t;
 		swf_ResetReadBits(tag);
 		flags = swf_GetBits(tag, 8);
 		if(!flags) break;
-		if(flags & 128) // text style record
-		{
+		
+		swf_ResetReadBits(tag);
+		if(flags & 8) { // hasfont
+		    callback(tag, tag->pos + base, callback_data);
+		    id = swf_GetU16(tag);
+		}
+		if(flags & 4) { // hascolor
+		    if(num==1) swf_GetRGB(tag, NULL);
+		    else       swf_GetRGBA(tag, NULL);
+		}
+		if(flags & 2) { //has x offset
 		    swf_ResetReadBits(tag);
-		    if(flags & 8) { // hasfont
-			callback(tag, tag->pos + base, callback_data);
-			id = swf_GetU16(tag);
-		    }
-		    if(flags & 4) { // hascolor
-			if(num==1) swf_GetRGB(tag, NULL);
-			else       swf_GetRGBA(tag, NULL);
-		    }
-		    if(flags & 2) { //has x offset
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		    if(flags & 1) { //has y offset
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		    if(flags & 8) { //has height
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		} else { // glyph record
-		    int t;
+		    swf_GetU16(tag);
+		}
+		if(flags & 1) { //has y offset
 		    swf_ResetReadBits(tag);
-		    for(t=0;t<flags;t++) {
-			swf_GetBits(tag, glyphbits);
-			swf_GetBits(tag, advancebits);
-		    }
+		    swf_GetU16(tag);
+		}
+		if(flags & 8) { //has height
+		    swf_ResetReadBits(tag);
+		    swf_GetU16(tag);
+		}
+		
+		flags = swf_GetBits(tag, 8);
+		if(!flags) break;
+		swf_ResetReadBits(tag);
+		for(t=0;t<flags;t++) {
+		    swf_GetBits(tag, glyphbits);
+		    swf_GetBits(tag, advancebits);
 		}
 	    }
 	    break;
-- 
1.7.10.4