fixed segfault in float printing

[swftools.git] / lib / as3 / pool.c

diff --git a/lib/as3/pool.c b/lib/as3/pool.c
index b3b413f..6ce37d3 100644 (file)
--- a/lib/as3/pool.c
+++ b/lib/as3/pool.c
@@ -172,7 +172,7 @@ char*escape_string(const char*str)
     return newstr;
 }
 
-char* namespace_to_string(namespace_t*ns)
+char* namespace_tostring(namespace_t*ns)
 {
     if(!ns)
         return strdup("NULL");
@@ -211,6 +211,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;
@@ -335,7 +336,7 @@ namespace_set_t* namespace_set_new()
     set->namespaces = list_new();
     return set;
 }
-char* namespace_set_to_string(namespace_set_t*set)
+char* namespace_set_tostring(namespace_set_t*set)
 {
     if(!set)
         return strdup("NULL");
@@ -348,7 +349,7 @@ char* namespace_set_to_string(namespace_set_t*set)
     int l = 0;
     namespace_list_t*lns = set->namespaces;
     while(lns) {
-        char*s = namespace_to_string(lns->namespace);
+        char*s = namespace_tostring(lns->namespace);
         l += strlen(s)+1;
         free(s);
         lns = lns->next;
@@ -357,7 +358,7 @@ char* namespace_set_to_string(namespace_set_t*set)
     strcpy(desc, "{");
     lns = set->namespaces;
     while(lns) {
-        char*s = namespace_to_string(lns->namespace);
+        char*s = namespace_tostring(lns->namespace);
         strcat(desc, s);
         free(s);
         lns = lns->next;
@@ -444,7 +445,11 @@ multiname_t* multiname_new(namespace_t*ns, const char*name)
 {
     NEW(multiname_t,m);
     m->type = QNAME;
-    m->ns = namespace_clone(ns);
+    if(!ns) {
+        m->ns = namespace_new_packageinternal("");
+    } else {
+        m->ns = namespace_clone(ns);
+    }
     m->name = strdup(name);
     return m;
 }
@@ -468,7 +473,7 @@ multiname_t* multiname_clone(multiname_t*other)
 char* access2str(int type)
 {
     if(type==0x08) return "access08";
-    else if(type==0x16) return "package";
+    else if(type==0x16) return "public";
     else if(type==0x17) return "packageinternal";
     else if(type==0x18) return "protected";
     else if(type==0x19) return "explicit";
@@ -497,7 +502,7 @@ char multiname_late_name(multiname_t*m)
            m->type==MULTINAMEL || m->type==MULTINAMELA;
 }
 
-char* multiname_to_string(multiname_t*m)
+char* multiname_tostring(multiname_t*m)
 {
     char*mname = 0;
     if(!m)
@@ -533,7 +538,7 @@ char* multiname_to_string(multiname_t*m)
     } else if(m->type==RTQNAMELA) {
         mname = strdup("<rt,l,attr>");
     } else if(m->type==MULTINAME || m->type==MULTINAMEA) {
-        char*s = namespace_set_to_string(m->namespace_set);
+        char*s = namespace_set_tostring(m->namespace_set);
         mname = malloc(strlen(s)+namelen+16);
         if(m->type == MULTINAME)
             strcpy(mname,"<multi>");
@@ -544,7 +549,7 @@ char* multiname_to_string(multiname_t*m)
         strcat(mname, name);
         free(s);
     } else if(m->type==MULTINAMEL || m->type==MULTINAMELA) {
-        char*s = namespace_set_to_string(m->namespace_set);
+        char*s = namespace_set_tostring(m->namespace_set);
         mname = malloc(strlen(s)+16);
         if(m->type == MULTINAMEL)
             strcpy(mname,"<l,multi>");
@@ -711,13 +716,13 @@ constant_t* constant_fromindex(pool_t*pool, int index, int type)
     }
     return c;
 }
-char* constant_to_string(constant_t*c)
+char* constant_tostring(constant_t*c)
 {
     if(!c)
         return 0;
-    char buf[30];
+    char buf[32];
     if(NS_TYPE(c->type)) {
-        return namespace_to_string(c->ns);
+        return namespace_tostring(c->ns);
     } else if(c->type == CONSTANT_INT) {
         sprintf(buf, "%d", c->i);
         return strdup(buf);
@@ -725,6 +730,7 @@ char* constant_to_string(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) {
@@ -808,7 +814,8 @@ int pool_register_float(pool_t*p, double d)
 int pool_register_string(pool_t*pool, const char*s)
 {
     if(!s) return 0;
-    int pos = array_append_if_new(pool->x_strings, s, 0);
+    ptroff_t l = strlen(s);
+    int pos = array_append_if_new(pool->x_strings, s, (void*)l);
     assert(pos!=0);
     return pos;
 }
@@ -830,9 +837,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;
 }
@@ -880,7 +884,7 @@ int pool_find_namespace(pool_t*pool, namespace_t*ns)
         return 0;
     int i = array_find(pool->x_namespaces, ns);
     if(i<=0) {
-        char*s = namespace_to_string(ns);
+        char*s = namespace_tostring(ns);
         fprintf(stderr, "Couldn't find namespace \"%s\" %08x in constant pool\n", s, ns);
         free(s);
         return 0;
@@ -893,7 +897,7 @@ int pool_find_namespace_set(pool_t*pool, namespace_set_t*set)
         return 0;
     int i = array_find(pool->x_namespace_sets, set);
     if(i<=0) {
-        char*s = namespace_set_to_string(set);
+        char*s = namespace_set_tostring(set);
         fprintf(stderr, "Couldn't find namespace_set \"%s\" in constant pool\n", s);
         free(s);
         return 0;
@@ -917,7 +921,7 @@ int pool_find_multiname(pool_t*pool, multiname_t*name)
         return 0;
     int i = array_find(pool->x_multinames, name);
     if(i<=0) {
-        char*s = multiname_to_string(name);
+        char*s = multiname_tostring(name);
         fprintf(stderr, "Couldn't find multiname \"%s\" in constant pool\n", s);
         free(s);
         return 0;
@@ -944,6 +948,12 @@ char*pool_lookup_string(pool_t*pool, int i)
 {
     return (char*)array_getkey(pool->x_strings, i);
 }
+string_t pool_lookup_string2(pool_t*pool, int i)
+{
+    char*s = (char*)array_getkey(pool->x_strings, i);
+    int len = (int)(ptroff_t)array_getvalue(pool->x_strings, i);
+    return string_new(s,len);
+}
 namespace_t*pool_lookup_namespace(pool_t*pool, int i)
 {
     return (namespace_t*)array_getkey(pool->x_namespaces, i);
@@ -990,7 +1000,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);
     }
@@ -998,7 +1008,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);
     }
@@ -1018,7 +1028,7 @@ void pool_read(pool_t*pool, TAG*tag)
        char*s = malloc(len+1);
        swf_GetBlock(tag, s, len);
        s[len] = 0;
-       array_append(pool->x_strings, s, 0);
+       array_append(pool->x_strings, s, (void*)(ptroff_t)len);
         free(s);
        DEBUG printf("%d) \"%s\"\n", t, pool->x_strings->d[t].name);
     }
@@ -1032,7 +1042,7 @@ void pool_read(pool_t*pool, TAG*tag)
             name = array_getkey(pool->x_strings, namenr);
         namespace_t*ns = namespace_new(type, name);
        array_append(pool->x_namespaces, ns, 0);
-       DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_to_string(ns));
+       DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_tostring(ns));
         namespace_destroy(ns);
     }
     int num_sets = swf_GetU30(tag);
@@ -1050,7 +1060,7 @@ void pool_read(pool_t*pool, TAG*tag)
             list_append(nsset->namespaces, namespace_clone(ns));
         }
         array_append(pool->x_namespace_sets, nsset, 0);
-        DEBUG printf("set %d) %s\n", t, namespace_set_to_string(nsset));
+        DEBUG printf("set %d) %s\n", t, namespace_set_tostring(nsset));
         namespace_set_destroy(nsset);
     }
 
@@ -1083,7 +1093,7 @@ void pool_read(pool_t*pool, TAG*tag)
        } else {
            printf("can't parse type %d multinames yet\n", m.type);
        }
-        DEBUG printf("multiname %d) %s\n", t, multiname_to_string(&m));
+        DEBUG printf("multiname %d) %s\n", t, multiname_tostring(&m));
        array_append(pool->x_multinames, &m, 0);
     }
 } 
@@ -1121,7 +1131,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);
@@ -1132,11 +1142,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++) {
@@ -1145,7 +1155,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++) {