From b8312f198ec630dec77847cbfdf51b05e9fa79cb Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <cnx@loang.net>
Date: Thu, 10 Apr 2025 14:39:59 +0900
Subject: Store whole argv as bug reproducer

---
 REUSE.toml               |   8 ++++----
 bugs/README.md           |   8 ++++----
 bugs/gnu/19784/argv      | Bin 0 -> 17 bytes
 bugs/gnu/19784/limit     |   1 -
 bugs/gnu/25003/argv      | Bin 0 -> 21 bytes
 bugs/gnu/25003/chunks    |   1 -
 bugs/gnu/25023/argv      | Bin 0 -> 34 bytes
 bugs/gnu/25023/separator |   1 -
 bugs/gnu/26545/argv      | Bin 0 -> 23 bytes
 bugs/gnu/26545/size      |   1 -
 loftix/bugs.scm          |   7 ++++---
 11 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 bugs/gnu/19784/argv
 delete mode 100644 bugs/gnu/19784/limit
 create mode 100644 bugs/gnu/25003/argv
 delete mode 100644 bugs/gnu/25003/chunks
 create mode 100644 bugs/gnu/25023/argv
 delete mode 100644 bugs/gnu/25023/separator
 create mode 100644 bugs/gnu/26545/argv
 delete mode 100644 bugs/gnu/26545/size

diff --git a/REUSE.toml b/REUSE.toml
index f0dd5e5..87c2bbb 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -94,7 +94,7 @@ SPDX-License-Identifier = 'CC0-1.0'
 [[annotations]]
 path = [ 'bugs/cve/2017/6965/bug_3',
          'bugs/cve/2018/10372/bug3',
-         'bugs/gnu/25023/separator', ]
+         'bugs/gnu/25023/argv', ]
 SPDX-FileCopyrightText = 'Phạm Văn Thuận'
 SPDX-License-Identifier = 'CC0-1.0'
 
@@ -132,13 +132,13 @@ SPDX-FileCopyrightText = '陈鹏'
 SPDX-License-Identifier = 'CC0-1.0'
 
 [[annotations]]
-path = 'bugs/gnu/19784/limit'
+path = 'bugs/gnu/19784/argv'
 SPDX-FileCopyrightText = 'Yury Usishchev'
 SPDX-License-Identifier = 'CC0-1.0'
 
 [[annotations]]
-path = [ 'bugs/gnu/25003/chunks',
-         'bugs/gnu/26545/size' ]
+path = [ 'bugs/gnu/25003/argv',
+         'bugs/gnu/26545/argv' ]
 SPDX-FileCopyrightText = 'Pádraig Brady'
 SPDX-License-Identifier = 'CC0-1.0'
 
diff --git a/bugs/README.md b/bugs/README.md
index ad8de16..42d6383 100644
--- a/bugs/README.md
+++ b/bugs/README.md
@@ -39,22 +39,22 @@
 - #19784: [heap buffer overflow][gnu-19784]
 
       guix shell -e '(@@ (loftix bugs) coreutils-8.23-asan)'
-      make-prime-list "$(cat gnu/19784/limit)"
+      make-prime-list 3  # or: $(xargs -0 -a gnu/19784/argv)
 
 - #25003: [negative size param][gnu-25003]
 
       guix shell -e '(@@ (loftix bugs) coreutils-8.26-sans-4954f79-asan)'
-      split -n"$(cat gnu/25003/chunks)" /dev/null
+      split -n2/3 /dev/null  # or: $(xargs -0 -a gnu/25003/argv)
 
 - #25023: [global buffer overflow][gnu-25023]
 
       guix shell -e '(@@ (loftix bugs) coreutils-8.25-asan)'
-      echo | pr -m -S"$(cat gnu/25023/separator)" -t /dev/fd/0 /dev/null
+      pr -m -S"$(printf '\t\t\t')" -t /dev/null /dev/zero
 
 - #26545: [memcpy param overlap][gnu-26545]
 
       guix shell -e '(@@ (loftix bugs) coreutils-8.27-asan)'
-      shred -n4 -s"$(cat gnu/26545/size)" /dev/null
+      shred -n4 -s7 /dev/null  # or: $(xargs -0 -a gnu/26545/argv)
 
 ## JasPer
 
diff --git a/bugs/gnu/19784/argv b/bugs/gnu/19784/argv
new file mode 100644
index 0000000..cc212c7
Binary files /dev/null and b/bugs/gnu/19784/argv differ
diff --git a/bugs/gnu/19784/limit b/bugs/gnu/19784/limit
deleted file mode 100644
index e440e5c..0000000
--- a/bugs/gnu/19784/limit
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/bugs/gnu/25003/argv b/bugs/gnu/25003/argv
new file mode 100644
index 0000000..fce27bd
Binary files /dev/null and b/bugs/gnu/25003/argv differ
diff --git a/bugs/gnu/25003/chunks b/bugs/gnu/25003/chunks
deleted file mode 100644
index ffe913b..0000000
--- a/bugs/gnu/25003/chunks
+++ /dev/null
@@ -1 +0,0 @@
-2/3
\ No newline at end of file
diff --git a/bugs/gnu/25023/argv b/bugs/gnu/25023/argv
new file mode 100644
index 0000000..ad45798
Binary files /dev/null and b/bugs/gnu/25023/argv differ
diff --git a/bugs/gnu/25023/separator b/bugs/gnu/25023/separator
deleted file mode 100644
index bbeba64..0000000
--- a/bugs/gnu/25023/separator
+++ /dev/null
@@ -1 +0,0 @@
-			
\ No newline at end of file
diff --git a/bugs/gnu/26545/argv b/bugs/gnu/26545/argv
new file mode 100644
index 0000000..427d8f7
Binary files /dev/null and b/bugs/gnu/26545/argv differ
diff --git a/bugs/gnu/26545/size b/bugs/gnu/26545/size
deleted file mode 100644
index c793025..0000000
--- a/bugs/gnu/26545/size
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/loftix/bugs.scm b/loftix/bugs.scm
index c9466e7..927e788 100644
--- a/loftix/bugs.scm
+++ b/loftix/bugs.scm
@@ -150,9 +150,10 @@
               (sha256
                (base32
                 "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii"))
-              (patches (search-patches
-                        "patches/coreutils-gnulib-glibc-2.25.patch"
-                        "patches/coreutils-gnulib-glibc-2.28.patch"))))))
+              (patches (cons (search-patch
+                              "patches/coreutils-gnulib-glibc-2.25.patch")
+                             (origin-patches
+                               (package-source coreutils-8.27-asan))))))))
 
 (define-public coreutils-8.23-asan
   (package
-- 
cgit 1.4.1