bugfixes.

diff --git a/lib/modules/swfaction.c b/lib/modules/swfaction.c
index 135d026..fdd93d8 100644 (file)
--- a/lib/modules/swfaction.c
+++ b/lib/modules/swfaction.c
@@ -129,8 +129,8 @@ r: register (byte)
 {5,"Less2", 0x48,""},
 {6,"Greater", 0x67,""},
 {6,"StringGreater", 0x68,""},
-{6,"Enumerate2", 0x55,""}
-{6,"InstanceOf", 0x54,""}
+{6,"Enumerate2", 0x55,""},
+{6,"InstanceOf", 0x54,""},
 {6,"StrictEquals", 0x66,""}
 };
 static int definedactions = sizeof(actions)/sizeof(struct Action);

diff --git a/lib/modules/swfdump.c b/lib/modules/swfdump.c
index b07b021..92f1802 100644 (file)
--- a/lib/modules/swfdump.c
+++ b/lib/modules/swfdump.c
@@ -153,14 +153,14 @@ char* swf_TagGetName(TAG*tag)
            return "ENABLEDEBUGGER";
         case ST_REFLEX:
             return "REFLEX";
-        case ST_MX0:
-            return "MX0";
-        case ST_MX1:
-            return "MX1";
-        case ST_MX2:
-            return "MX2";
-        case ST_MX3:
-            return "MX3";
+        case ST_DOINITACTION:
+            return "DOINITACTION";
+        case ST_DEFINEVIDEOSTREAM:
+            return "DEFINEVIDEOSTREAM";
+        case ST_VIDEOFRAME:
+            return "VIDEOFRAME";
+        case ST_DEFINEFONTINFO2:
+            return "DEFINEFONTINFO2";
         case ST_MX4:
             return "MX4";
     }

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 7853dd4..9297be9 100644 (file)
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -145,7 +145,7 @@ int swf_FontExtract_DefineFontInfo(int id,SWFFONT * f,TAG * t)
        f->encoding |= FONT_ENCODING_UNICODE;
 
     if(t->id == ST_DEFINEFONTINFO2) {
-       f->language = swf_GetU8();
+       f->language = swf_GetU8(t);
     }
 
     f->glyph2ascii = (U16*)malloc(sizeof(U16)*f->numchars);

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 0178bf0..9b5c41a 100644 (file)
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -439,7 +439,6 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
        case ST_FREECHARACTER: /* unusual tags, which all start with an ID */
        case ST_NAMECHARACTER:
        case ST_GENERATORTEXT:
-       case ST_MX3:
            callback(tag, tag->pos + base, callback_data);
         break;
        case ST_PLACEOBJECT: