From patchwork Thu Aug 2 06:12:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 952593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41h0Gh1x7Zz9ryt for ; Thu, 2 Aug 2018 16:13:16 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="ao0iQy9L"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="b3N3ZLBE"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41h0Gg5tXyzF1pj for ; Thu, 2 Aug 2018 16:13:15 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="ao0iQy9L"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="b3N3ZLBE"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=64.147.123.19; helo=wout3-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="ao0iQy9L"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="b3N3ZLBE"; dkim-atps=neutral Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41h0GZ1zv0zF0pD for ; Thu, 2 Aug 2018 16:13:09 +1000 (AEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 6E5532F5; Thu, 2 Aug 2018 02:13:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 02 Aug 2018 02:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZBg5Ffsk1FDflKRB8 BeU0YrYYsx47e4cldl8LYoUwL0=; b=ao0iQy9L5vh2K6bSialMHVeL4SmsTt40E q1zfCuTkG7avJghYMl6yWWMrKiKB8LQL50dYfS92JEwLHvODc6sXT/zGtNfnHuMB 1HopvRPezUosZd631H5RwOWKTYbmYyVT8x+a2pmmLk9q8f0TVXExVNEK5B9G5j0h /A2J8YabJHTTUJUQ1TZA9mcagZBiAro7Gkp/aHF2S+v/Wc9dmuNpFFPVCWBNwldw eyHHx+1l9fBGjKFqOqhhIdPHmQ+mKzdCF14eNYs0Wm/rdHRQ2JA4vwL7VUM/WieI yyOrtbavbFioCCB604VFWeTFTdDo9qNYUSMLYdrZS+Mjn6f0N83aA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZBg5Ffsk1FDflKRB8 BeU0YrYYsx47e4cldl8LYoUwL0=; b=b3N3ZLBE0xo0au9NdKb5m/xzWyZlqae4F W78xuDvxfcCa/cR4TNZF27ejZuLDBQaNhCgv6cz5D5NEtfBffqnzrjncnU7VNgkB jem2NjO0k2p27MAhiZxH4yZGlDmPHLKRMSEAGwoBF0l/MWdcZg+d/cXjgBlVhPAC dW8RQQuYy0CZV61GQcd4SETAG34eKmeNEwIFL4ecG0D+8rz5S3pqTqpPafmv6y84 YQl6KC7IE5Kz6csMVsPCcW7oZuEesXL2YLTtHqlkwoauySKGEP63DFNSUWeFgA8v Ye4pIOHB+PFt61L4TGM5WqPfV4N6wliW67ZKouBbgBgU1VyBhd6Jg== X-ME-Proxy: X-ME-Sender: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id A0425E461E; Thu, 2 Aug 2018 02:13:05 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH] discover/paths: Cleanup res after getaddrinfo Date: Thu, 2 Aug 2018 16:12:55 +1000 Message-Id: <20180802061255.11658-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.18.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Fixes Coverity defect #187192. Signed-off-by: Samuel Mendoza-Jonas --- discover/paths.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/discover/paths.c b/discover/paths.c index 174bdae..e30f032 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -586,12 +586,14 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url, /* If the url is remote but network is not yet available queue up this * load for later */ - if (url->scheme != pb_url_file && - getaddrinfo(url->host, NULL, NULL, &res) != 0) { - pb_log("load task for %s queued pending network\n", url->full); - pending_network_jobs_add(task, flags); - task->result->status = LOAD_ASYNC; - return task->result; + if (url->scheme != pb_url_file) { + if (getaddrinfo(url->host, NULL, NULL, &res) != 0) { + pb_log("load task for %s queued pending network\n", url->full); + pending_network_jobs_add(task, flags); + task->result->status = LOAD_ASYNC; + return task->result; + } + freeaddrinfo(res); } switch (url->scheme) {