Fix: bailing when error file could not be opened causes memory leak

src/main.c

@@ -16,6 +16,7 @@ static bool read_options( struct options*, char** );
 static void strip_rslash( char* );
 static bool source_object_files_same( struct options* );
 static void print_usage( char* );
+static bool perform_action( struct options* options, jmp_buf* root_bail );
 static void perform_task( struct task* task );
 static void perform_selected_task( struct task* task, struct cache* cache );
 static void print_cache( struct task* task, struct cache* cache );
@@ -87,11 +88,9 @@ int main( int argc, char* argv[] ) {
    }
    jmp_buf bail;
    if ( setjmp( bail ) == 0 ) {
-      struct task task;
-      t_init( &task, &options, &bail );
-      perform_task( &task );
-      t_deinit( &task );
-      result = EXIT_SUCCESS;
+      if ( perform_action( &options, &bail ) ) {
+         result = EXIT_SUCCESS;
+      }
    }
    deinit_object_file:
    str_deinit( &compiler_dir );
@@ -354,6 +353,21 @@ void print_usage( char* path ) {
       path );
 }
 
+bool perform_action( struct options* options, jmp_buf* root_bail ) {
+   bool success = false;
+   struct task task;
+   t_init( &task, options, root_bail );
+   jmp_buf bail;
+   if ( setjmp( bail ) == 0 ) {
+      task.bail = &bail;
+      perform_task( &task );
+      success = true;
+   }
+   task.bail = root_bail;
+   t_deinit( &task );
+   return success;
+}
+
 void perform_task( struct task* task ) {
    if ( task->options->cache.enable ) {
       struct cache cache;

src/parse/phase.c

@@ -3,6 +3,8 @@
 #include "phase.h"
 #include "cache/cache.h"
 
+static void run_phase( struct parse* parse );
+
 void p_init( struct parse* parse, struct task* task, struct cache* cache ) {
    parse->task = task;
    // NOTE: parse->queue not initialized.
@@ -42,6 +44,21 @@ void p_init( struct parse* parse, struct task* task, struct cache* cache ) {
 }
 
 void p_run( struct parse* parse ) {
+   bool success = false;
+   jmp_buf bail, *prev_bail = parse->task->bail;
+   if ( setjmp( bail ) == 0 ) {
+      parse->task->bail = &bail;
+      run_phase( parse );
+      success = true;
+   }
+   parse->task->bail = prev_bail;
+   p_deinit_tk( parse );
+   if ( ! success ) {
+      t_bail( parse->task );
+   }
+}
+
+void run_phase( struct parse* parse ) {
    struct library* lib = t_add_library( parse->task );
    lib->lang = ( parse->task->options->lang_specified ) ?
       parse->task->options->lang : p_determine_lang_from_file_path(
@@ -65,37 +82,6 @@ void p_run( struct parse* parse ) {
       p_read_tk( parse );
       p_read_target_lib( parse );
    }
-
-/*
-   while ( parse->tk != TK_END ) {
-      printf( "a %s %d\n", parse->tk_text, parse->tk_length );
-      p_read_tk( parse );
-   }
-   p_bail( parse );
-*/
-/*
-   struct tkque_iter iter;
-   p_examine_token_queue( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   p_next_tk( parse, &iter );
-   printf( "%s\n", parse->token->text );
-   printf( "%s == %d\n", iter.token->text, iter.token->type );
-   while ( parse->tk != TK_END ) {
-      printf( "a %s %d\n", parse->tk_text, parse->tk_length );
-      p_read_tk( parse );
-   }
-   p_bail( parse );
-return;
-*/
-   //printf( "%s\n", iter.token->text );
-   //p_next_tk( parse, &iter );
-
-   // alloc_string_indexes( parse );
 }
 
 int p_determine_lang_from_file_path( const char* path ) {
@@ -143,6 +129,5 @@ void p_unexpect_last_name( struct parse* parse, struct pos* pos,
 }
 
 void p_bail( struct parse* parse ) {
-   p_deinit_tk( parse );
    t_bail( parse->task );
 }

src/task.c

@@ -451,7 +451,6 @@ const char* t_decode_pos_file( struct task* task, struct pos* pos ) {
 }
 
 void t_bail( struct task* task ) {
-   t_deinit( task );
    longjmp( *task->bail, 1 );
 }