Merge pull request #20 from krychu/#19-memory-leak

Properly free duplicate tiles
krychu · Mar 23, 2022 · 38b08ab · 38b08ab
2 parents b1b2c42 + 25a50fa
commit 38b08ab
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/wfc.h b/wfc.h
@@ -776,11 +776,18 @@ static int wfc__remove_duplicate_tiles(struct wfc__tile **tiles, int *tile_cnt)
     }
 
     if (unique) {
-      (*tiles)[unique_cnt] = (*tiles)[j];
+      if (unique_cnt != j) {
+        struct wfc__tile tmp = (*tiles)[unique_cnt];
+        (*tiles)[unique_cnt] = (*tiles)[j];
+        (*tiles)[j] = tmp;
+      }
       unique_cnt++;
     }
   }
 
+  for (int i=unique_cnt; i<*tile_cnt; i++)
+    wfc_img_destroy((*tiles)[i].image);
+
   struct wfc__tile *unique_tiles = realloc(*tiles, sizeof(**tiles) * unique_cnt);
   if (unique_tiles == NULL) {
     p("wfc__remove_duplicate_tiles: error\n");