mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
gnulib: Bring back the fix for resolving unused variable issue
This patch resolved a minor issue spotted by Coverity:a983d36bd9(gnulib/regexec: Resolve unused variable) But, it was removed by the Gnulib update:2b79024598(Update gnulib version and drop most gnulib patches) It caused Coverity to continue to flag the issue. Daniel Kiper suggested to bring back the patcha983d36bd9(gnulib/regexec: Resolve unused variable). Fixes: CID 292459 Signed-off-by: Lidong Chen <lidong.chen@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
1 parent
ac1512b872
commit
5eca564b19
3 files changed
+17
-1
No files matched your search
+2
-1
@@ -87,7 +87,8 @@ bootstrap_post_import_hook () {
|
|||||||
for patchname in fix-width \
|
for patchname in fix-width \
|
||||||
fix-regcomp-resource-leak \
|
fix-regcomp-resource-leak \
|
||||||
fix-regexec-resource-leak \
|
fix-regexec-resource-leak \
|
||||||
fix-gcc-15-compile; do
|
fix-gcc-15-compile \
|
||||||
|
fix-unused-value; do
|
||||||
patch -d grub-core/lib/gnulib -p2 \
|
patch -d grub-core/lib/gnulib -p2 \
|
||||||
< "grub-core/lib/gnulib-patches/$patchname.patch"
|
< "grub-core/lib/gnulib-patches/$patchname.patch"
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
|
|||||||
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-resource-leak.patch
|
||||||
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-resource-leak.patch
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-resource-leak.patch
|
||||||
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-gcc-15-compile.patch
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-gcc-15-compile.patch
|
||||||
|
EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
|
||||||
|
|
||||||
EXTRA_DIST += grub-core/lib/libgcrypt
|
EXTRA_DIST += grub-core/lib/libgcrypt
|
||||||
EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
|
EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000
|
||||||
|
+++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000
|
||||||
|
@@ -828,7 +828,11 @@
|
||||||
|
break;
|
||||||
|
if (__glibc_unlikely (err != REG_NOMATCH))
|
||||||
|
goto free_return;
|
||||||
|
+#ifdef DEBUG
|
||||||
|
+ /* Only used for assertion below when DEBUG is set, otherwise
|
||||||
|
+ it will be over-written when we loop around. */
|
||||||
|
match_last = -1;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break; /* We found a match. */
|
||||||
Reference in new issue
Block a user