From 8b915968716b1214a88770ca7c2f56a6a3a737cc Mon Sep 17 00:00:00 2001
From: trace <trace@adastracomputing.com>
Date: Sat, 5 Sep 2026 14:29:08 +0000
Subject: [PATCH 1/2] trace-pr anchor


From 8ef9db37f243081be4285778a234773973f91571 Mon Sep 17 00:00:00 2001
From: trace <trace@adastracomputing.com>
Date: Sat, 5 Sep 2026 14:29:09 +0000
Subject: [PATCH 2/2] giflib: 5.2.2 (fix CVE-2025-31344)

---
 pkgs/by-name/gi/giflib/CVE-2025-31344.patch | 16 ++++++++++++++++
 pkgs/by-name/gi/giflib/package.nix          |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/gi/giflib/CVE-2025-31344.patch

diff --git a/pkgs/by-name/gi/giflib/CVE-2025-31344.patch b/pkgs/by-name/gi/giflib/CVE-2025-31344.patch
new file mode 100644
index 0000000000000..06ea2c6cb2371
--- /dev/null
+++ b/pkgs/by-name/gi/giflib/CVE-2025-31344.patch
@@ -0,0 +1,16 @@
+diff --git a/gif2rgb.c b/gif2rgb.c
+index d51226d..4ce2104 100644
+--- a/gif2rgb.c
++++ b/gif2rgb.c
+@@ -329,6 +329,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag,
+ 			GifRow = ScreenBuffer[i];
+ 			GifQprintf("\b\b\b\b%-4d", ScreenHeight - i);
+ 			for (j = 0; j < ScreenWidth; j++) {
++				/* Check if color is within color palete */
++				if (GifRow[j] >= ColorMap->ColorCount) {
++					GIF_EXIT(GifErrorString(
++					    D_GIF_ERR_IMAGE_DEFECT));
++				}
+ 				ColorMapEntry = &ColorMap->Colors[GifRow[j]];
+ 				Buffers[0][j] = ColorMapEntry->Red;
+ 				Buffers[1][j] = ColorMapEntry->Green;
diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix
index 534ff1a7ca816..b1c4a62a2ee42 100644
--- a/pkgs/by-name/gi/giflib/package.nix
+++ b/pkgs/by-name/gi/giflib/package.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   patches =
     [
       ./CVE-2021-40633.patch
+      ./CVE-2025-31344.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [
       # Build dll libraries.