From patchwork Fri May 21 09:01:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 53115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 24F06B7D2F for ; Fri, 21 May 2010 19:02:52 +1000 (EST) Received: from localhost ([127.0.0.1]:42030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFO80-00051M-IT for incoming@patchwork.ozlabs.org; Fri, 21 May 2010 05:02:48 -0400 Received: from [140.186.70.92] (port=41419 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFO6p-00050G-8l for qemu-devel@nongnu.org; Fri, 21 May 2010 05:01:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFO6n-0006Is-Hw for qemu-devel@nongnu.org; Fri, 21 May 2010 05:01:35 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:42123) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFO6n-0006Id-Dj for qemu-devel@nongnu.org; Fri, 21 May 2010 05:01:33 -0400 Received: by wye20 with SMTP id 20so515085wye.4 for ; Fri, 21 May 2010 02:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer; bh=gYcSF1a2H0LSbA57DwX+LClOcVIiDgoTFgz1A0KV8ug=; b=aqJr38HrhRFA4CoatyGS49sj5g1o/UwvI0uqkLZDhxhU2Fey3hsQGzYRvq/e3cAR5W m3VPSUNOt8nNg0JcZFmRTp25an1QyfVUidk8Zy4+0UN6smagJbi2MQV3vNgL5RtBZmYs 6gzqBel4Z6NfFrO8KwCSmKKBAwOHClMst3xi8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; b=nfHMOJyObOiWcJTugozKrN/2kF/sDGxoG/eXZg3MkV7HnF22C/1wrUCELwfoYH+DYI ocvutJAzCRpJLBjnMoRWV4u9dOoK7Qt+jg90F/1QAZjch4nxS/Xk5CsBegIXcMydeZdU GXqJolIEuNGCJ3ybuynWtdPw9MtJiTTf9hUMQ= Received: by 10.227.143.66 with SMTP id t2mr1052996wbu.116.1274432492112; Fri, 21 May 2010 02:01:32 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id n12sm1690046gve.0.2010.05.21.02.01.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 May 2010 02:01:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 May 2010 11:01:25 +0200 Message-Id: <1274432485-15200-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] add some tests for invalid JSON X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- check-qjson.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 1 deletions(-) diff --git a/check-qjson.c b/check-qjson.c index 109e777..a04e334 100644 --- a/check-qjson.c +++ b/check-qjson.c @@ -628,11 +628,90 @@ START_TEST(simple_varargs) } END_TEST +START_TEST(empty_input) +{ + QObject *obj = qobject_from_json(""); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_string) +{ + QObject *obj = qobject_from_json("\"abc"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_sq_string) +{ + QObject *obj = qobject_from_json("'abc"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_escape) +{ + QObject *obj = qobject_from_json("\"abc\\\""); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_array) +{ + QObject *obj = qobject_from_json("[32"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_array_comma) +{ + QObject *obj = qobject_from_json("[32,"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(invalid_array_comma) +{ + QObject *obj = qobject_from_json("[32,}"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_dict) +{ + QObject *obj = qobject_from_json("{'abc':32"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_dict_comma) +{ + QObject *obj = qobject_from_json("{'abc':32,"); + fail_unless(obj == NULL); +} +END_TEST + +#if 0 +START_TEST(invalid_dict_comma) +{ + QObject *obj = qobject_from_json("{'abc':32,}"); + fail_unless(obj == NULL); +} +END_TEST + +START_TEST(unterminated_literal) +{ + QObject *obj = qobject_from_json("nul"); + fail_unless(obj == NULL); +} +END_TEST +#endif + static Suite *qjson_suite(void) { Suite *suite; TCase *string_literals, *number_literals, *keyword_literals; - TCase *dicts, *lists, *whitespace, *varargs; + TCase *dicts, *lists, *whitespace, *varargs, *errors; string_literals = tcase_create("String Literals"); tcase_add_test(string_literals, simple_string); @@ -658,6 +737,22 @@ static Suite *qjson_suite(void) varargs = tcase_create("Varargs"); tcase_add_test(varargs, simple_varargs); + errors = tcase_create("Invalid JSON"); + tcase_add_test(errors, empty_input); + tcase_add_test(errors, unterminated_string); + tcase_add_test(errors, unterminated_escape); + tcase_add_test(errors, unterminated_sq_string); + tcase_add_test(errors, unterminated_array); + tcase_add_test(errors, unterminated_array_comma); + tcase_add_test(errors, invalid_array_comma); + tcase_add_test(errors, unterminated_dict); + tcase_add_test(errors, unterminated_dict_comma); +#if 0 + /* FIXME: this print parse error messages on stderr. */ + tcase_add_test(errors, invalid_dict_comma); + tcase_add_test(errors, unterminated_literal); +#endif + suite = suite_create("QJSON test-suite"); suite_add_tcase(suite, string_literals); suite_add_tcase(suite, number_literals); @@ -666,6 +761,7 @@ static Suite *qjson_suite(void) suite_add_tcase(suite, lists); suite_add_tcase(suite, whitespace); suite_add_tcase(suite, varargs); + suite_add_tcase(suite, errors); return suite; }