fixed two more mem leaks

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

diff --git a/lib/as3/abc.c b/lib/as3/abc.c
index d545a98..70e67ac 100644 (file)
--- a/lib/as3/abc.c
+++ b/lib/as3/abc.c
@@ -309,13 +309,15 @@ static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil
 
 static void dump_method(FILE*fo, const char*prefix, const char*type, const char*name, abc_method_t*m, abc_file_t*file)
 {
-    const char*return_type = "void";
+    char*return_type = 0;
     if(m->return_type)
         return_type = multiname_to_string(m->return_type);
-
+    else
+        return_type = strdup("void");
     char*paramstr = params_to_string(m->parameters);
-
     fprintf(fo, "%s%s %s %s=%s %s\n", prefix, type, return_type, name, m->name, paramstr);
+    free(paramstr);paramstr=0;
+    free(return_type);return_type=0;
 
     abc_method_body_t*c = m->body;
     if(!c) {
@@ -651,7 +653,7 @@ void* swf_ReadABC(TAG*tag)
         DEBUG printf("method %d) %s flags=%02x\n", t, params_to_string(m->parameters), m->flags);
 
         if(m->flags&0x08) {
-            /* optional parameters */
+            /* TODO optional parameters */
             int num = swf_GetU30(tag);
             int s;
             for(s=0;s<num;s++) {
@@ -857,6 +859,16 @@ void swf_WriteABC(TAG*abctag, void*code)
     for(t=0;t<file->method_bodies->num;t++) {
         abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
         m->index = t;
+        exception_list_t*ee = m->exceptions;
+        while(ee) {
+            exception_t*e=ee->exception;ee->exception=0;
+            e->from = e->to = e->target = 0;
+            multiname_destroy(e->exc_type);e->exc_type=0;
+            multiname_destroy(e->var_name);e->var_name=0;
+            free(e);
+            ee=ee->next;
+        }
+        list_free(m->exceptions);m->exceptions=0;
     }
 
     for(t=0;t<file->methods->num;t++) {