Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5842419482 for ; Thu, 28 Apr 2016 15:35:48 +0000 (UTC) Received: (qmail 91247 invoked by uid 500); 28 Apr 2016 15:35:48 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 91204 invoked by uid 500); 28 Apr 2016 15:35:48 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 91186 invoked by uid 99); 28 Apr 2016 15:35:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2016 15:35:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F39B3DFE04; Thu, 28 Apr 2016 15:35:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Apr 2016 15:35:47 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] couch commit: updated refs/heads/master to 636d30a Repository: couchdb-couch Updated Branches: refs/heads/master b1127cdf5 -> 636d30ace Undo our character advancement when we fixup We should undo our character advancement after we finish fixup. COUCHDB-1425 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e142672d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e142672d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e142672d Branch: refs/heads/master Commit: e142672d33ace391f6ded1a3c2dfe3db0955028c Parents: b1127cd Author: ILYA Khlopotov Authored: Tue Apr 26 17:35:03 2016 -0700 Committer: ILYA Khlopotov Committed: Tue Apr 26 17:45:48 2016 -0700 ---------------------------------------------------------------------- priv/couch_js/utf8.c | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e142672d/priv/couch_js/utf8.c ---------------------------------------------------------------------- diff --git a/priv/couch_js/utf8.c b/priv/couch_js/utf8.c index 2d23cc2..fcafff6 100644 --- a/priv/couch_js/utf8.c +++ b/priv/couch_js/utf8.c @@ -84,6 +84,9 @@ enc_charbuf(const jschar* src, size_t srclen, char* dst, size_t* dstlenp) // Invalid second half of surrogate pair v = (uint32) 0xFFFD; } + // Undo our character advancement + src--; + srclen++; } else {