From owner-freebsd-bugs@FreeBSD.ORG Wed Jul 11 07:30:02 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B66681065670 for ; Wed, 11 Jul 2012 07:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 898398FC08 for ; Wed, 11 Jul 2012 07:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6B7U2HF057239 for ; Wed, 11 Jul 2012 07:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6B7U2K8057233; Wed, 11 Jul 2012 07:30:02 GMT (envelope-from gnats) Resent-Date: Wed, 11 Jul 2012 07:30:02 GMT Resent-Message-Id: <201207110730.q6B7U2K8057233@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kuan-Chung Chiu Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 31970106566B for ; Wed, 11 Jul 2012 07:26:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 046EF8FC08 for ; Wed, 11 Jul 2012 07:26:30 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6B7QTkr005796 for ; Wed, 11 Jul 2012 07:26:29 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q6B7QTE2005795; Wed, 11 Jul 2012 07:26:29 GMT (envelope-from nobody) Message-Id: <201207110726.q6B7QTE2005795@red.freebsd.org> Date: Wed, 11 Jul 2012 07:26:29 GMT From: Kuan-Chung Chiu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/169780: [patch] add patch to fix utf-8 decoding bug for irc/irssi X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 07:30:02 -0000 >Number: 169780 >Category: misc >Synopsis: [patch] add patch to fix utf-8 decoding bug for irc/irssi >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jul 11 07:30:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Kuan-Chung Chiu >Release: >Organization: Sixnology >Environment: >Description: Fetch from: http://bugs.irssi.org/index.php?do=details&task_id=870&project=5 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN irssi.orig/Makefile irssi/Makefile --- irssi.orig/Makefile 2012-07-11 15:19:59.000000000 +0800 +++ irssi/Makefile 2012-07-11 15:23:37.000000000 +0800 @@ -7,7 +7,7 @@ PORTNAME= irssi PORTVERSION= 0.8.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= irc MASTER_SITES= http://mirror.irssi.org/ diff -ruN irssi.orig/files/patch-irssi-utf8 irssi/files/patch-irssi-utf8 --- irssi.orig/files/patch-irssi-utf8 1970-01-01 08:00:00.000000000 +0800 +++ irssi/files/patch-irssi-utf8 2012-06-10 13:10:50.000000000 +0800 @@ -0,0 +1,40 @@ +Index: src/fe-common/core/utf8.h +=================================================================== +--- src/fe-common/core/utf8.h (revision 5189) ++++ src/fe-common/core/utf8.h (working copy) +@@ -12,5 +12,6 @@ + int mk_wcwidth(unichar c); + + #define unichar_isprint(c) (((c) & ~0x80) >= 32) ++#define is_utf8_leading(c) (((c) & 0xc0) != 0x80) + + #endif +Index: src/fe-text/textbuffer.c +=================================================================== +--- src/fe-text/textbuffer.c (revision 5189) ++++ src/fe-text/textbuffer.c (working copy) +@@ -23,6 +23,7 @@ + #include "module.h" + #include "misc.h" + #include "formats.h" ++#include "utf8.h" + + #include "textbuffer.h" + +@@ -157,6 +158,16 @@ + if (left > 0 && data[left-1] == 0) + left--; /* don't split the commands */ + ++ /* don't split utf-8 character. (assume we can split non-utf8 anywhere. */ ++ if (left < TEXT_CHUNK_USABLE_SIZE && !is_utf8_leading(data[left])) { ++ int i; ++ for (i = 1; i < 4 && left >= i; i++) ++ if (is_utf8_leading(data[left - i])) { ++ left -= i; ++ break; ++ } ++ } ++ + memcpy(chunk->buffer + chunk->pos, data, left); + chunk->pos += left; + >Release-Note: >Audit-Trail: >Unformatted: