Sync from SUSE:SLFO:Main sharutils revision 5d5074be22f4fc3d124c93a9a5d1b545

This commit is contained in:
Adrian Schröter 2024-10-03 17:59:36 +02:00
parent 24dc41f183
commit 87c28fa85f
3 changed files with 18 additions and 6 deletions

View File

@ -11,7 +11,7 @@ Index: src/unshar.c
looks_like_shell_code (char const * buf) looks_like_shell_code (char const * buf)
{ {
- while (isspace ((int) *buf)) buf++; - while (isspace ((int) *buf)) buf++;
+ intptr_t buf_end = buf + rw_base_size; + intptr_t buf_end = (intptr_t)buf + rw_base_size;
+ while (isspace ((int) *buf) && buf < buf_end) buf++; + while (isspace ((int) *buf) && buf < buf_end) buf++;
switch (*buf) switch (*buf)
{ {

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue May 14 08:47:48 UTC 2024 - pgajdos@suse.com
- fix build with gcc14
- modified patches
% sharutils-CVE-2018-1000097-fix_buffer_overflow.patch
-------------------------------------------------------------------
Mon Feb 26 13:10:44 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 20 20:54:04 UTC 2022 - Dirk Müller <dmueller@suse.com> Wed Apr 20 20:54:04 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package sharutils # spec file for package sharutils
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -52,10 +52,10 @@ bytes. uudecode does the converse transformation.
%prep %prep
%setup -q %setup -q
%patch0 %patch -P 0
%patch1 %patch -P 1
%patch2 -p1 %patch -P 2 -p1
%patch3 -p1 %patch -P 3 -p1
chmod +w src/scripts.x chmod +w src/scripts.x
%build %build