packages/kronosnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 fix format truncation to support gcc 10

Browse Source 
From: @liu-yinsi
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-08-04 09:06:53 +00:00 committed by Gitee
commit 5da1a76407
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backport-kronosnet-fix-format-truncation.patch Normal file
View File

@ -0,0 +1,31 @@
diff -urN a/libknet/host.c b/libknet/host.c
--- a/libknet/host.c 2021-08-04 10:17:01.912099056 +0800
+++ b/libknet/host.c 2021-08-04 10:17:55.708739020 +0800
@@ -77,7 +77,7 @@
/*
* set default host->name to host_id for logging
*/
- snprintf(host->name, KNET_MAX_HOST_LEN - 1, "%u", host_id);
+ snprintf(host->name, KNET_MAX_HOST_LEN, "%u", host_id);
/*
* initialize links internal data
@@ -226,7 +226,7 @@
}
for (host = knet_h->host_head; host != NULL; host = host->next) {
- if (!strncmp(host->name, name, KNET_MAX_HOST_LEN - 1)) {
+ if (!strncmp(host->name, name, KNET_MAX_HOST_LEN)) {
err = -1;
savederrno = EEXIST;
log_err(knet_h, KNET_SUB_HOST, "Duplicated name found on host_id %u",
@@ -235,7 +235,7 @@
}
}
- snprintf(knet_h->host_index[host_id]->name, KNET_MAX_HOST_LEN - 1, "%s", name);
+ snprintf(knet_h->host_index[host_id]->name, KNET_MAX_HOST_LEN, "%s", name);
exit_unlock:
pthread_rwlock_unlock(&knet_h->global_rwlock);

9
kronosnet.spec
View File

@ -20,7 +20,7 @@
Name: kronosnet
Summary: Multipoint-to-Multipoint VPN daemon
Version: 1.13
Release: 2
Release: 3
License: GPLv2+ and LGPLv2+
URL: https://kronosnet.org
Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
@ -65,8 +65,10 @@ BuildRequires: libnl3-devel
BuildRequires: autoconf automake libtool
%endif
Patch0001: backport-kronosnet-fix-format-truncation.patch
%prep
%setup -q -n %{name}-%{version}
%autosetup -n kronosnet-%{version} -p1
%build
%if %{with runautogen}
@ -434,5 +436,8 @@ Requires: libknet1%{_isa} = %{version}-%{release}
%endif
%changelog
* Wed Aug 04 2021 Liu Yinsi <liuyinsi@163.com> - 1.13-3
- fix format-truncation to support gcc 10
* Sat Jul 18 2020 yanan li <liyanan032@huawei.com> - 1.13-2
- Package init