fix tests

DeaDBeeF-Player · Feb 2, 2024 · 541593e · 541593e
1 parent 05eb6be
commit 541593e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/shared/undo/undobuffer.c b/shared/undo/undobuffer.c
@@ -97,11 +97,17 @@ ddb_undobuffer_has_operations(ddb_undobuffer_t *undobuffer) {
 
 void
 ddb_undobuffer_group_begin (ddb_undobuffer_t *undobuffer) {
+    if (undobuffer == NULL) {
+        return;
+    }
     undobuffer->grouping = 1;
 }
 
 void
 ddb_undobuffer_group_end (ddb_undobuffer_t *undobuffer) {
+    if (undobuffer == NULL) {
+        return;
+    }
     undobuffer->grouping = 0;
 }
 

diff --git a/src/sort.c b/src/sort.c
@@ -47,26 +47,30 @@ plt_sort_v2 (playlist_t *plt, int iter, int id, const char *format, int order) {
     if (plt->undo_enabled) {
         pl_lock ();
         int count = plt->count[PL_MAIN];
-        playItem_t **tracks = calloc (count, sizeof (playItem_t *));
-        int index = 0;
-        for (playItem_t *it = plt->head[PL_MAIN]; it != NULL; it = it->next[PL_MAIN]) {
-            tracks[index++] = it;
+        if (count != 0) {
+            playItem_t **tracks = calloc (count, sizeof (playItem_t *));
+            int index = 0;
+            for (playItem_t *it = plt->head[PL_MAIN]; it != NULL; it = it->next[PL_MAIN]) {
+                tracks[index++] = it;
+            }
+            undo_remove_items(undobuffer, plt, tracks, count);
+            free (tracks);
         }
-        undo_remove_items(undobuffer, plt, tracks, count);
-        free (tracks);
     }
 
     plt_sort_internal (plt, iter, id, format, order, 1);
 
     if (plt->undo_enabled) {
         int count = plt->count[PL_MAIN];
-        playItem_t **tracks = calloc (count, sizeof (playItem_t *));
-        int index = 0;
-        for (playItem_t *it = plt->head[PL_MAIN]; it != NULL; it = it->next[PL_MAIN]) {
-            tracks[index++] = it;
+        if (count != 0) {
+            playItem_t **tracks = calloc (count, sizeof (playItem_t *));
+            int index = 0;
+            for (playItem_t *it = plt->head[PL_MAIN]; it != NULL; it = it->next[PL_MAIN]) {
+                tracks[index++] = it;
+            }
+            undo_insert_items(undobuffer, plt, tracks, count);
+            free (tracks);
         }
-        undo_insert_items(undobuffer, plt, tracks, count);
-        free (tracks);
         pl_unlock ();
     }
 }