diff options
| author |   Chris Rogers <crogers122@gmail.com> | 2023-03-10 10:36:34 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2023-03-18 16:16:42 -0400 |
| commit | 7ae42df58f2bcc730153715c3339a6875b0b2497 (patch) | |
| tree | c5b539594fb72af182e397b90b32347913ad62b5 | |
| parent | 068acc4ec714165cab50e46018136e4bcef81815 (diff) | |
| download | meta-openembedded-7ae42df58f2bcc730153715c3339a6875b0b2497.tar.gz | |
xterm: Remove undeclared variables introduced by backport
CVE-2022-45063 ported onto the dunfell baseline introduces two
variables that cause xterm to fail compilation with the error
./fontutils.c:4143:13: error: 'added' undeclared (first use in this function)
These two variables don't appear to be defined at all in findXftGlyph for
xterm_353, so they should be removed.
Fixes: 10148c538ebc("xterm : Fix CVE-2022-45063 code execution via OSC 50 input sequences] CVE-2022-45063")
Signed-off-by: Chris Rogers <crogers122@gmail.com>
Tested-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch b/meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch index 8d1be32106..e63169a209 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch +++ b/meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch @@ -574,16 +574,7 @@ index 4b0ef85..d9bfaf8 100644 } } } -@@ -4119,6 +4140,8 @@ findXftGlyph(XtermWidget xw, XftFont *given, unsigned wc) - } - #endif - if (foundXftGlyph(xw, check, wc)) { -+ (void) added; -+ (void) actual; - markXftOpened(xw, which, n, wc); - reportXftFonts(xw, check, "fallback", tag, myReport); - result = check; -@@ -4317,7 +4340,7 @@ lookupOneFontSize(XtermWidget xw, int fontnum) +@@ -4317,7 +4338,7 @@ lookupOneFontSize(XtermWidget xw, int fontnum) memset(&fnt, 0, sizeof(fnt)); screen->menu_font_sizes[fontnum] = -1; @@ -592,7 +583,7 @@ index 4b0ef85..d9bfaf8 100644 if (fontnum <= fontMenu_lastBuiltin || strcmp(fnt.fn, DEFFONT)) { screen->menu_font_sizes[fontnum] = FontSize(fnt.fs); -@@ -4722,13 +4745,14 @@ HandleSetFont(Widget w GCC_UNUSED, +@@ -4722,13 +4743,14 @@ HandleSetFont(Widget w GCC_UNUSED, } } @@ -608,7 +599,7 @@ index 4b0ef85..d9bfaf8 100644 TRACE(("SetVTFont(which=%d, f_n=%s, f_b=%s)\n", which, (fonts && fonts->f_n) ? fonts->f_n : "<null>", -@@ -4737,34 +4761,31 @@ SetVTFont(XtermWidget xw, +@@ -4737,34 +4759,31 @@ SetVTFont(XtermWidget xw, if (IsIcon(screen)) { Bell(xw, XkbBI_MinorError, 0); } else if (which >= 0 && which < NMENUFONTS) { @@ -659,7 +650,7 @@ index 4b0ef85..d9bfaf8 100644 } USE_CACHED(f_n, fNorm); -@@ -4774,7 +4795,7 @@ SetVTFont(XtermWidget xw, +@@ -4774,7 +4793,7 @@ SetVTFont(XtermWidget xw, USE_CACHED(f_wb, fWBold); #endif if (xtermLoadFont(xw, @@ -668,7 +659,7 @@ index 4b0ef85..d9bfaf8 100644 doresize, which)) { /* * If successful, save the data so that a subsequent query via -@@ -4786,10 +4807,8 @@ SetVTFont(XtermWidget xw, +@@ -4786,10 +4805,8 @@ SetVTFont(XtermWidget xw, SAVE_FNAME(f_w, fWide); SAVE_FNAME(f_wb, fWBold); #endif @@ -680,7 +671,7 @@ index 4b0ef85..d9bfaf8 100644 Bell(xw, XkbBI_MinorError, 0); } FREE_FNAME(f_n); -@@ -4802,7 +4821,8 @@ SetVTFont(XtermWidget xw, +@@ -4802,7 +4819,8 @@ SetVTFont(XtermWidget xw, } else { Bell(xw, XkbBI_MinorError, 0); } |