realloc crash fix

Author: TheRobotFox

GUI.c

@@ -223,13 +223,13 @@ void GUI_destroy()
     current_state.conf->do_render = 0;
     while(current_state.rendering) Sleep(5);
 
-    current_state.conf->active=0;
-
     for(struct GUI_Window *start = List_start(current_state.windows),
                           *end = List_end(current_state.windows);
                           start < end; start++)
         GUI_windows_remove(start->id);
 
+    current_state.conf->active=0;
+
     List_free(current_state.windows);
 
     GUI_impl_destroy();
@@ -331,7 +331,7 @@ union U_GUI_Window_id_wrapper
     void *ptr;
 };
 
-static void f_List_reserve_callback_marks(List l, enum E_CALLBACK_MSG msg, void *arg)
+static void f_List_reserve_callback_stop_render(List l, enum E_CALLBACK_MSG msg, void *arg)
 {
     union U_GUI_Window_id_wrapper wrapped_id = (union U_GUI_Window_id_wrapper)arg;
     GUI_Window_id id = wrapped_id.id;
@@ -365,12 +365,11 @@ GUI_Window_id GUI_windows_append()
         struct GUI_Window *win = List_append(current_state.windows, NULL);
 
         win->id=current_id++;
-        win->l = List_create(sizeof(S_TYPE));
         win->marks = List_create(sizeof(struct GUI_Mark));
 
         //set callback for realloc
         union U_GUI_Window_id_wrapper wrapped_id = {win->id};
-        List_reserve_callback(win->marks, f_List_reserve_callback_marks, wrapped_id.ptr);
+        List_reserve_callback(win->marks, f_List_reserve_callback_stop_render, wrapped_id.ptr);
 
         win->opacity=1.0f;
         win->do_render = 1;
@@ -422,6 +421,9 @@ void GUI_Window_set_list(GUI_Window_id id, List l)
             win->do_render = 0;
             while(win->rendering) Sleep(5);
             win->l = l;
+            //set callback for realloc
+            union U_GUI_Window_id_wrapper wrapped_id = {id};
+            List_reserve_callback(win->l, f_List_reserve_callback_stop_render, wrapped_id.ptr);
             List_clear(win->marks);
             win->do_render = tmp;
         }

GUI_impl_unix.c

@@ -36,20 +36,20 @@ struct Rect get_screen_dimensions()
 void Draw_begin()
 {
     if(current_state.conf->active){
-	    // get current window size
-	XGetWindowAttributes(d,w,&attr);
-	rect.right=attr.width;
-	rect.bottom=attr.height;
-	    buffer = XCreatePixmap(d,w,rect.right,rect.bottom, 24);
-
-	    Draw_Rect(&rect, (struct Color){0,0,0});
-	    XSetForeground(d, gc, 0);
+      // get current window size
+      XGetWindowAttributes(d,w,&attr);
+      rect.right=attr.width;
+      rect.bottom=attr.height;
+      buffer = XCreatePixmap(d,w,rect.right,rect.bottom, 24);
+
+      Draw_Rect(&rect, (struct Color){0,0,0});
+      XSetForeground(d, gc, 0);
     }
 }
 
 void Draw_Rect(struct Rect *rect, struct Color col)
 {
-    if(current_state.conf->active){
+    if(buffer){
     XGCValues v;
     v.foreground=RGB(col.r, col.g, col.b);
     GC color = XCreateGC(d,buffer,GCForeground,&v);
@@ -72,6 +72,7 @@ void Draw_end()
 {
     XCopyArea(d, buffer, w, gc, 0,0, rect.right, rect.bottom, 0, 0);
     XFreePixmap(d, buffer);
+    buffer=0;
 
 }
 
@@ -85,7 +86,7 @@ static void* GUI_thread_proc(void *unused){
 
 	XMapWindow(d,w);
 
-    current_state.conf->active=1;
+  current_state.conf->active=1;
 
 	while(current_state.conf->active){
 	//	while(XNextEvent(d, &e)){

Makefile.am

@@ -16,8 +16,8 @@ if BUILD_NSPIRE
 _EXTRA_CLEANUP+= $(PROGRAMS:.elf=.tns)
 SortTest_CFLAGS=-Ofast -funsafe-math-optimizations -Wall
 else
-SortTest_CFLAGS_x=-Ofast -mavx2 -Wall -m64 -s -funsafe-math-optimizations
-SortTest_CFLAGS=-g -fsanitize=address
+SortTest_CFLAGS=-Ofast -mavx2 -Wall -m64 -s -funsafe-math-optimizations
+SortTest_CFLAGS_x=-g -fsanitize=address
 endif
 
 if BUILD_LINUX

Sort.c

@@ -317,6 +317,8 @@ void _ReculinSort(List l, int iter)
         }
 
 
+        GUI_Window_do_render(u, 0);
+        GUI_Window_do_render(o, 0);
         //printf("%d | %d\n", urlaub.filled, output.filled);
         if(!List_size(urlaub)){
 

SortTest.c

@@ -231,8 +231,7 @@ int main(int argc, char** argv){
         }
 
         printf(OUT_FORMAT,Conf.SortAlgs[i].name,Conf.SortAlgs[i].time/CLOCKS_PER_SEC,Conf.SortAlgs[i].swap,Conf.SortAlgs[i].comp);
-        if(List_size(l)>0)
-            List_free(l);
+        List_free(l);
     }
 end:
     if(gui_conf.activate)