From nobody Mon Jul 6 13:18:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gv4gj0lPfz6jXP7 for ; Mon, 06 Jul 2026 13:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gv4gh6xYJz3qB6 for ; Mon, 06 Jul 2026 13:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783343937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zS/fv17PzNVKS0f2ifoDNhlIe0w5QkoBgAdLeBikzLo=; b=JvjI9m3b+AhIQ8LzpIFdemYuMmkxVDBybk7ISrh2An7gOZv8kFHv9EREx5KhWQMuc17g4x DY5FREAPM3140/ktQr/lX1bIbLUP8zv1ndL+T+xwv+zCLCgAO1h9iP4lJMqWy95g/QMegf AVDCeGaJ5DZiFQwVCPf+u/5mQBXUZARmaNXdNf/PlACubrKubV1gcKhMtlhmkPakQ0e9zP +Tc90kesD7lNnwoPEb6d3ICbss2Q/q1OW/Nte2ugerMLgh0W/9Itd/RMqDQMXLwDx7/9G0 1rSaBc5GgDPNtsMXuWOqSgAQpTN6z9+1NUnVtLt3mg4YJLweQiNj7/OGWa0rEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783343937; a=rsa-sha256; cv=none; b=avWW6PYGVVILm2hf4aMPXsG8RMR6Ch2Bt3XytQrk2kmyCO/1nEJ58HEHSnTsNOsk7mSDqO ING8mUo1w20yQiaxYaehXIiTPSW0D/Zan5yzDecL0HcsghvRy34VwjKCCGf8aI0azNR29T w1sinIvfDo5CFWxGvDW0dhQ0oIuc1BcLHMm0Zc8Vjf/VSCow94UsKXy9I9rrGfQrEbxSgk rNaBNVl5qkWAhQBrYJG/sgW4Wg4Vts+CjMnD88FihFVvdpZvvOnTL6gD8Z4tELZ4tOpihW q+vLwGbRfBNk+ap1gyXHN4YKk0+1nvti95asWYt2np2OehQQ5v71E/AYE1S0Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783343937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zS/fv17PzNVKS0f2ifoDNhlIe0w5QkoBgAdLeBikzLo=; b=oOdQUmnE4xgShJpLhX8FMiHxjtxQTv5yDtdv39Bgk/YYiCXxRvDEDqxPTIZJ+PD0BFqy1R Ti7ApIFrQ6z1st45wr38X7aIrxm69zZx8fo36dyAXCGp/7zGlYABN5+jdRgmQCfSeTWdRY w6FhaWoXuyVD3TVqvuSdFkic3rGXNCmFYZ8/SxQ9Xo7BcQiZBVOP0VyeWi7apQPtBW0chy C0Cm8HN1hjpcy9bXR/Et4/84ZwvsK82Vj2SV82gq2pDHNP/0JOlo/iV8vBrNofBgIpwuIJ BEKpDiOjC8Xrl5w9Y32DhgcQspPpxvNlObjnNifJ8AASIR/2akoSofARYhUekg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gv4gh5ybfz15P5 for ; Mon, 06 Jul 2026 13:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fbb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 13:18:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 705a88a71727 - main - ee: Improve handling of malformed UTF-8 characters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 705a88a717272c52c897c3d28dc2997980ee67f4 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 13:18:51 +0000 Message-Id: <6a4bab3b.3fbb2.737b6ba9@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=705a88a717272c52c897c3d28dc2997980ee67f4 commit 705a88a717272c52c897c3d28dc2997980ee67f4 Author: Mark Johnston AuthorDate: 2026-07-06 13:16:32 +0000 Commit: Mark Johnston CommitDate: 2026-07-06 13:18:13 +0000 ee: Improve handling of malformed UTF-8 characters In delete(), when copying the deleted character to the d_char buffer, don't assume that it fits. utf8_prev() may return a sequence of more than 5 bytes. In insert_utf8(), fix the copy-up of the line. We extended the line by "len" bytes, so "temp" has to be repositioned accordingly. Compare with plain insert(). Use sizeof when copying to buffers instead of hard-coding buffer sizes. Don't dynamically allocate d_char, there is no need. Fixes: 62fba0054d9e ("ee: add unicode support") Reported by: Sayono Hiragi (overflow in delete()) Reviewed by: bapt MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57996 --- contrib/ee/ee.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 13a554bf0146..94bb296bcd65 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -194,7 +194,7 @@ unsigned char *srch_2; /* pointer to next character of string */ unsigned char *srch_3; unsigned char *in_file_name = NULL; /* name of input file */ char *tmp_file; /* temporary file name */ -unsigned char *d_char; /* deleted character */ +unsigned char d_char[5]; /* deleted character */ unsigned char *d_word; /* deleted word */ unsigned char *d_line; /* deleted line */ char in_string[513]; /* buffer for reading a file */ @@ -598,7 +598,6 @@ main(int argc, char *argv[]) signal(SIGCHLD, SIG_DFL); signal(SIGSEGV, SIG_DFL); signal(SIGINT, edit_abort); - d_char = malloc(5); /* UTF-8 chars can be up to 4 bytes + NUL */ d_word = malloc(150); *d_word = '\0'; d_line = NULL; @@ -832,7 +831,6 @@ insert_utf8(const unsigned char *mb, int len) { int counter; unsigned char *temp; - unsigned char *temp2; int i; text_changes = TRUE; @@ -848,17 +846,18 @@ insert_utf8(const unsigned char *mb, int len) counter++; temp++; } - temp++; - while (point < temp) + temp += len; + while (point + len - 1 < temp) { + unsigned char *temp2; + temp2 = temp - len; *temp = *temp2; temp--; } /* copy all bytes of the UTF-8 character */ - for (i = 0; i < len; i++) - point[i] = mb[i]; + memmove(point, mb, len); /* display the character before advancing past it */ wclrtoeol(text_win); @@ -931,8 +930,10 @@ delete(int disp) scr_pos = scr_horz; if (in == 8) { - memcpy(d_char, point, del_width); - d_char[del_width] = '\0'; + size_t width = min(del_width, 4); + + memcpy(d_char, point, width); + d_char[width] = '\0'; } while (temp_pos <= curr_line->line_length) { @@ -2993,7 +2994,7 @@ del_word(void) if (d_word != NULL) free(d_word); d_word = malloc(curr_line->line_length); - memcpy(tmp_char, d_char, 5); + memcpy(tmp_char, d_char, sizeof(tmp_char)); d_word3 = point; d_word2 = d_word; tposit = position; @@ -3026,7 +3027,7 @@ del_word(void) curr_line->line_length -= difference; *d_word2 = '\0'; draw_line(scr_vert, scr_horz,point,position,curr_line->line_length); - memcpy(d_char, tmp_char, 5); + memcpy(d_char, tmp_char, sizeof(d_char)); text_changes = TRUE; formatted = FALSE; } @@ -4141,7 +4142,7 @@ Format(void) unsigned char *temp_dword; unsigned char temp_d_char[5]; - memcpy(temp_d_char, d_char, 5); + memcpy(temp_d_char, d_char, sizeof(temp_d_char)); /* | if observ_margins is not set, or the current line is blank, @@ -4336,7 +4337,7 @@ Format(void) case_sen = temp_case; free(srch_str); srch_str = tmp_srchstr; - memcpy(d_char, temp_d_char, 5); + memcpy(d_char, temp_d_char, sizeof(d_char)); auto_format = tmp_af; midscreen(scr_vert, point); @@ -4720,7 +4721,7 @@ Auto_Format(void) unsigned char temp_d_char[5]; unsigned char *tmp_d_line; - memcpy(temp_d_char, d_char, 5); + memcpy(temp_d_char, d_char, sizeof(temp_d_char)); /* | if observ_margins is not set, or the current line is blank, @@ -4946,7 +4947,7 @@ Auto_Format(void) case_sen = temp_case; free(srch_str); srch_str = tmp_srchstr; - memcpy(d_char, temp_d_char, 5); + memcpy(d_char, temp_d_char, sizeof(d_char)); auto_format = TRUE; dlt_line->line_length = tmp_d_line_length; d_line = tmp_d_line;