From db852ecd93afc9f893886a132ee58b23579fc79d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 26 Dec 2023 11:25:32 +0000
Subject:  Prepare for 2.9.4.1; fix some stack smashing

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 AUTHORS             | 1 +
 INSTALL             | 2 +-
 NEWS                | 6 ++++++
 doc/index.html      | 4 ++--
 doc/upgrade.html    | 7 +++++++
 package/info        | 2 +-
 src/execline/case.c | 2 +-
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7c9a335..60ace19 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,3 +31,4 @@ Thanks to:
   Guillermo <gdiazhartusch@gmail.com>
   Michael Zuo <muh.muhten@gmail.com>
   Casper Ti. Vector <caspervector@gmail.com>
+  Johannes Nixdorf <mixi@shadowice.org>
diff --git a/INSTALL b/INSTALL
index 4e6fd42..d9bdcde 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.14.1.0 or later: https://skarnet.org/software/skalibs/
   - Optional: nsss version 0.2.0.4 or later: https://skarnet.org/software/nsss/
 
  This software will run on any operating system that implements
diff --git a/NEWS b/NEWS
index 01b472b..c481396 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for execline.
 
+In 2.9.4.1
+----------
+
+ - Bugfixes.
+
+
 In 2.9.4.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 3493abd..0a226ab 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issues.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later. </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.14.0.0 or later. It's a build-time requirement. It's also a run-time
+2.14.1.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -77,7 +77,7 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.9.4.0.tar.gz">2.9.4.0</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.9.4.1.tar.gz">2.9.4.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/execline/">execline
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d9b9525..6511fe5 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in execline </h1>
 
+<h2> in 2.9.4.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.1.0. </li>
+</ul>
+
 <h2> in 2.9.4.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 1957301..1268414 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.9.4.0
+version=2.9.4.1
 category=admin
 package_macro_name=EXECLINE
diff --git a/src/execline/case.c b/src/execline/case.c
index b62583c..f1a71c6 100644
--- a/src/execline/case.c
+++ b/src/execline/case.c
@@ -21,7 +21,7 @@ static void case_execit (char const *const *argv, char const *expr, char const *
   if (n)
   {
     size_t exprlen = strlen(expr) ;
-    size_t fmtlen = exprlen + 6 ;
+    size_t fmtlen = exprlen + 6 + uint_fmt(0, n-1) ;
     for (size_t i = 1 ; i < n ; i++)
       fmtlen += uint_fmt(0, i) + 2 + pmatch[i].rm_eo - pmatch[i].rm_so ;
     {
-- 
cgit v1.2.3