X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fpool.c;h=2402328df8535ba010a37ff9627faa1ba41b6b7c;hb=5ac80872f927e25921a47b3a39eed2cd9edc03d2;hp=54609d0f23bcc3485c4644d4604f6f6b276d16a1;hpb=9ee97b0258700c746404edfcd9640a0a327eb21f;p=swftools.git

diff --git a/lib/as3/pool.c b/lib/as3/pool.c
index 54609d0..2402328 100644
--- a/lib/as3/pool.c
+++ b/lib/as3/pool.c
@@ -250,7 +250,7 @@ namespace_t* namespace_new(U8 access, const char*name)
     ns->name = name?strdup(name):0;
     return ns;
 }
-namespace_t* namespace_new_undefined(const char*name) {
+namespace_t* namespace_new_namespace(const char*name) {
     return namespace_new(0x08, name); // public?
 }
 namespace_t* namespace_new_package(const char*name) {
@@ -275,7 +275,7 @@ namespace_t* namespace_new_private(const char*name) {
 void namespace_destroy(namespace_t*n)
 {
     if(n) {
-        free(n->name);n->name=0;
+        free((char*)n->name);n->name=0;
         n->access=0x00;
         free(n);
     }
@@ -521,15 +521,18 @@ char* multiname_tostring(multiname_t*m)
     char*name = m->name?escape_string(m->name):strdup("*");
     int namelen = strlen(name);
 
-    if(m->type==QNAME || m->type==QNAMEA) {
-        char*nsname = escape_string(m->ns->name);
+    if(m->type==QNAME || m->type==QNAMEA || m->type==POSTFIXTYPE) {
+        char*nsname = m->ns?escape_string(m->ns->name):strdup("NULL");
         mname = malloc(strlen(nsname)+namelen+32);
         strcpy(mname, "<q");
         if(m->type == QNAMEA)
             strcat(mname, ",attr");
-        strcat(mname, ">[");
-        strcat(mname,access2str(m->ns->access));
-        strcat(mname, "]");
+	strcat(mname, ">");
+	if(m->ns) {
+	    strcat(mname,"[");
+	    strcat(mname,access2str(m->ns->access));
+	    strcat(mname, "]");
+	}
         strcat(mname, nsname);
         free(nsname);
         strcat(mname, "::");
@@ -634,9 +637,6 @@ type_t multiname_type = {
 
 // ------------------------------- constants -------------------------------------
 
-#define NS_TYPE(x) ((x) == 0x08 || (x) == 0x16 || (x) == 0x17 || (x) == 0x18 ||  \
-                                   (x) == 0x19 || (x) == 0x1a || (x) == 0x05)
-
 #define UNIQUE_CONSTANT(x) ((x) == CONSTANT_TRUE || (x) == CONSTANT_FALSE || (x) == CONSTANT_NULL || (x) == CONSTANT_UNDEFINED)
 
 constant_t* constant_new_int(int i) 
@@ -660,7 +660,7 @@ constant_t* constant_new_float(double f)
     c->type = CONSTANT_FLOAT;
     return c;
 }
-constant_t* constant_new_string(char*s)
+constant_t* constant_new_string(const char*s)
 {
     NEW(constant_t,c);
     c->s = string_new4(s);
@@ -706,6 +706,18 @@ constant_t* constant_new_undefined()
     c->type = CONSTANT_UNDEFINED;
     return c;
 }
+constant_t* constant_clone(constant_t*other)
+{
+    if(!other) return 0;
+    constant_t*c = malloc(sizeof(constant_t));
+    memcpy(c, other, sizeof(constant_t));
+    if(NS_TYPE(c->type)) {
+        c->ns = namespace_clone(other->ns);
+    } else if(c->type == CONSTANT_STRING) {
+        c->s = string_dup3(other->s);
+    }
+    return c;
+}
 constant_t* constant_fromindex(pool_t*pool, int index, int type)
 {
     if(!index) {
@@ -791,6 +803,10 @@ int constant_get_index(pool_t*pool, constant_t*c)
         return pool_register_float(pool, c->f);
     } else if(c->type == CONSTANT_STRING) {
         return pool_register_string2(pool, c->s);
+    } else if(c->type == CONSTANT_UNDEFINED) {
+        /* write undefined with index 0 (and no type). Otherwise, the FlashPlayer 
+           seems to throw an "attempt to read out of bounds" exception */
+        return 0;
     } else if(!constant_has_index(c)) {
         return 1;
     } else {
@@ -1153,6 +1169,9 @@ void pool_read(pool_t*pool, TAG*tag)
 	if(m.type==0x07 || m.type==0x0d) {
 	    int namespace_index = swf_GetU30(tag);
             m.ns = (namespace_t*)array_getkey(pool->x_namespaces, namespace_index);
+	    if(!m.ns) {
+		fprintf(stderr, "Error: Illegal reference to namespace #%d in constant pool.\n", namespace_index);
+	    }
             int name_index = swf_GetU30(tag);
             if(name_index) // 0 = '*' (any)
 	        m.name = pool_lookup_string(pool, name_index);
@@ -1171,16 +1190,11 @@ void pool_read(pool_t*pool, TAG*tag)
             int namespace_set_index = swf_GetU30(tag);
 	    m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
         } else if(m.type==0x1d) {
-            int v1 = swf_GetU30(tag);
-            int v2 = swf_GetU30(tag);
-            int v3 = swf_GetU30(tag);
-            //printf("%02x %02x %02x\n", v1, v2, v3);
-            m.type = 0x07;
-            m.namespace_set = 0;
-            m.name = pool_lookup_string(pool, v1);
-            m.ns = pool_lookup_namespace(pool, v2);
-            /* not sure what to do with v3-
-               it's definitely not a namespace */
+            int v1 = swf_GetU30(tag); //multiname
+            int v2 = swf_GetU30(tag); //counter?
+            int v3 = swf_GetU30(tag); //multiname
+            // e.g. Vector<int> ... we only store the parent object
+            m = *(multiname_t*)array_getkey(pool->x_multinames, v1);
 	} else {
 	    printf("can't parse type %d multinames yet\n", m.type);
 	}