From patchwork Thu Jan 19 16:35:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9526329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B443560113 for ; Thu, 19 Jan 2017 16:35:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A63872851F for ; Thu, 19 Jan 2017 16:35:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A9CE285B8; Thu, 19 Jan 2017 16:35:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 13BE5285AA for ; Thu, 19 Jan 2017 16:35:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB53E6EA65; Thu, 19 Jan 2017 16:35:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83A9B6EA65 for ; Thu, 19 Jan 2017 16:35:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id D414D26101E From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Gustavo Padovan Date: Thu, 19 Jan 2017 11:35:01 -0500 Message-Id: <20170119163506.13270-2-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119163506.13270-1-robert.foss@collabora.com> References: <20170119163506.13270-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v1 1/6] lib/igt_kms: Check memory allocations for failures X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Add missing descriptive igt_assert_t calls to calloc'd memory. Signed-off-by: Robert Foss --- lib/igt_kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 2c5a6e89..8c10568a 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1107,6 +1107,7 @@ void kmstest_edid_add_3d(const unsigned char *edid, size_t length, *new_length = length + 128; new_edid = calloc(*new_length, sizeof(char)); + igt_assert_f(new_edid, "Failed to allocate %zu bytes for edid\n", sizeof(new_length)); memcpy(new_edid, edid, length); *new_edid_ptr = new_edid; @@ -1506,6 +1507,7 @@ void igt_display_init(igt_display_t *display, int drm_fd) */ display->n_pipes = resources->count_crtcs; display->pipes = calloc(sizeof(igt_pipe_t), display->n_pipes); + igt_assert_f(display->pipes, "Failed to allocate memory for %d pipes\n", display->n_pipes); drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); is_atomic = drmSetClientCap(drm_fd, DRM_CLIENT_CAP_ATOMIC, 1); @@ -1650,7 +1652,7 @@ void igt_display_init(igt_display_t *display, int drm_fd) */ display->n_outputs = resources->count_connectors; display->outputs = calloc(display->n_outputs, sizeof(igt_output_t)); - igt_assert(display->outputs); + igt_assert_f(display->outputs, "Failed to allocate memory for %d outputs\n", display->n_outputs); for (i = 0; i < display->n_outputs; i++) { igt_output_t *output = &display->outputs[i];