helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 21:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

xterm: Remove undeclared variables introduced by backport

Browse Source 
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>
This commit is contained in:
Chris Rogers 2023-03-10 10:36:34 -05:00 committed by Armin Kuster
parent 068acc4ec7
commit 7ae42df58f
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch
View File

@ -574,16 +574,7 @@ index 4b0ef85..d9bfaf8 100644
} }
} }
} }
@@ -4119,6 +4140,8 @@ findXftGlyph(XtermWidget xw, XftFont *given, unsigned wc) @@ -4317,7 +4338,7 @@ lookupOneFontSize(XtermWidget xw, int fontnum)
}
#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)
memset(&fnt, 0, sizeof(fnt)); memset(&fnt, 0, sizeof(fnt));
screen->menu_font_sizes[fontnum] = -1; screen->menu_font_sizes[fontnum] = -1;
@ -592,7 +583,7 @@ index 4b0ef85..d9bfaf8 100644
if (fontnum <= fontMenu_lastBuiltin if (fontnum <= fontMenu_lastBuiltin
|| strcmp(fnt.fn, DEFFONT)) { || strcmp(fnt.fn, DEFFONT)) {
screen->menu_font_sizes[fontnum] = FontSize(fnt.fs); 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, TRACE(("SetVTFont(which=%d, f_n=%s, f_b=%s)\n", which,
(fonts && fonts->f_n) ? fonts->f_n : "<null>", (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)) { if (IsIcon(screen)) {
Bell(xw, XkbBI_MinorError, 0); Bell(xw, XkbBI_MinorError, 0);
} else if (which >= 0 && which < NMENUFONTS) { } else if (which >= 0 && which < NMENUFONTS) {
@ -659,7 +650,7 @@ index 4b0ef85..d9bfaf8 100644
} }
USE_CACHED(f_n, fNorm); USE_CACHED(f_n, fNorm);
@@ -4774,7 +4795,7 @@ SetVTFont(XtermWidget xw, @@ -4774,7 +4793,7 @@ SetVTFont(XtermWidget xw,
USE_CACHED(f_wb, fWBold); USE_CACHED(f_wb, fWBold);
#endif #endif
if (xtermLoadFont(xw, if (xtermLoadFont(xw,
@ -668,7 +659,7 @@ index 4b0ef85..d9bfaf8 100644
doresize, which)) { doresize, which)) {
/* /*
* If successful, save the data so that a subsequent query via * 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_w, fWide);
SAVE_FNAME(f_wb, fWBold); SAVE_FNAME(f_wb, fWBold);
#endif #endif
@ -680,7 +671,7 @@ index 4b0ef85..d9bfaf8 100644
Bell(xw, XkbBI_MinorError, 0); Bell(xw, XkbBI_MinorError, 0);
} }
FREE_FNAME(f_n); FREE_FNAME(f_n);
@@ -4802,7 +4821,8 @@ SetVTFont(XtermWidget xw, @@ -4802,7 +4819,8 @@ SetVTFont(XtermWidget xw,
} else { } else {
Bell(xw, XkbBI_MinorError, 0); Bell(xw, XkbBI_MinorError, 0);
} }