diff --git a/0036-enhance-pointer-safe.patch b/0036-enhance-pointer-safe.patch new file mode 100644 index 0000000000000000000000000000000000000000..b7084530a0f30aa1401a30c67a6fc51dfefff884 --- /dev/null +++ b/0036-enhance-pointer-safe.patch @@ -0,0 +1,33 @@ +From 9cf127b4297b8d0e4f3fd34c264d7b1648bad77f Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Fri, 3 May 2024 12:38:39 +0200 +Subject: [PATCH] const: suffixes + +--- + tools/lvmcmdline.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 66b269538..38e3ce190 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -552,7 +552,7 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), + { + char *ptr; + int i; +- static const char *suffixes = "kmgtpebs"; ++ static const char _suffixes[] = "kmgtpebs"; + char *val; + double v; + uint64_t v_tmp, adjustment; +@@ -612,8 +612,8 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), + return 0; + } + } else if (*ptr) { +- for (i = strlen(suffixes) - 1; i >= 0; i--) +- if (suffixes[i] == tolower((int) *ptr)) ++ for (i = sizeof(_suffixes) - 1; i >= 0; --i) ++ if (_suffixes[i] == tolower((int) *ptr)) + break; + + if (i < 0) { diff --git a/lvm2.spec b/lvm2.spec index 8f4e8d3781f0a2875bf6f55ac161f71c6968e585..03abdc91d23e8775eec2c17f1fc05c6dc5433f02 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.09 -Release: 26 +Release: 27 Epoch: 8 Summary: Tools for logical volume management License: GPLv2+ and LGPLv2.1 and BSD @@ -84,6 +84,7 @@ Patch32: 0032-fix-function-undeclared-in-libdm-common.c-and-dev-cache.c.patch Patch33: 0033-fix-pv_major-and-pv_minor-report-field-type.patch Patch34: 0034-fix-buffer-size-usage.patch Patch35: 0035-add-internal-error-for-missing-vg.patch +Patch36: 0036-enhance-pointer-safe.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -509,6 +510,9 @@ fi %changelog +* Thu Nov 13 2025 weishuaihao - 8:2.03.09-27 +- enhance pointer safe + * Wed Nov 12 2025 weishuaihao - 8:2.03.09-26 - add internal error for missing vg