[FIX] fuite de mémoire

initializeData.c

@@ -95,7 +95,7 @@ void create_flight (Flight **fl, char **line, const char separators[])
     }
     else
     {
-        (*fl)->airline = word;
+        (*fl)->airline = strdup (word);
     }
     word = strsep (line, separators);
     if (strcmp (word, "") == 0)
@@ -104,7 +104,7 @@ void create_flight (Flight **fl, char **line, const char separators[])
     }
     else
     {
-        (*fl)->org_air = word;
+        (*fl)->org_air = strdup (word);
     }
     word = strsep (line, separators);
     if (strcmp (word, "") == 0)
@@ -113,7 +113,7 @@ void create_flight (Flight **fl, char **line, const char separators[])
     }
     else
     {
-        (*fl)->dest_air = word;
+        (*fl)->dest_air = strdup (word);
     }
     word = strsep (line, separators);
     if (strcmp (word, "") == 0)
@@ -274,8 +274,9 @@ void load_flights (Table_hash_airlines *thal, Table_hash_airports *thap, FILE *f
 
     while (getline (&line, &len, fd) != -1) // on récupère chaque ligne.
     {
+        char *  line2      = line;
         Flight *new_flight = malloc (sizeof (Flight));
-        create_flight (&new_flight, &line, separators);
+        create_flight (&new_flight, &line2, separators);
 
         Liste_Airlines *l = thal->tab_airlines[hash_function_airline (new_flight->airline)];
 
@@ -372,6 +373,9 @@ void free_all_airlines (Table_hash_airlines *thal)
                     {
                         Flight *tmp                          = thal->tab_airlines[i]->liste_flights;
                         thal->tab_airlines[i]->liste_flights = NULL;
+                        free (tmp->airline);
+                        free (tmp->org_air);
+                        free (tmp->dest_air);
                         free (tmp);
                     }
                     else
@@ -379,6 +383,9 @@ void free_all_airlines (Table_hash_airlines *thal)
                         Flight *tmp                          = thal->tab_airlines[i]->liste_flights;
                         thal->tab_airlines[i]->liste_flights = thal->tab_airlines[i]->liste_flights->suiv_airline;
                         tmp->suiv_airline                    = NULL;
+                        free (tmp->airline);
+                        free (tmp->org_air);
+                        free (tmp->dest_air);
                         free (tmp);
                     }
                 }
@@ -409,3 +416,29 @@ void free_all_airports (Table_hash_airports *thap)
         }
     }
 }
+
+int is_empty_airlines (Table_hash_airlines thal)
+{
+    for (int i = 0; i < AIRLINE_SIZE_TABLE; i++)
+    {
+        if (thal.tab_airlines[i] != NULL)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+int is_empty_airports (Table_hash_airports thap)
+{
+    for (int i = 0; i < AIRPORT_SIZE_TABLE; i++)
+    {
+        if (thap.tab_airports[i] != NULL)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}

initializeData.h

@@ -114,3 +114,7 @@ int hash_function_airport (char *);
 void free_all_airlines (Table_hash_airlines *);
 
 void free_all_airports (Table_hash_airports *);
+
+int is_empty_airlines (Table_hash_airlines);
+
+int is_empty_airports (Table_hash_airports);

main.c

@@ -26,11 +26,16 @@ int main ()
         load_airports (&thap, airport_file);
     }
 
-    if (flights_file != NULL)
+    if (flights_file != NULL && (is_empty_airlines (thal) == 1 && is_empty_airports (thap) == 1))
     {
         load_flights (&thal, &thap, flights_file);
     }
-
+    if (is_empty_airlines (thal) == 0 || is_empty_airports (thap) == 0)
+    {
+        printf ("Chargement des fichiers impossible, veuillez vérifier les fichiers !\n");
+    }
+    else
+    {
         printf ("Chargement terminé !\n");
 
         char * requetes    = NULL;
@@ -45,7 +50,8 @@ int main ()
 
         while (getline (&requetes, &len, stdin) != -1)
         {
-        commande = strsep (&requetes, " ");
+            char *requetes2 = requetes;
+            commande        = strsep (&requetes2, " ");
             commande        = strtok (commande, "\n");
             if (strcmp (commande, "quit") == 0)
             {
@@ -53,24 +59,24 @@ int main ()
             }
             else if (strcmp (commande, "show-airports") == 0)
             {
-            airline_id = strsep (&requetes, " \n");
+                airline_id = strsep (&requetes2, " \n");
                 printf ("> Resultat de la requete %s %s :\n", commande, airline_id);
                 printf ("\n");
                 show_airports (airline_id, thal, thap);
             }
             else if (strcmp (commande, "show-airlines") == 0)
             {
-            airport_id1 = strsep (&requetes, " \n");
+                airport_id1 = strsep (&requetes2, " \n");
                 printf ("> Resultat de la requete %s %s :\n", commande, airport_id1);
                 printf ("\n");
                 show_airlines (airport_id1, thal, thap);
             }
             else if (strcmp (commande, "show-flights") == 0)
             {
-            airport_id1 = strsep (&requetes, " \n");
-            date        = strsep (&requetes, " \n");
-            time        = strsep (&requetes, " \n");
-            limit       = strsep (&requetes, " \n");
+                airport_id1 = strsep (&requetes2, " \n");
+                date        = strsep (&requetes2, " \n");
+                time        = strsep (&requetes2, " \n");
+                limit       = strsep (&requetes2, " \n");
 
                 if (limit == NULL)
                 {
@@ -114,7 +120,7 @@ int main ()
             }
             else if (strcmp (commande, "delayed-airline") == 0)
             {
-            airline_id = strsep (&requetes, " \n");
+                airline_id = strsep (&requetes2, " \n");
 
                 printf ("> Resultat de la requete %s %s :\n", commande, airline_id);
                 printf ("\n");
@@ -122,7 +128,7 @@ int main ()
             }
             else if (strcmp (commande, "most-delayed-airlines-at-airport") == 0)
             {
-            airport_id1 = strsep (&requetes, " \n");
+                airport_id1 = strsep (&requetes2, " \n");
 
                 printf ("> Resultat de la requete %s %s :\n", commande, airport_id1);
                 printf ("\n");
@@ -130,7 +136,7 @@ int main ()
             }
             else if (strcmp (commande, "changed-flights") == 0)
             {
-            date = strsep (&requetes, " \n");
+                date = strsep (&requetes2, " \n");
 
                 printf ("> Resultat de la requete %s %s :\n", commande, date);
                 printf ("\n");
@@ -138,8 +144,8 @@ int main ()
             }
             else if (strcmp (commande, "avg-flight-duration") == 0)
             {
-            airport_id1 = strsep (&requetes, " \n");
-            airport_id2 = strsep (&requetes, " \n");
+                airport_id1 = strsep (&requetes2, " \n");
+                airport_id2 = strsep (&requetes2, " \n");
 
                 printf ("> Resultat de la requete %s %s %s :\n", commande, airport_id1, airport_id2);
                 printf ("\n");
@@ -156,6 +162,17 @@ int main ()
 
         free_all_airlines (&thal);
         free_all_airports (&thap);
+        free (requetes);
+    }
+
+    if (is_empty_airlines (thal) == 1)
+    {
+        free_all_airlines (&thal);
+    }
+    if (is_empty_airports (thap) == 1)
+    {
+        free_all_airports (&thap);
+    }
 
     fclose (airline_file);
     fclose (airport_file);