Lines Matching +full:2020 +full:- +full:12 +full:- +full:10
3 Date: Wed, 28 Oct 2020 14:43:01 +0000
4 Subject: [PATCH] gnulib/argp-help: Fix dereference of a possibly NULL state
8 attempting to dereference it to get the root_argp->argp_domain.
12 Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
13 Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
15 Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
16 ---
18 conf/Makefile.extra-dist | 1 +
19 grub-core/lib/gnulib-patches/fix-null-state-deref.patch | 12 ++++++++++++
20 grub-core/lib/gnulib/argp-help.c | 3 ++-
21 4 files changed, 16 insertions(+), 1 deletion(-)
22 create mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch
24 diff --git a/Makefile.in b/Makefile.in
26 --- a/Makefile.in
28 @@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \
29 grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \
30 grub-core/genemuinit.sh grub-core/genemuinitheader.sh \
31 grub-core/lib/gnulib-patches/fix-null-deref.patch \
32 + grub-core/lib/gnulib-patches/fix-null-state-deref.patch \
33 grub-core/lib/gnulib-patches/fix-uninit-structure.patch \
34 grub-core/lib/gnulib-patches/fix-unused-value.patch \
35 grub-core/lib/gnulib-patches/fix-width.patch \
36 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
38 --- a/conf/Makefile.extra-dist
39 +++ b/conf/Makefile.extra-dist
40 @@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
41 EXTRA_DIST += grub-core/genemuinitheader.sh
43 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
44 +EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch
45 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
46 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
47 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
48 diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches…
51 --- /dev/null
52 +++ b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch
53 @@ -0,0 +1,12 @@
54 +--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000
55 ++++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000
56 +@@ -145,7 +145,8 @@
57 + if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
60 +- dgettext (state->root_argp->argp_domain,
62 ++ : state->root_argp->argp_domain,
65 + "rmargin", up->name);
66 diff --git a/grub-core/lib/gnulib/argp-help.c b/grub-core/lib/gnulib/argp-help.c
68 --- a/grub-core/lib/gnulib/argp-help.c
69 +++ b/grub-core/lib/gnulib/argp-help.c
70 @@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr)
71 if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
74 - dgettext (state->root_argp->argp_domain,
76 + : state->root_argp->argp_domain,
79 "rmargin", up->name);
80 --