From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kazuhiro Ito Newsgroups: gmane.emacs.bugs Subject: bug#9318: 23.3.50; The first call of encode-coding-region() returns wrong result Date: Wed, 31 Aug 2011 08:30:47 +0900 Message-ID: <20110830233131.C74A61E0043@msa101.auone-net.jp> References: <20110818090129.DC129360038@msa102.auone-net.jp> <20110819134637.9727A34803A@msa103.auone-net.jp> <877h67vkpf.fsf@stupidchicken.com> <20110821001726.D29052C037@msa104.auone-net.jp> <20110824093755.8E190360038@msa102.auone-net.jp> <20110825095522.6E2482C037@msa104.auone-net.jp> <20110826114235.4F8011E0043@msa101.auone-net.jp> <20110828000528.8163B1E0043@msa101.auone-net.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI-EPG 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: dough.gmane.org 1314747124 9026 80.91.229.12 (30 Aug 2011 23:32:04 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 30 Aug 2011 23:32:04 +0000 (UTC) Cc: Chong Yidong , 9318@debbugs.gnu.org To: Andreas Schwab Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 31 01:32:00 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QyXmf-0008Em-U9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Aug 2011 01:31:58 +0200 Original-Received: from localhost ([::1]:44044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyXmf-0008Rz-3M for geb-bug-gnu-emacs@m.gmane.org; Tue, 30 Aug 2011 19:31:57 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:58466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyXmc-0008Rj-7Y for bug-gnu-emacs@gnu.org; Tue, 30 Aug 2011 19:31:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QyXmb-0005ff-34 for bug-gnu-emacs@gnu.org; Tue, 30 Aug 2011 19:31:54 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyXmb-0005fT-1V for bug-gnu-emacs@gnu.org; Tue, 30 Aug 2011 19:31:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QyXpe-0005vU-57; Tue, 30 Aug 2011 19:35:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kazuhiro Ito Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Aug 2011 23:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9318 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9318-submit@debbugs.gnu.org id=B9318.131474728922765 (code B ref 9318); Tue, 30 Aug 2011 23:35:02 +0000 Original-Received: (at 9318) by debbugs.gnu.org; 30 Aug 2011 23:34:49 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QyXpQ-0005v6-E4 for submit@debbugs.gnu.org; Tue, 30 Aug 2011 19:34:49 -0400 Original-Received: from msa101.auone-net.jp ([61.117.18.161]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QyXpM-0005uv-7x for 9318@debbugs.gnu.org; Tue, 30 Aug 2011 19:34:47 -0400 Original-Received: from GUNGNIR.med.osaka-cu.ac.jp (unknown [114.179.36.76]) by msa101.auone-net.jp (au one net msa) with ESMTP id C74A61E0043; Wed, 31 Aug 2011 08:31:30 +0900 (JST) In-Reply-To: <20110828000528.8163B1E0043@msa101.auone-net.jp> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/23.3.50 (i386-mingw-nt6.1.7601) MULE/6.0 (HANACHIRUSATO) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 30 Aug 2011 19:35:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:50457 Archived-At: > > SUMMARY OF THE PROBLEM: > > In encode_coding_XXX(), calling encode_char() could cause relocation > > of buffers. char_charset(), ENCODE_ISO_CHARACTER and ENCODE_CHAR > > could also cause relocation because they could call encode_char(). > > After using of them, coding->destination, dst, dst_end should be > > updated as needed. > > I noticed CHAR_CHARSET_P macro slipped out of my check. > CHAR_CHARSET_P could also cause relocation of buffers. Here is the patch for the code, which contains Andreas' patch. In my environment, problems are fixed. I think it would be better that the interface of encode_designation_at_bol() is changed. === modified file 'src/coding.c' --- src/coding.c 2011-05-09 09:59:23 +0000 +++ src/coding.c 2011-08-28 07:33:54 +0000 @@ -1026,6 +1026,54 @@ } \ } while (0) +#define CODING_ENCODE_CHAR(coding, dst, dst_end, charset, c, code) \ + do { \ + charset_map_loaded = 0; \ + code = ENCODE_CHAR (charset, c); \ + if (charset_map_loaded) \ + { \ + const unsigned char *orig = coding->destination; \ + EMACS_INT offset; \ + \ + coding_set_destination (coding); \ + offset = coding->destination - orig; \ + dst += offset; \ + dst_end += offset; \ + } \ + } while (0) + +#define CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, code_return, charset) \ + do { \ + charset_map_loaded = 0; \ + charset = char_charset (c, charset_list, code_return); \ + if (charset_map_loaded) \ + { \ + const unsigned char *orig = coding->destination; \ + EMACS_INT offset; \ + \ + coding_set_destination (coding); \ + offset = coding->destination - orig; \ + dst += offset; \ + dst_end += offset; \ + } \ + } while (0) + +#define CODING_CHAR_CHARSET_P(coding, dst, dst_end, c, charset, result) \ + do { \ + charset_map_loaded = 0; \ + result = CHAR_CHARSET_P(c, charset); \ + if (charset_map_loaded) \ + { \ + const unsigned char *orig = coding->destination; \ + EMACS_INT offset; \ + \ + coding_set_destination (coding); \ + offset = coding->destination - orig; \ + dst += offset; \ + dst_end += offset; \ + } \ + } while (0) + /* If there are at least BYTES length of room at dst, allocate memory for coding->destination and update dst and dst_end. We don't have @@ -2778,14 +2826,19 @@ if (preferred_charset_id >= 0) { + int result; + charset = CHARSET_FROM_ID (preferred_charset_id); - if (CHAR_CHARSET_P (c, charset)) + CODING_CHAR_CHARSET_P (coding, dst, dst_end, c, charset, result); + if (result) code = ENCODE_CHAR (charset, c); else - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); } else - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); if (! charset) { c = coding->default_char; @@ -2794,7 +2847,8 @@ EMIT_ONE_ASCII_BYTE (c); continue; } - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); } dimension = CHARSET_DIMENSION (charset); emacs_mule_id = CHARSET_EMACS_MULE_ID (charset); @@ -4317,8 +4371,9 @@ #define ENCODE_ISO_CHARACTER(charset, c) \ do { \ - int code = ENCODE_CHAR ((charset),(c)); \ - \ + int code; \ + CODING_ENCODE_CHAR (coding, dst, dst_end, (charset), (c), code); \ + \ if (CHARSET_DIMENSION (charset) == 1) \ ENCODE_ISO_CHARACTER_DIMENSION1 ((charset), code); \ else \ @@ -4476,7 +4531,17 @@ c = *charbuf++; if (c == '\n') break; + + charset_map_loaded = 0; charset = char_charset (c, charset_list, NULL); + if (charset_map_loaded) + { + const unsigned char *orig = coding->destination; + + coding_set_destination (coding); + dst += coding->destination - orig; + } + id = CHARSET_ID (charset); reg = CODING_ISO_REQUEST (coding, id); if (reg >= 0 && r[reg] < 0) @@ -4543,6 +4608,12 @@ /* We have to produce designation sequences if any now. */ dst = encode_designation_at_bol (coding, charbuf, charbuf_end, dst); + if (charset_map_loaded) + { + EMACS_INT offset = coding->destination + coding->dst_bytes - dst_end; + dst_end += offset; + dst_prev += offset; + } bol_designation = 0; /* We are sure that designation sequences are all ASCII bytes. */ produced_chars += dst - dst_prev; @@ -4616,12 +4687,17 @@ if (preferred_charset_id >= 0) { + int result; + charset = CHARSET_FROM_ID (preferred_charset_id); - if (! CHAR_CHARSET_P (c, charset)) - charset = char_charset (c, charset_list, NULL); + CODING_CHAR_CHARSET_P (coding, dst, dst_end, c, charset, result); + if (! result) + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + NULL, charset); } else - charset = char_charset (c, charset_list, NULL); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + NULL, charset); if (!charset) { if (coding->mode & CODING_MODE_SAFE_ENCODING) @@ -4632,7 +4708,8 @@ else { c = coding->default_char; - charset = char_charset (c, charset_list, NULL); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, + charset_list, NULL, charset); } } ENCODE_ISO_CHARACTER (charset, c); @@ -5064,7 +5141,9 @@ else { unsigned code; - struct charset *charset = char_charset (c, charset_list, &code); + struct charset *charset; + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); if (!charset) { @@ -5076,7 +5155,8 @@ else { c = coding->default_char; - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, + charset_list, &code, charset); } } if (code == CHARSET_INVALID_CODE (charset)) @@ -5153,7 +5233,9 @@ else { unsigned code; - struct charset *charset = char_charset (c, charset_list, &code); + struct charset *charset; + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); if (! charset) { @@ -5165,7 +5247,8 @@ else { c = coding->default_char; - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, + charset_list, &code, charset); } } if (code == CHARSET_INVALID_CODE (charset)) @@ -5747,7 +5831,9 @@ } else { - charset = char_charset (c, charset_list, &code); + CODING_CHAR_CHARSET(coding, dst, dst_end, c, charset_list, + &code, charset); + if (charset) { if (CHARSET_DIMENSION (charset) == 1) -- Kazuhiro Ito