You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ii...@apache.org on 2016/04/28 17:35:47 UTC

[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 <ii...@ca.ibm.com>
Authored: Tue Apr 26 17:35:03 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
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
         {


[2/2] couch commit: updated refs/heads/master to 636d30a

Posted by ii...@apache.org.
Merge remote branch 'cloudant:1425-fix-character-advancement'

This closes #168

Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/636d30ac
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/636d30ac
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/636d30ac

Branch: refs/heads/master
Commit: 636d30aced47dda261a9c0e506c592df16b02646
Parents: b1127cd e142672
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Apr 28 08:35:30 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Apr 28 08:35:30 2016 -0700

----------------------------------------------------------------------
 priv/couch_js/utf8.c | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------