From 25a95645a6a23229daa29527a16f94d5198adb48 Mon Sep 17 00:00:00 2001 From: baiguo Date: Fri, 10 May 2024 10:41:25 +0800 Subject: [PATCH] Do not assume PATH_MAX is defined (cherry picked from commit d9d110d0b122aa2e9147bdf36374f5b855062dc1) --- ...rt-Do-not-assume-PATH_MAX-is-defined.patch | 41 +++++++++++++++++++ less.spec | 6 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 backport-Do-not-assume-PATH_MAX-is-defined.patch diff --git a/backport-Do-not-assume-PATH_MAX-is-defined.patch b/backport-Do-not-assume-PATH_MAX-is-defined.patch new file mode 100644 index 0000000..16fbc73 --- /dev/null +++ b/backport-Do-not-assume-PATH_MAX-is-defined.patch @@ -0,0 +1,41 @@ +From eea6fbc196872eeca6f02fcfba298f3e1bb62880 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Thu, 11 Jan 2024 02:18:07 +0100 +Subject: [PATCH] Do not assume PATH_MAX is defined + +--- + filename.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/filename.c b/filename.c +index f910aa5..c6bc49e 100644 +--- a/filename.c ++++ b/filename.c +@@ -812,9 +812,24 @@ public char * lrealpath(char *path) + if (!is_fake_pathname(path)) + { + #if HAVE_REALPATH ++ /* ++ * Not all systems support the POSIX.1-2008 realpath() behavior ++ * of allocating when passing a NULL argument. And PATH_MAX is ++ * not required to be defined, or might contain an exceedingly ++ * big value. We assume that if it is not defined (such as on ++ * GNU/Hurd), then realpath() accepts NULL. ++ */ ++#ifndef PATH_MAX ++ char *rpath; ++ ++ rpath = realpath(path, NULL); ++ if (rpath != NULL) ++ return (rpath); ++#else + char rpath[PATH_MAX]; + if (realpath(path, rpath) != NULL) + return (save(rpath)); ++#endif + #endif + } + return (save(path)); +-- +2.27.0 + diff --git a/less.spec b/less.spec index bffd447..6c861ae 100644 --- a/less.spec +++ b/less.spec @@ -1,6 +1,6 @@ Name: less Version: 633 -Release: 3 +Release: 4 Summary: Less is a pager that displays text files. License: GPLv3+ or BSD URL: http://www.greenwoodsoftware.com/less @@ -13,6 +13,7 @@ Patch4: backport-CVE-2024-32487.patch Patch5: backport-Don-t-return-READ_AGAIN-from-iread-if-no-data-has-ye.patch Patch6: backport-Fix-for-previous-fix.patch Patch7: backport-Avoid-stealing-data-from-an-input-program-that-uses-.patch +Patch8: backport-Do-not-assume-PATH_MAX-is-defined.patch BuildRequires: gcc make ncurses-devel autoconf automake libtool @@ -51,6 +52,9 @@ autoreconf -ivf %{_mandir}/man1/* %changelog +* Fri May 10 2024 baiguo - 633-4 +- Do not assume PATH_MAX is defined + * Mon Apr 29 2024 huyubiao - 633-3 - fix problem when a program piping into less reads from the tty, like sudo asking for password -- Gitee