From patchwork Wed Nov 12 13:59:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 419628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6DB1E1400D5 for ; Wed, 10 Dec 2014 23:22:21 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EC8E628C1FB; Wed, 10 Dec 2014 13:16:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, FREEMAIL_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3B64228C1DD for ; Wed, 10 Dec 2014 13:16:27 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 10 Dec 2014 13:16:26 +0100 (CET) Received: by mail-pa0-f53.google.com with SMTP id kq14so2704956pab.12 for ; Wed, 10 Dec 2014 04:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FhL2ufigibWeuZ2jNeCFKe976dYKr0S/qVkkpr2HD1g=; b=pCKUIwCP/wf+9NwBOZonXgRW5/bzKv3+M3dv3HRqM4AK5qPdj7Igm9UFGIK6ZTT2uT jtnzD7c3y1oQGTKCCpq4B8yQS9XjVvC0ow34rrZQLSXBKYJ6KuZoeprngywQk1RPvSY8 Ha0GS1LJ9R+uKLsaI/qPv8GQMAi3T4LLEsDHh97WV4nUg0Gi23rBsqmdEmR/6/HyI6Sr sk5AYPXzHrFmV6h/pNZn3K9HET/aitau7oDm7UkMozfNhCQtjlPnYdi7mJllTiQaKiBR Ci1pBXJ3yTTq0Ic9sNkJAwxh0ATqrngL6pCKcgcSdEEwwb2X1yqRAC3xbmX6pXnXZQl/ yViQ== X-Received: by 10.68.131.3 with SMTP id oi3mr6452487pbb.27.1418213887609; Wed, 10 Dec 2014 04:18:07 -0800 (PST) Received: from debian.lan ([103.29.140.56]) by mx.google.com with ESMTPSA id hc10sm4063709pbd.78.2014.12.10.04.18.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Dec 2014 04:18:06 -0800 (PST) From: Yousong Zhou To: nbd@openwrt.org Date: Wed, 12 Nov 2014 21:59:22 +0800 Message-Id: <1415800763-14311-10-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415800763-14311-1-git-send-email-yszhou4tech@gmail.com> References: <1415800763-14311-1-git-send-email-yszhou4tech@gmail.com> Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH v2 09/10] json_script: fix eval_string(). X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - Fix handling of "%%". - Fix length requirement when calling blobmsg_realloc_string_buffer(). Signed-off-by: Yousong Zhou --- json_script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json_script.c b/json_script.c index 0d51f79..9805b04 100644 --- a/json_script.c +++ b/json_script.c @@ -416,7 +416,7 @@ static int eval_string(struct json_call *call, struct blob_buf *buf, const char } if (cur_var) { - if (next > str) { + if (end > str) { cur = msg_find_var(call, str); if (!cur) continue; @@ -434,7 +434,7 @@ static int eval_string(struct json_call *call, struct blob_buf *buf, const char cur_len = end - str; } - dest = blobmsg_realloc_string_buffer(buf, cur_len + 1); + dest = blobmsg_realloc_string_buffer(buf, len + cur_len + 1); memcpy(dest + len, cur, cur_len); len += cur_len; }