From bc6a3b7764de376efe3440441f2bc40b3015a7aa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 6 May 2026 06:17:36 +0000
Subject: [PATCH 1/2] Use verstable hash set in
 uniqify_dir_entries_for_case_insensitive_fs

Agent-Logs-Url: https://github.com/kovidgoyal/kitty/sessions/9b3f4b30-d5c8-48cb-83e4-6989d3025931

Co-authored-by: kovidgoyal <1308621+kovidgoyal@users.noreply.github.com>
---
 kitty/dnd.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/kitty/dnd.c b/kitty/dnd.c
index 6fed8d749..a085ee50a 100644
--- a/kitty/dnd.c
+++ b/kitty/dnd.c
@@ -11,6 +11,10 @@
 #include "safe-wrappers.h"
 #include "iqsort.h"
 #include "png-reader.h"
+#define NAME lower_str_set
+#define KEY_TY char*
+#define KEY_DTOR_FN free
+#include "kitty-verstable.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -1856,27 +1860,18 @@ lowercase_copy(const char *s) {
     return ans;
 }
 
-static bool
-has_lowercase_conflict(const char *lower_name, char **seen_lower, size_t count) {
-    for (size_t i = 0; i < count; i++) {
-        if (strcmp(lower_name, seen_lower[i]) == 0) return true;
-    }
-    return false;
-}
-
 static void
 uniqify_dir_entries_for_case_insensitive_fs(DragRemoteItem *children, size_t count) {
     if (!count) return;
-    char **seen_lower = calloc(count, sizeof(char*));
-    if (!seen_lower) return;
-    size_t seen_count = 0;
+    lower_str_set seen;
+    vt_init(&seen);
     for (size_t i = 0; i < count; i++) {
         if (!children[i].dir_entry_name) continue;
         const char *orig_name = children[i].dir_entry_name;
         char *lower = lowercase_copy(orig_name);
         if (!lower) continue;
-        if (!has_lowercase_conflict(lower, seen_lower, seen_count)) {
-            seen_lower[seen_count++] = lower;
+        if (vt_is_end(vt_get(&seen, lower))) {
+            if (vt_is_end(vt_insert(&seen, lower))) { free(lower); break; }  // OOM
             continue;
         }
         free(lower);
@@ -1888,10 +1883,10 @@ uniqify_dir_entries_for_case_insensitive_fs(DragRemoteItem *children, size_t cou
             snprintf(new_name, buflen, "case-conflict-%d-%s", q, orig_name);
             lower = lowercase_copy(new_name);
             if (!lower) { free(new_name); break; }
-            if (!has_lowercase_conflict(lower, seen_lower, seen_count)) {
+            if (vt_is_end(vt_get(&seen, lower))) {
                 free(children[i].dir_entry_name);
                 children[i].dir_entry_name = new_name;
-                seen_lower[seen_count++] = lower;
+                if (vt_is_end(vt_insert(&seen, lower))) { free(lower); break; }  // OOM
                 renamed = true;
                 break;
             }
@@ -1899,11 +1894,12 @@ uniqify_dir_entries_for_case_insensitive_fs(DragRemoteItem *children, size_t cou
         }
         if (!renamed) {
             lower = lowercase_copy(children[i].dir_entry_name);
-            if (lower) seen_lower[seen_count++] = lower;
+            if (lower) {
+                if (vt_is_end(vt_insert(&seen, lower))) free(lower);  // OOM
+            }
         }
     }
-    for (size_t i = 0; i < seen_count; i++) free(seen_lower[i]);
-    free(seen_lower);
+    vt_cleanup(&seen);
 }
 
 static void

From ba6ce4a8e287821e62d15762e70c42f86265132c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 6 May 2026 06:22:03 +0000
Subject: [PATCH 2/2] Fix OOM handling: continue outer loop instead of breaking
 on first-seen insert failure

Agent-Logs-Url: https://github.com/kovidgoyal/kitty/sessions/9b3f4b30-d5c8-48cb-83e4-6989d3025931

Co-authored-by: kovidgoyal <1308621+kovidgoyal@users.noreply.github.com>
---
 kitty/dnd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitty/dnd.c b/kitty/dnd.c
index a085ee50a..4a1857bd7 100644
--- a/kitty/dnd.c
+++ b/kitty/dnd.c
@@ -1871,7 +1871,7 @@ uniqify_dir_entries_for_case_insensitive_fs(DragRemoteItem *children, size_t cou
         char *lower = lowercase_copy(orig_name);
         if (!lower) continue;
         if (vt_is_end(vt_get(&seen, lower))) {
-            if (vt_is_end(vt_insert(&seen, lower))) { free(lower); break; }  // OOM
+            if (vt_is_end(vt_insert(&seen, lower))) { free(lower); continue; }  // OOM, skip tracking this entry
             continue;
         }
         free(lower);