X-Git-Url: https://git.piment-noir.org/?p=TD_C.git;a=blobdiff_plain;f=TP_13%2Fexo1%2Flib%2Farray.c;h=ec612c1f82bd769dee7883aca6228a96397ff91c;hp=d2e6182808f6dea9fa87ff335d02771d6782c58f;hb=475ee86d70921638c700bc0934441c7fe2c905d1;hpb=cfdd46d2e85b05f77a03ae31f721e2fd4030996f

diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c
index d2e6182..ec612c1 100644
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "array.h"
 
@@ -21,17 +22,23 @@ void free_tab(int tab[]) {
 static void copy_tab(int src_tab[], int dest_tab[], unsigned src_tab_size, unsigned index_offset) {
     /* FIXME: I think it's worth doing some sanity checks on the array size:
      * dest_tab_size >= src_tab_size */
+    if (src_tab == NULL || dest_tab == NULL) {
+        printf("please ensure you have created both arrays beforehand\n");
+        return;
+    }
     for (unsigned i = 0; i < src_tab_size; i++) {
         dest_tab[i + index_offset] = src_tab[i];
     }
 }
 
-int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]) {
-    int* rt = create_tab(tab_dest, tab_size1 + tab_size2);
+/* one must free the two source tabs in case they will be unused after to concatenation  */
+int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2) {
+    int* tab_dest = NULL;
+    tab_dest = create_tab(tab_dest, tab_size1 + tab_size2);
 
     copy_tab(tab1, tab_dest, tab_size1, 0);
     copy_tab(tab2, tab_dest, tab_size2, tab_size1);
-    return rt;
+    return tab_dest;
 }
 
 int* resize_tab(int tab[], unsigned new_tab_size) {