Compare commits

..

No commits in common. "41ff320c009471862f466ac1d96ae515e8964426" and "5001416fd0f4f4d98d46ee6bf2673897c8ef97be" have entirely different histories.

4 changed files with 60 additions and 21 deletions

View File

@ -0,0 +1,52 @@
From 82ba55b8f994ab30ff561a347b82ea340ba7075c Mon Sep 17 00:00:00 2001
From: "Thomas E. Dickey" <dickey@invisible-island.net>
Date: Tue, 9 Feb 2021 23:04:41 +0000
Subject: [PATCH] snapshot of project "xterm", label xterm-365d
--- a/button.c
+++ b/button.c
@@ -4323,6 +4323,7 @@ SaltTextAway(XtermWidget xw,
int i;
int eol;
int need = 0;
+ size_t have = 0;
Char *line;
Char *lp;
CELL first = *cellc;
@@ -4357,7 +4358,11 @@ SaltTextAway(XtermWidget xw,
/* UTF-8 may require more space */
if_OPT_WIDE_CHARS(screen, {
- need *= 4;
+ if (need > 0) {
+ if (screen->max_combining > 0)
+ need += screen->max_combining;
+ need *= 6;
+ }
});
/* now get some memory to save it in */
@@ -4395,10 +4400,20 @@ SaltTextAway(XtermWidget xw,
}
*lp = '\0'; /* make sure we have end marked */
- TRACE(("Salted TEXT:%u:%s\n", (unsigned) (lp - line),
- visibleChars(line, (unsigned) (lp - line))));
+ have = (size_t) (lp - line);
+ /*
+ * Scanning the buffer twice is unnecessary. Discard unwanted memory if
+ * the estimate is too-far off.
+ */
+ if ((have * 2) < (size_t) need) {
+ scp->data_limit = have + 1;
+ line = realloc(line, scp->data_limit);
+ }
+
+ TRACE(("Salted TEXT:%u:%s\n", (unsigned) have,
+ visibleChars(line, (unsigned) have)));
- scp->data_length = (size_t) (lp - line);
+ scp->data_length = have;
}
#if OPT_PASTE64

BIN
xterm-363.tgz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,12 +1,14 @@
Name: xterm
Version: 388
Release: 1
Version: 363
Release: 2
Summary: It is a terminal emulator for the X Window System
License: MIT
URL: http://invisible-island.net/xterm
Source0: https://invisible-mirror.net/archives/xterm/xterm-%{version}.tgz
BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel
Patch6000: backport-CVE-2021-27135.patch
BuildRequires: gcc git pkgconfig ncurses-devel libutempter-devel
BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
BuildRequires: libxkbfile-devel xorg-x11-apps
@ -26,7 +28,7 @@ Summary: Doc files for xterm
The xterm-help package contains doc files for xterm.
%prep
%autosetup -n xterm-%{version} -p1
%autosetup -n xterm-363 -p1 -S git
iconv -f iso8859-1 -t utf-8 < THANKS > TEMP
touch -r THANKS TEMP; mv TEMP THANKS
@ -62,28 +64,13 @@ install -m 644 -p xterm.appdata.xml %{buildroot}/%{_datadir}/appdata
%{_mandir}/man1/*
%changelog
* Wed Dec 20 2023 zhangkea <zhangkea@uniontech.com> - 388-1
- Update to version 388
* Mon Aug 14 2023 wangqia <wangqia@uniontech.com> - 384-1
- Update to version 384
* Thu Apr 13 2023 penghaitao <htpengc@isoftstone.com> - 363-5
- fix bogus date in %changelog
* Tue Feb 22 2022 xingxing <xingxing9@h-partners.com> - 363-4
- fix CVE-2022-24130
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 363-3
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Wed Mar 03 2021 jinzhimin <jinzhimin2@huawei.com> - 363-2
- fix CVE-2021-27135
* Thu Jan 28 2021 jinzhimin <jinzhimin2@huawei.com> - 363-1
- Upgrade to 363
* Tue Sep 29 2020 hanhui <hanhui15@huawei.com> - 334-6
* Thu Sep 29 2020 hanhui <hanhui15@huawei.com> - 334-6
- Type:bugfix
- ID:NA
- SUG:NA
@ -95,7 +82,7 @@ install -m 644 -p xterm.appdata.xml %{buildroot}/%{_datadir}/appdata
- SUG:NA
- DESC:modify source url
* Fri Jan 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 334-4
* Thu Jan 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 334-4
- Type:bugfix
- ID:NA
- SUG:NA