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 7EFE797C7 for ; Tue, 14 May 2013 22:19:44 +0000 (UTC) Received: (qmail 26268 invoked by uid 500); 14 May 2013 22:19:44 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 26133 invoked by uid 500); 14 May 2013 22:19:44 -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 26126 invoked by uid 99); 14 May 2013 22:19:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 22:19:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1BBE8A085; Tue, 14 May 2013 22:19:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org Message-Id: <6227375f74894e01aa00efccd073f4f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/1493-fix-zerobyte-json-parsing to 02416a1 Date: Tue, 14 May 2013 22:19:44 +0000 (UTC) Updated Branches: refs/heads/1493-fix-zerobyte-json-parsing [created] 02416a1bc COUCHDB-1493 include yajl patch in EJSON to avoid skipping unicode zero byte values Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/02416a1b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/02416a1b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/02416a1b Branch: refs/heads/1493-fix-zerobyte-json-parsing Commit: 02416a1bcb12fa7391cceddd0268e1c2f2a3fc01 Parents: 73db817 Author: Dave Cottlehuber Authored: Mon Apr 8 12:32:32 2013 +0200 Committer: Dave Cottlehuber Committed: Wed May 15 00:19:29 2013 +0200 ---------------------------------------------------------------------- src/ejson/yajl/yajl_encode.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/02416a1b/src/ejson/yajl/yajl_encode.c ---------------------------------------------------------------------- diff --git a/src/ejson/yajl/yajl_encode.c b/src/ejson/yajl/yajl_encode.c index ad5b1c5..d5b2b8f 100644 --- a/src/ejson/yajl/yajl_encode.c +++ b/src/ejson/yajl/yajl_encode.c @@ -173,6 +173,13 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str, Utf32toUtf8(codepoint, utf8Buf); unescaped = utf8Buf; + + if (codepoint == 0) { + yajl_buf_append(buf, unescaped, 1); + beg = ++end; + continue; + } + break; } default: