Explicitly include an uncommmited upstream patch from
https://github.com/codership/galera/pull/617
remove duplicate va_end call
This commit is contained in:
Anton Bobrov 2023-07-12 13:53:48 +02:00
parent c5275d1043
commit 2c69649549
2 changed files with 18 additions and 0 deletions

16
galera-va_end.patch Normal file
View File

@ -0,0 +1,16 @@
This is an upstream patch for https://github.com/codership/galera/pull/617
"remove duplicate va_end call" that originates from BZ #2051849 covscan
results. The upstream has not addressed the issue for over a year so this
is the reason to cover it as separate patch here.
--- galera-25.3.37/galerautils/src/gu_dbug.c 2022-05-31 17:05:23.000000000 +0200
+++ ../../galera-25.3.37/galerautils/src/gu_dbug.c 2023-07-10 17:09:58.969599380 +0200
@@ -1040,7 +1040,6 @@ _gu_db_doprnt_(const char *format, ...)
}
(void) fprintf(_gu_db_fp_, "%s: ", state->u_keyword);
(void) vfprintf(_gu_db_fp_, format, args);
- va_end(args);
(void) fputc('\n', _gu_db_fp_);
dbug_flush(state);
errno = save_errno;

View File

@ -16,6 +16,7 @@ Source1: garbd.service
Source2: garbd-wrapper Source2: garbd-wrapper
Patch0: cmake_paths.patch Patch0: cmake_paths.patch
Patch1: galera-va_end.patch
BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
@ -38,6 +39,7 @@ replication engine see http://www.codership.com.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%{set_build_flags} %{set_build_flags}