X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fpool.c;h=edd048bd633633acb981f34a5477ec33ab2260b6;hb=b6ebc39257e2814f08a17d8c179c3991c16053ba;hp=c158811526780a3bd0dd631502a2223b1e614a87;hpb=63632e88b59faf27683664213efe240d02fca66d;p=swftools.git diff --git a/lib/as3/pool.c b/lib/as3/pool.c index c158811..edd048b 100644 --- a/lib/as3/pool.c +++ b/lib/as3/pool.c @@ -136,7 +136,7 @@ char*escape_string(const char*str) if(!str) return strdup("NULL"); int len=0; - unsigned const char*s=str; + unsigned const char*s=(unsigned const char*)str; while(*s) { if(*s<10) { len+=2; // \d @@ -151,7 +151,7 @@ char*escape_string(const char*str) } char*newstr = malloc(len+1); char*dest = newstr; - s=str; + s=(unsigned const char*)str; while(*s) { if(*s<9) { dest+=sprintf(dest, "\\%d", *s); @@ -189,8 +189,7 @@ char* namespace_tostring(namespace_t*ns) else if(!*s) sprintf(string, "[%s]\"\"", access, s); else - sprintf(string, "[%s]", access, s); - + sprintf(string, "[%s]%s", access, s); free(s); return string; } @@ -251,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) { @@ -276,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); } @@ -488,6 +487,7 @@ char* access2str(int type) else if(type==0x19) return "explicit"; else if(type==0x1A) return "staticprotected"; else if(type==0x05) return "private"; + else if(type==0x00) return "any"; else { fprintf(stderr, "Undefined access type %02x\n", type); return "undefined"; @@ -522,15 +522,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, "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, "::"); @@ -567,7 +570,7 @@ char* multiname_tostring(multiname_t*m) strcat(mname,s); free(s); } else { - fprintf(stderr, "Invalid multiname type: %02x\n", m->type); + return strdup(""); } free(name); return mname; @@ -635,9 +638,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) @@ -661,7 +661,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); @@ -707,6 +707,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) { @@ -792,6 +804,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 { @@ -828,16 +844,24 @@ static int compare_arrayentry(const void*_c1, const void*_c2) const array_entry_t*c2 = _c2; return c2->data - c1->data; } + +static void* nodup(const void*o) {return (void*)o;} + static void reshuffle_array(array_t*array) { qsort(array->d+1, array->num-1, sizeof(array->d[0]), compare_arrayentry); - dict_t*d = dict_new2(array->entry2pos->key_type); + type_t* old_type = array->entry2pos->key_type; + type_t old_type_nodup = *old_type; + old_type_nodup.dup = nodup; + dict_t*d = dict_new2(&old_type_nodup); dict_destroy_shallow(array->entry2pos); array->entry2pos = d; int t; for(t=0;tnum;t++) { dict_put(array->entry2pos, array->d[t].name, (void*)(ptroff_t)(t+1)); } + d->key_type = old_type; + } // ------------------------------- pool ------------------------------------- @@ -879,7 +903,7 @@ int pool_register_namespace(pool_t*pool, namespace_t*ns) { if(!ns) return 0; int pos = array_append_or_increase(pool->x_namespaces, ns); - assert(pos!=0); + assert(pos!=0 || ns->access==ZERONAMESPACE); return pos; } int pool_register_namespace_set(pool_t*pool, namespace_set_t*set) @@ -939,7 +963,7 @@ int pool_find_namespace(pool_t*pool, namespace_t*ns) if(!ns) return 0; int i = array_find(pool->x_namespaces, ns); - if(i<=0) { + if(i<0) { char*s = namespace_tostring(ns); fprintf(stderr, "Couldn't find namespace \"%s\" %08x in constant pool\n", s, ns); free(s); @@ -1025,6 +1049,7 @@ multiname_t*pool_lookup_multiname(pool_t*pool, int i) return (multiname_t*)array_getkey(pool->x_multinames, i); } +static namespace_t zeronamespace={ZERONAMESPACE,"*"}; pool_t*pool_new() { NEW(pool_t, p); @@ -1043,7 +1068,7 @@ pool_t*pool_new() array_append(p->x_uints, 0, 0); array_append(p->x_floats, 0, 0); array_append(p->x_strings, 0, 0); - array_append(p->x_namespaces, 0, 0); + array_append(p->x_namespaces, &zeronamespace, 0); array_append(p->x_namespace_sets, 0, 0); array_append(p->x_multinames, 0, 0); return p; @@ -1094,7 +1119,7 @@ void pool_read(pool_t*pool, TAG*tag) DEBUG printf("%d strings\n", num_strings); for(t=1;tdata[tag->pos], len); + string_t s = string_new((char*)&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); @@ -1136,10 +1161,19 @@ void pool_read(pool_t*pool, TAG*tag) for(t=1;tdata[tag->pos+s]); + printf("\n");*/ + m.type = swf_GetU8(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); @@ -1157,6 +1191,12 @@ void pool_read(pool_t*pool, TAG*tag) } else if(m.type==0x1b || m.type==0x1c) { 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); //multiname + int v2 = swf_GetU30(tag); //counter? + int v3 = swf_GetU30(tag); //multiname + // e.g. Vector ... 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); }