Changeset 2591

Timestamp:

07/27/08 10:25:32 (5 years ago)

Author:

pterjan

Message:

• Fix a double free and free everything in case of error

File:

• neercs/trunk/src/main.c (modified) (15 diffs)

neercs/trunk/src/main.c

@@ -84 +84 @@
     int i, args, s=0;
     long long unsigned int last_key_time = 0;
-    int mainret = 0;
+    int mainret = -1;
     int attach = 0, forceattach = 0;
     int *to_grab = NULL;
@@ -97 +97 @@
     {
         fprintf(stderr, "Environment variable SHELL not set and no arguments given. kthxbye.\n");
-        return -1;
+        goto end;
     }
 
@@ -125 +125 @@
     {
         fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-        return -1;
+        goto end;
     }
     screen_list->recurrent_list->count = 0;
@@ -179 +179 @@
                 {
                     fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-                    return -1;
+                    goto end;
                 }
             }
@@ -192 +192 @@
             {
                 fprintf(stderr, "Attaching can only be requested once\n");
-                return -1;
+                goto end;
             }
             if(myoptarg)
@@ -206 +206 @@
         case 'h': /* --help */
             usage(argc, argv);
-            return 0;
+            mainret = 0;
+            goto end;
             break;
         case 'v': /* --version */
             version();
-            return 0;
+            mainret = 0;
+            goto end;
             break;
         default:
             fprintf(stderr, "Unknown argument #%d\n", myoptind);
-            return -1;
+            goto end;
             break;
         }
@@ -225 +227 @@
         {
             fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-            return -1;
+            goto end;
         }
         for(i=0; i<(argc-1) - s; i++)
@@ -250 +252 @@
         {
             fprintf(stderr, "-R can not be associated with commands or pids!\n");
-            return -1;
+            goto end;
         }
 
@@ -259 +261 @@
             for(i=0; sockets[i]; i++);
             i--;
-            screen_list->s_socket_path = sockets[i];
+            screen_list->s_socket_path = strdup(sockets[i]);
             session = connect_server(screen_list);
             if(session)
@@ -267 +269 @@
                 screen_list->dp = caca_create_display(screen_list->cv);
                 if(!screen_list->dp)
-                    return 1;
+                    goto end;
                 caca_set_cursor(screen_list->dp, 1);
 
@@ -294 +296 @@
         }
         if(forceattach && !attach)
-            return -1;
+            goto end;
     }
 
@@ -307 +309 @@
         {
             fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-            return -1;
+            goto end;
         }
     }
@@ -327 +329 @@
         {
             fprintf(stderr, "Failed to create child process\n");
-            return -1;
+            goto end;
         }
         if(pid == 0)
@@ -361 +363 @@
         screen_list->dp = caca_create_display(screen_list->cv);
         if(!screen_list->dp)
-            return 1;
+            goto end;
         caca_set_cursor(screen_list->dp, 1);
 
@@ -417 +419 @@
 
     /* Clean up */
-    if(screen_list->dp)
-        caca_free_display(screen_list->dp);
-
-    cucul_free_canvas(screen_list->cv);
-
-    for(i = 0; i < screen_list->count; i++)
-    {
-        destroy_screen(screen_list->screen[i]);
-    }
-
-    if(screen_list->s_socket_path)
-        free(screen_list->s_socket_path);
-
-    if(screen_list->c_socket_path)
-    {
-        unlink(screen_list->c_socket_path);
-        free(screen_list->c_socket_path);
-    }
-
-    if(screen_list->c_socket)
-        close(screen_list->c_socket);
-
-    if(screen_list->s_socket)
-        close(screen_list->s_socket);
-
-    if(screen_list->screen) free(screen_list->screen);
-
-
-    struct option *option = screen_list->config;
-
-    while(option)
-    {
-        struct option *kromeugnon = option;
-        option = option->next;
-        if(kromeugnon->key)   free(kromeugnon->key);
-        if(kromeugnon->value) free(kromeugnon->value);
-        free(kromeugnon);
-    }
-
-    for(i=0; i<screen_list->recurrent_list->count; i++)
-    {
-        remove_recurrent(screen_list->recurrent_list, i);
-        i = 0;
-    }
-
-    if(screen_list->recurrent_list->recurrent) free(screen_list->recurrent_list->recurrent);
-    if(screen_list->recurrent_list)            free(screen_list->recurrent_list);
-
-    if(screen_list->session_name)
-        free(screen_list->session_name);
-
+    mainret = 0;
+end:
     if(screen_list)
+    {
+        if(screen_list->dp)
+            caca_free_display(screen_list->dp);
+
+        if(screen_list->cv)
+            cucul_free_canvas(screen_list->cv);
+
+        for(i = 0; i < screen_list->count; i++)
+        {
+            destroy_screen(screen_list->screen[i]);
+        }
+
+        if(screen_list->s_socket_path)
+            free(screen_list->s_socket_path);
+
+        if(screen_list->c_socket_path)
+        {
+            unlink(screen_list->c_socket_path);
+            free(screen_list->c_socket_path);
+        }
+
+        if(screen_list->c_socket)
+            close(screen_list->c_socket);
+
+        if(screen_list->s_socket)
+            close(screen_list->s_socket);
+
+        if(screen_list->screen)
+            free(screen_list->screen);
+
+        struct option *option = screen_list->config;
+
+        while(option)
+        {
+            struct option *kromeugnon = option;
+            option = option->next;
+            if(kromeugnon->key)   free(kromeugnon->key);
+            if(kromeugnon->value) free(kromeugnon->value);
+            free(kromeugnon);
+        }
+
+        for(i=0; i<screen_list->recurrent_list->count; i++)
+        {
+            remove_recurrent(screen_list->recurrent_list, i);
+            i = 0;
+        }
+
+        if(screen_list->recurrent_list->recurrent)
+            free(screen_list->recurrent_list->recurrent);
+        if(screen_list->recurrent_list)
+            free(screen_list->recurrent_list);
+
+        if(screen_list->session_name)
+            free(screen_list->session_name);
+
         free(screen_list);
+    }
 
     return mainret;