X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Ffiles.c;h=8b951d9149a9a31362be65c82262f66e1eaf5952;hb=802358aa95688439e3acc0444951ea11a7b1f051;hp=52e1552caa7348f1947745ab2f6c153c6c503ccb;hpb=fff0629f8e37e5a94549502096bf595f19339547;p=swftools.git

diff --git a/lib/as3/files.c b/lib/as3/files.c
index 52e1552..8b951d9 100644
--- a/lib/as3/files.c
+++ b/lib/as3/files.c
@@ -148,6 +148,8 @@ char*find_file(char*filename)
 
 char*enter_file(char*filename, void*state)
 {
+    filename = strdup(filename);
+
     if(include_stack_ptr >= MAX_INCLUDE_DEPTH) {
     	as3_error("Includes nested too deeply");
 	exit(1);
@@ -165,7 +167,7 @@ char*enter_file(char*filename, void*state)
     include_stack[include_stack_ptr] = state;
     line_stack[include_stack_ptr] = current_line;
     column_stack[include_stack_ptr] = current_column;
-    shortfilename_stack[include_stack_ptr] = current_filename_short = strdup(filename);
+    shortfilename_stack[include_stack_ptr] = current_filename_short;
     filename_stack[include_stack_ptr] = current_filename;
     includedir_stack[include_stack_ptr] = current_include_dirs;
     add_include_dir(get_path(fullfilename));
@@ -175,20 +177,21 @@ char*enter_file(char*filename, void*state)
 
     current_line=1;
     current_column=0;
-    current_filename=fullfilename;
+    current_filename = fullfilename;
+    current_filename_short = filename;
     return fullfilename;
 }
 
 void* leave_file()
 {
     dbg("leaving file %s", current_filename);
-    if(--include_stack_ptr<0) {
+    if(--include_stack_ptr<=0) {
         return 0;
     } else {
-        current_column = column_stack[include_stack_ptr];
-        current_line = line_stack[include_stack_ptr];
         free(current_filename);current_filename = filename_stack[include_stack_ptr];
         free(current_filename_short);current_filename_short = shortfilename_stack[include_stack_ptr];
+        current_column = column_stack[include_stack_ptr];
+        current_line = line_stack[include_stack_ptr];
         current_include_dirs = includedir_stack[include_stack_ptr];
         return include_stack[include_stack_ptr];
     }