Merge pull request gridcf#205 from ellert/buffer-overflow

Fix buffer overflow in test
msalle · Nov 28, 2022 · 50fc40b · 50fc40b
2 parents aed61cc + 2542ba1
commit 50fc40b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/gridftp/server/src/configure.ac b/gridftp/server/src/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 
-AC_INIT([globus_gridftp_server],[13.24],[https://github.com/gridcf/gct/issues])
+AC_INIT([globus_gridftp_server],[13.25],[https://github.com/gridcf/gct/issues])
 AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}])
 AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}])

diff --git a/gridftp/server/src/test/cmp_alias_ent_test.c b/gridftp/server/src/test/cmp_alias_ent_test.c
@@ -34,7 +34,7 @@ int main()
         { .alias = "hell", .alias_len = 4 },
         { .alias = (char[]){(char)-1, (char)0 }, .alias_len = 1 },
         { .alias = "hell?", .alias_len = 5 },
-        { .alias = "hell[o]", .alias_len = 5 }
+        { .alias = "hell[o]", .alias_len = 7 }
     };
     test_t tests[] = 
     {

diff --git a/packaging/debian/globus-gridftp-server/debian/changelog.in b/packaging/debian/globus-gridftp-server/debian/changelog.in
@@ -1,3 +1,9 @@
+globus-gridftp-server (13.25-1+gct.@distro@) @distro@; urgency=medium
+
+  * Fix buffer overflow in test
+
+ -- Mattias Ellert <[email protected]>  Mon, 28 Nov 2022 06:44:38 +0100
+
 globus-gridftp-server (13.24-1+gct.@distro@) @distro@; urgency=medium
 
   * Fix some compiler warnings

diff --git a/packaging/fedora/globus-gridftp-server.spec b/packaging/fedora/globus-gridftp-server.spec
@@ -3,7 +3,7 @@
 Name:		globus-gridftp-server
 %global soname 6
 %global _name %(echo %{name} | tr - _)
-Version:	13.24
+Version:	13.25
 Release:	1%{?dist}
 Summary:	Grid Community Toolkit - Globus GridFTP Server
 
@@ -223,6 +223,9 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Nov 28 2022 Mattias Ellert <[email protected]> - 13.25-1
+- Fix buffer overflow in test
+
 * Thu Mar 10 2022 Mattias Ellert <[email protected]> - 13.24-1
 - Fix some compiler warnings
 - Fix unbalanced mutex lock/unlock