X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fmodules%2Fswfaction.c;h=3906f6c482edbdc5f5641891f0e864f03ab1d10a;hp=7c6fb1de57c6dd125105bc07bc593b54d46494a0;hb=58e7d89f8115525c32a0e3f3f4e5501c6a17186d;hpb=ad7252d51098ee5092f2732d6dbed15017d9950c diff --git a/lib/modules/swfaction.c b/lib/modules/swfaction.c index 7c6fb1d..3906f6c 100644 --- a/lib/modules/swfaction.c +++ b/lib/modules/swfaction.c @@ -155,8 +155,10 @@ ActionTAG* swf_ActionGet(TAG*tag) while(op) { action->next = (ActionTAG*)malloc(sizeof(ActionTAG)); + memset(action->next, 0, sizeof(ActionTAG)); action->next->prev = action; action->next->next = 0; + action->next->parent = tmp.next; action = action->next; op = swf_GetU8(tag); @@ -180,6 +182,16 @@ ActionTAG* swf_ActionGet(TAG*tag) void swf_ActionFree(ActionTAG*action) { + if(!action) { + fprintf(stderr, "Warning: freeing zero action"); + return; + } + action = action->parent; + if(!action) { + fprintf(stderr, "Warning: freeing zero action (no parent)"); + return; + } + while(action) { ActionTAG*tmp; @@ -1039,6 +1051,32 @@ ActionTAG* action_DefineFunction(ActionTAG*atag, U8*data, int len) {return atag; ActionTAG* action_Constantpool(ActionTAG*atag, char* constantpool) {return atag;} ActionTAG* action_With(ActionTAG*atag, char*object) {return atag;} +#include "../action/actioncompiler.h" + +ActionTAG* swf_ActionCompile(const char* source, int version) +{ + TAG* tag; + ActionTAG* a = 0; + void*buffer = 0; + int len = 0; + int ret; + + tag = swf_InsertTag(NULL, ST_DOACTION); + ret = compileSWFActionCode(source, version, &buffer, &len); + if(!ret || buffer==0 || len == 0) + return 0; + + swf_SetBlock(tag, buffer, len); + swf_SetU8(tag, 0); + + free(buffer); + + a = swf_ActionGet(tag); + swf_DeleteTag(tag); + return a; +} + + /* Properties: