From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 90556 invoked by alias); 8 Jun 2018 18:45:50 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 90490 invoked by uid 89); 8 Jun 2018 18:45:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.4 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Jun 2018 18:45:44 +0000 Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 7E192300092E; Fri, 8 Jun 2018 20:45:42 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 33ADE413CB92; Fri, 8 Jun 2018 20:45:42 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH] libdw: dwarf_get_units should handle existing failure to open Dwarf. Date: Fri, 08 Jun 2018 18:45:00 -0000 Message-Id: <1528483540-14285-1-git-send-email-mark@klomp.org> X-Mailer: git-send-email 1.8.3.1 X-Spam-Flag: NO X-IsSubscribed: yes X-SW-Source: 2018-q2/txt/msg00187.txt.bz2 The other dwarf unit/cu iterators handle a NULL Dwarf handle as an existing error and return NULL. Don't crash. Signed-off-by: Mark Wielaard --- libdw/ChangeLog | 5 +++++ libdw/dwarf_get_units.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 23e11b9..21cb03c 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,5 +1,10 @@ 2018-06-08 Mark Wielaard + * dwarf_get_units.c (dwarf_get_units): Handle existing error, no + dwarf. + +2018-06-08 Mark Wielaard + * dwarf_getlocation.c (store_implicit_value): Return error when seeing bad DWARF or when tsearch runs out of memory. (__libdw_intern_expression): Report error when store_implicit_value diff --git a/libdw/dwarf_get_units.c b/libdw/dwarf_get_units.c index aece17e..6215bf4 100644 --- a/libdw/dwarf_get_units.c +++ b/libdw/dwarf_get_units.c @@ -40,6 +40,10 @@ dwarf_get_units (Dwarf *dwarf, Dwarf_CU *cu, Dwarf_CU **next_cu, Dwarf_Half *version, uint8_t *unit_type, Dwarf_Die *cudie, Dwarf_Die *subdie) { + /* Handle existing error. */ + if (dwarf == NULL) + return -1; + Dwarf_Off off; bool v4type; if (cu == NULL) -- 1.8.3.1