From patchwork Wed Mar 17 18:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1454918 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Qd7E2d+6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F0z2v60dxz9sVm for ; Thu, 18 Mar 2021 05:19:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E703382885; Wed, 17 Mar 2021 19:19:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Qd7E2d+6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 66EF78285C; Wed, 17 Mar 2021 19:19:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C20B82047 for ; Wed, 17 Mar 2021 19:19:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pj1-x1034.google.com with SMTP id q6-20020a17090a4306b02900c42a012202so1793407pjg.5 for ; Wed, 17 Mar 2021 11:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4LWMCfkvdgvC0QnOFwYFepJwSSpcpfTve++R9YZQbOI=; b=Qd7E2d+6DGDIARuLZKZ3mFOMmYkyeKQ+6oSDO59a0DWW5o08bxsghSoCvKfMy2etuO R1/6MBu8n/msonLMQZfDdZjbn836gp90e6QovfY8/7MMCrGhf6xdrBUfjvwoEc69Ax8n dTJUMy/J3badlv5MEzmqYTwSbyMkEkwBux7fs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4LWMCfkvdgvC0QnOFwYFepJwSSpcpfTve++R9YZQbOI=; b=nHk5su1YTXgt2okG7Pava6wScDTxoNTUqKMPSqVINLHXHKdYpR3uUsfRK2e++afzvc 7kFPOSeFKKXft8lPAgHwGuxvl5Q5XnFKpmfe3ilr8CJ3LGwUGJ1Xddnl0HsUCVIOz8AK mpMmAM5IHixtQgYpA4BYO6snxJDbrJU0mKRYJqYZpCUywd7VbAcu71rZI8quR4fcN7ad im1sn/S/sHzScone9iqR79vQnP0amQf/5zRrix5qzs4hLc0ztdoWz4f700VBINI1oWlm hqnR4ysJX5lsFKwLaxvdlTTEy91KqOYW9BKk+Xo/9kdM0xBT8rmuvVvswlBo+o4nIZt6 0RXA== X-Gm-Message-State: AOAM532qQiXEwnYG7Ze6zrVls9uV9YVcl8WMWMZ9lBKFZrElH32qrAjk rWqEo4qIgkpPwBnbOh5v6RC9Dftju4Cc6Q== X-Google-Smtp-Source: ABdhPJwv3MMAy7t5db+geCFQKoaA41Iaxak74lSKTwZL5RjInsYfiPSZBGpj5XuzezCSUvIsoEkPag== X-Received: by 2002:a17:902:b086:b029:e6:933a:f3cd with SMTP id p6-20020a170902b086b02900e6933af3cdmr5648581plr.29.1616005168336; Wed, 17 Mar 2021 11:19:28 -0700 (PDT) Received: from sjg1.roam.corp.google.com (85.72.69.111.dynamic.snap.net.nz. [111.69.72.85]) by smtp.gmail.com with ESMTPSA id s76sm20718298pfc.110.2021.03.17.11.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 11:19:27 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 02/13] test: Detect when expect_str is too small Date: Thu, 18 Mar 2021 07:18:29 +1300 Message-Id: <20210317181840.3975687-3-sjg@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210317181840.3975687-1-sjg@chromium.org> References: <20210317181840.3975687-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean If a line of more than 256 bytes is generated, the test will fail but the reason is not clear. Add a check for this condition and print a helpful message. Signed-off-by: Simon Glass --- test/ut.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/ut.c b/test/ut.c index a0fe5facac7..350509a2926 100644 --- a/test/ut.c +++ b/test/ut.c @@ -68,11 +68,17 @@ static int readline_check(struct unit_test_state *uts) int ut_check_console_line(struct unit_test_state *uts, const char *fmt, ...) { va_list args; + int len; int ret; va_start(args, fmt); - vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args); + len = vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args); va_end(args); + if (len >= sizeof(uts->expect_str)) { + ut_fail(uts, __FILE__, __LINE__, __func__, + "unit_test_state->expect_str too small"); + return -EOVERFLOW; + } ret = readline_check(uts); if (ret < 0) return ret; @@ -83,11 +89,17 @@ int ut_check_console_line(struct unit_test_state *uts, const char *fmt, ...) int ut_check_console_linen(struct unit_test_state *uts, const char *fmt, ...) { va_list args; + int len; int ret; va_start(args, fmt); - vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args); + len = vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args); va_end(args); + if (len >= sizeof(uts->expect_str)) { + ut_fail(uts, __FILE__, __LINE__, __func__, + "unit_test_state->expect_str too small"); + return -EOVERFLOW; + } ret = readline_check(uts); if (ret < 0) return ret;