rollback strprint code modified
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit a8901d46cf940aedcde48d1b038aa059b3935fcb)
This commit is contained in:
parent
5fce256bef
commit
fffd3c2f94
26
0054-rollback-strprint-code-modified.patch
Normal file
26
0054-rollback-strprint-code-modified.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From aa328d34de2e6c0a8434ac4596344788539a3702 Mon Sep 17 00:00:00 2001
|
||||||
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||||
|
Date: Mon, 26 Dec 2022 11:11:32 +0800
|
||||||
|
Subject: [PATCH] rollback strprint code modified
|
||||||
|
|
||||||
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||||
|
---
|
||||||
|
src/lxc/confile_utils.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/lxc/confile_utils.h b/src/lxc/confile_utils.h
|
||||||
|
index 3655ec4..62990e9 100644
|
||||||
|
--- a/src/lxc/confile_utils.h
|
||||||
|
+++ b/src/lxc/confile_utils.h
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
if (str) \
|
||||||
|
len = snprintf(str, inlen, ##__VA_ARGS__); \
|
||||||
|
else \
|
||||||
|
- len = 0; \
|
||||||
|
+ len = snprintf((char *){""}, 0, ##__VA_ARGS__); \
|
||||||
|
if (len < 0) { \
|
||||||
|
SYSERROR("failed to create string"); \
|
||||||
|
return -1; \
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
|||||||
%global _release 2022102405
|
%global _release 2022102406
|
||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 4.0.3
|
Version: 4.0.3
|
||||||
@ -61,6 +61,7 @@ Patch0050: 0050-lxc-Add-sw64-architecture.patch
|
|||||||
Patch0051: 0051-add-macro-to-adapt-musl-libc.patch
|
Patch0051: 0051-add-macro-to-adapt-musl-libc.patch
|
||||||
Patch0052: 0052-add-lxc-attach-add-gids-option.patch
|
Patch0052: 0052-add-lxc-attach-add-gids-option.patch
|
||||||
Patch0053: 0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch
|
Patch0053: 0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch
|
||||||
|
Patch0054: 0054-rollback-strprint-code-modified.patch
|
||||||
|
|
||||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||||
BuildRequires: pkgconfig(libseccomp)
|
BuildRequires: pkgconfig(libseccomp)
|
||||||
@ -241,6 +242,12 @@ make check
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 26 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102406
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: rollback strprint code modified
|
||||||
|
|
||||||
* Fri Dec 16 2022 huangsong<huangsong14@huawei.com> - 4.0.3-2022102405
|
* Fri Dec 16 2022 huangsong<huangsong14@huawei.com> - 4.0.3-2022102405
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user