else if(!*s)
sprintf(string, "[%s]\"\"", access, s);
else
- sprintf(string, "[%s]", access, s);
-
+ sprintf(string, "[%s]%s", access, s);
free(s);
return string;
}
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);
}
char*name = m->name?escape_string(m->name):strdup("*");
int namelen = strlen(name);
- if(m->type==QNAME || m->type==QNAMEA) {
+ if(m->type==QNAME || m->type==QNAMEA || m->type==POSTFIXTYPE) {
char*nsname = escape_string(m->ns->name);
mname = malloc(strlen(nsname)+namelen+32);
strcpy(mname, "<q");
strcat(mname,s);
free(s);
} else {
- fprintf(stderr, "Invalid multiname type: %02x\n", m->type);
+ return strdup("<invalid>");
}
free(name);
return mname;
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;t<array->num;t++) {
dict_put(array->entry2pos, array->d[t].name, (void*)(ptroff_t)(t+1));
}
+ d->key_type = old_type;
+
}
// ------------------------------- pool -------------------------------------
for(t=1;t<num_multinames;t++) {
multiname_t m;
memset(&m, 0, sizeof(multiname_t));
+
+ /*int s;
+ for(s=0;s<8;s++)
+ printf("0x%02x ", tag->data[tag->pos+s]);
+ printf("\n");*/
+
m.type = swf_GetU8(tag);
if(m.type==0x07 || m.type==0x0d) {
int namespace_index = swf_GetU30(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<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);
}