Accepting request 1157629 from home:Andreas_Schwab:Factory

- log-commit.patch: fix crash in log_commit with empty log list

OBS-URL: https://build.opensuse.org/request/show/1157629
OBS-URL: https://build.opensuse.org/package/show/network/bird?expand=0&rev=40
This commit is contained in:
Dirk Mueller 2024-03-25 15:35:24 +00:00 committed by Git OBS Bridge
parent d878a583a6
commit fcaedf477d
3 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 13 13:42:22 UTC 2024 - Andreas Schwab <schwab@suse.de>
- log-commit.patch: fix crash in log_commit with empty log list
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 12 17:12:37 UTC 2024 - Martin Hauke <mardnh@gmx.de> Tue Mar 12 17:12:37 UTC 2024 - Martin Hauke <mardnh@gmx.de>

View File

@ -30,6 +30,7 @@ URL: https://bird.network.cz/
Source: ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz Source: ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz
Source1: bird.service Source1: bird.service
Source3: bird.tmpfiles.d Source3: bird.tmpfiles.d
Patch1: log-commit.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -67,7 +68,7 @@ BIRD is an implementation for routing Internet Protocol packets.
This package holds the HTML documentation. This package holds the HTML documentation.
%prep %prep
%setup -q %autosetup -p1
%build %build
export CFLAGS="%{optflags} -fpic -DPIC -fno-strict-aliasing -Wno-parentheses -Wno-pointer-sign" export CFLAGS="%{optflags} -fpic -DPIC -fno-strict-aliasing -Wno-parentheses -Wno-pointer-sign"

12
log-commit.patch Normal file
View File

@ -0,0 +1,12 @@
Index: bird-2.14/sysdep/unix/log.c
===================================================================
--- bird-2.14.orig/sysdep/unix/log.c
+++ bird-2.14/sysdep/unix/log.c
@@ -160,6 +160,7 @@ log_commit(int class, buffer *buf)
strcpy(buf->end - 100, " ... <too long>");
log_lock();
+ if (current_log_list)
WALK_LIST(l, *current_log_list)
{
if (!(l->mask & (1 << class)))