X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fpool.c;h=56007cc9776a7cc780bf47b990e5f207f9125895;hb=b90a862675445a668b49221a4ac2ead441b9d153;hp=ffea0e6b2c053361be114f7923d899cc268730ca;hpb=8d78dadd6a8cd35d085109414a9aa4a1fa9e9d8e;p=swftools.git

diff --git a/lib/as3/pool.c b/lib/as3/pool.c
index ffea0e6..56007cc 100644
--- a/lib/as3/pool.c
+++ b/lib/as3/pool.c
@@ -180,8 +180,14 @@ char* namespace_tostring(namespace_t*ns)
     U8 type = ns->access;
     access = access2str(type);
     char*s = escape_string(ns->name);
-    char*string = (char*)malloc(strlen(access)+strlen(s)+3);
-    int l = sprintf(string, "[%s]%s", access, s);
+    char*string = (char*)malloc(strlen(access)+strlen(s)+7);
+    if(!s)
+        sprintf(string, "[%s]NULL", access, s);
+    else if(!*s)
+        sprintf(string, "[%s]\"\"", access, s);
+    else 
+        sprintf(string, "[%s]", access, s);
+
     free(s);
     return string;
 }
@@ -211,6 +217,7 @@ namespace_t* namespace_fromstring(const char*name)
             if(!strcmp(a, "")) access=0x16;
             else if(!strcmp(a, "undefined")) access=0x08; // public??
             else if(!strcmp(a, "package")) access=0x16;
+            else if(!strcmp(a, "public")) access=0x16;
             else if(!strcmp(a, "packageinternal")) access=0x17;
             else if(!strcmp(a, "protected")) access=0x18;
             else if(!strcmp(a, "explicit")) access=0x19;
@@ -471,8 +478,8 @@ multiname_t* multiname_clone(multiname_t*other)
 
 char* access2str(int type)
 {
-    if(type==0x08) return "access08";
-    else if(type==0x16) return "package";
+    if(type==0x08) return "namespace";
+    else if(type==0x16) return "public";
     else if(type==0x17) return "packageinternal";
     else if(type==0x18) return "protected";
     else if(type==0x19) return "explicit";
@@ -610,6 +617,7 @@ void multiname_destroy(multiname_t*m)
         if(m->namespace_set) {
             namespace_set_destroy(m->namespace_set);m->namespace_set = 0;
         }
+        m->type=0;
         free(m);
     }
 }
@@ -653,7 +661,14 @@ constant_t* constant_new_float(double f)
 constant_t* constant_new_string(char*s)
 {
     NEW(constant_t,c);
-    c->s = strdup(s);
+    c->s = string_new4(s);
+    c->type = CONSTANT_STRING;
+    return c;
+}
+constant_t* constant_new_string2(const char*s, int len)
+{
+    NEW(constant_t,c);
+    c->s = string_new3(s, len);
     c->type = CONSTANT_STRING;
     return c;
 }
@@ -707,7 +722,8 @@ constant_t* constant_fromindex(pool_t*pool, int index, int type)
     } else if(c->type == CONSTANT_FLOAT) {
         c->f = pool_lookup_float(pool, index);
     } else if(c->type == CONSTANT_STRING) {
-        c->s = strdup(pool_lookup_string(pool, index));
+        string_t s = pool_lookup_string2(pool, index);
+        c->s = string_dup3(&s);
     } else if(UNIQUE_CONSTANT(c->type)) {
         // ok
     } else {
@@ -719,7 +735,7 @@ char* constant_tostring(constant_t*c)
 {
     if(!c)
         return 0;
-    char buf[30];
+    char buf[32];
     if(NS_TYPE(c->type)) {
         return namespace_tostring(c->ns);
     } else if(c->type == CONSTANT_INT) {
@@ -729,10 +745,12 @@ char* constant_tostring(constant_t*c)
         sprintf(buf, "%u", c->u);
         return strdup(buf);
     } else if(c->type == CONSTANT_FLOAT) {
+        char buf[1024];
         sprintf(buf, "%f", c->f);
         return strdup(buf);
     } else if(c->type == CONSTANT_STRING) {
-        return strdup(c->s);
+        /* should we escape the string? \0 bytes won't be printed */
+        return strdup_n(c->s->str,c->s->len);
     } else if(c->type == CONSTANT_TRUE) {
         return strdup("true");
     } else if(c->type == CONSTANT_FALSE) {
@@ -770,7 +788,7 @@ int constant_get_index(pool_t*pool, constant_t*c)
     } else if(c->type == CONSTANT_FLOAT) {
         return pool_register_float(pool, c->f);
     } else if(c->type == CONSTANT_STRING) {
-        return pool_register_string(pool, c->s);
+        return pool_register_string2(pool, c->s);
     } else if(!constant_has_index(c)) {
         return 1;
     } else {
@@ -783,7 +801,7 @@ void constant_free(constant_t*c)
     if(!c)
         return;
     if(c->type == CONSTANT_STRING) {
-        free(c->s);c->s=0;
+        string_free(c->s);
     } else if (NS_TYPE(c->type)) {
         namespace_destroy(c->ns);c->ns=0;
     }
@@ -809,9 +827,17 @@ int pool_register_float(pool_t*p, double d)
     assert(pos!=0);
     return pos;
 }
-int pool_register_string(pool_t*pool, const char*s)
+int pool_register_string(pool_t*pool, const char*str)
 {
-    if(!s) return 0;
+    if(!str) return 0;
+    string_t s = string_new2(str);
+    int pos = array_append_if_new(pool->x_strings, &s, 0);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_string2(pool_t*pool, string_t*s)
+{
+    if(!s || !s->str) return 0;
     int pos = array_append_if_new(pool->x_strings, s, 0);
     assert(pos!=0);
     return pos;
@@ -834,9 +860,6 @@ int pool_register_multiname(pool_t*pool, multiname_t*n)
 {
     if(!n) return 0;
     int pos = array_append_if_new(pool->x_multinames, n, 0);
-    if(pos==0) {
-        *(int*)0=0xdead;
-    }
     assert(pos!=0);
     return pos;
 }
@@ -904,11 +927,12 @@ int pool_find_namespace_set(pool_t*pool, namespace_set_t*set)
     }
     return i;
 }
-int pool_find_string(pool_t*pool, const char*s)
+int pool_find_string(pool_t*pool, const char*str)
 {
-    if(!s)
+    if(!str)
         return 0;
-    int i = array_find(pool->x_strings, s);
+    string_t s = string_new2(str);
+    int i = array_find(pool->x_strings, &s);
     if(i<=0) {
         fprintf(stderr, "Couldn't find string \"%s\" in constant pool\n", s);
         return 0;
@@ -944,9 +968,16 @@ double pool_lookup_float(pool_t*pool, int i)
     if(!i) return __builtin_nan("");
     return *(double*)array_getkey(pool->x_floats, i);
 }
-char*pool_lookup_string(pool_t*pool, int i)
+const char*pool_lookup_string(pool_t*pool, int i)
 {
-    return (char*)array_getkey(pool->x_strings, i);
+    string_t*s = array_getkey(pool->x_strings, i);
+    if(!s) return 0;
+    return s->str;
+}
+string_t pool_lookup_string2(pool_t*pool, int i)
+{
+    string_t*s = array_getkey(pool->x_strings, i);
+    return *s;
 }
 namespace_t*pool_lookup_namespace(pool_t*pool, int i)
 {
@@ -968,7 +999,7 @@ pool_t*pool_new()
     p->x_ints = array_new2(&uint_type);
     p->x_uints = array_new2(&uint_type);
     p->x_floats = array_new2(&float_type);
-    p->x_strings = array_new2(&charptr_type);
+    p->x_strings = array_new2(&stringstruct_type);
     p->x_namespaces = array_new2(&namespace_type);
     p->x_namespace_sets = array_new2(&namespace_set_type);
     p->x_multinames = array_new2(&multiname_type);
@@ -994,7 +1025,7 @@ void pool_read(pool_t*pool, TAG*tag)
     DEBUG printf("%d ints\n", num_ints);
     int t;
     for(t=1;t<num_ints;t++) {
-        S32 v = swf_GetS30(tag);
+        S32 v = swf_GetABCS32(tag);
         DEBUG printf("int %d) %d\n", t, v);
         array_append(pool->x_ints, &v, 0);
     }
@@ -1002,7 +1033,7 @@ void pool_read(pool_t*pool, TAG*tag)
     int num_uints = swf_GetU30(tag);
     DEBUG printf("%d uints\n", num_uints);
     for(t=1;t<num_uints;t++) {
-        U32 v = swf_GetU30(tag);
+        U32 v = swf_GetABCU32(tag);
         DEBUG printf("uint %d) %d\n", t, v);
         array_append(pool->x_uints, &v, 0);
     }
@@ -1019,12 +1050,10 @@ void pool_read(pool_t*pool, TAG*tag)
     DEBUG printf("%d strings\n", num_strings);
     for(t=1;t<num_strings;t++) {
 	int len = swf_GetU30(tag);
-	char*s = malloc(len+1);
-	swf_GetBlock(tag, s, len);
-	s[len] = 0;
-	array_append(pool->x_strings, s, 0);
-        free(s);
-	DEBUG printf("%d) \"%s\"\n", t, pool->x_strings->d[t].name);
+        string_t s = string_new(&tag->data[tag->pos], len);
+	swf_GetBlock(tag, 0, len);
+	array_append(pool->x_strings, &s, 0);
+	DEBUG printf("%d) \"%s\"\n", t, ((string_t*)array_getkey(pool->x_strings, t))->str);
     }
     int num_namespaces = swf_GetU30(tag);
     DEBUG printf("%d namespaces\n", num_namespaces);
@@ -1033,7 +1062,7 @@ void pool_read(pool_t*pool, TAG*tag)
 	int namenr = swf_GetU30(tag);
 	const char*name = 0; 
         if(namenr)
-            name = array_getkey(pool->x_strings, namenr);
+            name = pool_lookup_string(pool, namenr);
         namespace_t*ns = namespace_new(type, name);
 	array_append(pool->x_namespaces, ns, 0);
 	DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_tostring(ns));
@@ -1069,17 +1098,17 @@ void pool_read(pool_t*pool, TAG*tag)
             m.ns = (namespace_t*)array_getkey(pool->x_namespaces, namespace_index);
             int name_index = swf_GetU30(tag);
             if(name_index) // 0 = '*' (any)
-	        m.name = array_getkey(pool->x_strings, name_index);
+	        m.name = pool_lookup_string(pool, name_index);
 	} else if(m.type==0x0f || m.type==0x10) {
             int name_index = swf_GetU30(tag);
             if(name_index) // 0 = '*' (any name)
-	        m.name = array_getkey(pool->x_strings, name_index);
+	        m.name = pool_lookup_string(pool, name_index);
 	} else if(m.type==0x11 || m.type==0x12) {
 	} else if(m.type==0x09 || m.type==0x0e) {
             int name_index = swf_GetU30(tag);
             int namespace_set_index = swf_GetU30(tag);
             if(name_index)
-	        m.name = array_getkey(pool->x_strings, name_index);
+	        m.name = pool_lookup_string(pool, name_index);
 	    m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
         } else if(m.type==0x1b || m.type==0x1c) {
             int namespace_set_index = swf_GetU30(tag);
@@ -1125,7 +1154,7 @@ void pool_write(pool_t*pool, TAG*tag)
             However when actually using zero strings as empty namespaces, the
             flash player breaks.*/
         //if(ns->name && ns->name[0])
-        array_append_if_new(pool->x_strings, ns->name, 0);
+        pool_register_string(pool, ns->name);
     }
 
     //pool_register_int(pool, 15);
@@ -1136,11 +1165,11 @@ void pool_write(pool_t*pool, TAG*tag)
     swf_SetU30(tag, pool->x_ints->num>1?pool->x_ints->num:0);
     for(t=1;t<pool->x_ints->num;t++) {
         S32 val = *(int*)array_getkey(pool->x_ints, t);
-        swf_SetS30(tag, val);
+        swf_SetABCS32(tag, val);
     }
     swf_SetU30(tag, pool->x_uints->num>1?pool->x_uints->num:0);
     for(t=1;t<pool->x_uints->num;t++) {
-        swf_SetU30(tag, *(unsigned int*)array_getkey(pool->x_uints, t));
+        swf_SetABCU32(tag, *(unsigned int*)array_getkey(pool->x_uints, t));
     }
     swf_SetU30(tag, pool->x_floats->num>1?pool->x_floats->num:0);
     for(t=1;t<pool->x_floats->num;t++) {
@@ -1149,7 +1178,8 @@ void pool_write(pool_t*pool, TAG*tag)
     }
     swf_SetU30(tag, pool->x_strings->num>1?pool->x_strings->num:0);
     for(t=1;t<pool->x_strings->num;t++) {
-	swf_SetU30String(tag, array_getkey(pool->x_strings, t));
+        string_t str = pool_lookup_string2(pool, t);
+	swf_SetU30String(tag, str.str, str.len);
     }
     swf_SetU30(tag, pool->x_namespaces->num>1?pool->x_namespaces->num:0);
     for(t=1;t<pool->x_namespaces->num;t++) {