From patchwork Fri Jan 25 22:36:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 215872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 70D152C0085 for ; Sat, 26 Jan 2013 09:36:58 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1359758219; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Cc:Subject:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=+ert8By n0sOR9tMcna0EEAsgiNc=; b=xIMT7VA1iSaDnZtzJGxzZl0PkbhQ2+Q0/EBHJ4L AvWNPP/XCvOme15bnO+SY7nBUqMtY38KLHsv3LHkszfzBhoAgs550Tbn4wtOzPGX 2EVPaoaGQBeG+JTFIuFKZKvx+KmzM1JEqylAaECynCWa3fbLWfQreuep1ik/1GM0 p+9c= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:X-Received:Received:From:To:Cc:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=bt+KDNHubrSw+O1DVZipycxmgRT5t6L7XNq/lKrSoYNo+fYL1o9rcRr2QZLoFY 1UP5yYlNlbAIYJ6BB4lhQWPhUdAmuPK59GD90DmxXb4E7wC2i0Mzt3xQ9NtWXSYU iLJk+OYQKNb99OFAJg/HlkNAqGdeop3zs75gMqNMUk8tE=; Received: (qmail 12318 invoked by alias); 25 Jan 2013 22:36:53 -0000 Received: (qmail 12141 invoked by uid 22791); 25 Jan 2013 22:36:53 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-ie0-f170.google.com (HELO mail-ie0-f170.google.com) (209.85.223.170) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 25 Jan 2013 22:36:17 +0000 Received: by mail-ie0-f170.google.com with SMTP id c11so209647ieb.1 for ; Fri, 25 Jan 2013 14:36:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=uKRVMwCo1NnFZg9zZ8GkCoM+ZBFhioOpndzJz7BVvaw=; b=XfAb2o4PYAy0PXCQS47jiblKxxUxyaiFu7oxjniACKlRCjfeQsEt/BUzluQfw7j/Wy O6xl3JaOpqRERt21H0fvCkOtKrUtCB6xs07F3mVYi70xMvNBcdGUaALhAAocHrT9yZYW cxBYetyGEP+PxKDJz71ieq6Zji/26UdMjiuFqWqWyQDkEgtrN5mjZjYEl5FdWT6d8/w+ RnEmPoKDOFrQryBf+Kh9ka+Q90Pq6KlACsMI3zgut9ZbSl1drArKBDF50WetstQUOM8j DKjAQIp29mRJaFflMhzdhz+fT3Hwb7kOTKoMKU/D9bNlLunCZxWaV595M3xNWd2bQ2Ki hxhw== X-Received: by 10.50.220.166 with SMTP id px6mr56859igc.8.1359153376782; Fri, 25 Jan 2013 14:36:16 -0800 (PST) Received: from iant-glaptop.google.com ([2620:0:1000:3204:501b:6f1f:4833:149]) by mx.google.com with ESMTPS id dc8sm36159igb.15.2013.01.25.14.36.15 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 14:36:15 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org Cc: jakub@redhat.com Subject: libbacktrace patch committed: Don't crash if no DW_AT_comp_dir Date: Fri, 25 Jan 2013 14:36:13 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlmRGk0VBsc7ugOmP6vMThtoQSvy/LMIBstllghLDHtOrjptgAshckQHoz6v2reF4yA1L/jraHdeFERaDh1CIaaL/Uc8ELAAzDMgcIUGOXTsb5lN+2Mqu0JIx6EU4CiJ7Uw3FdjknAfP7Fg5wphz4Ami+8ThHRjRdfLwLa2g+TLSh/mHikjlJsavypcVSqek2PbCrYV X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch, written by Jakub in PR 56076, avoids crashing in libbacktrace if it sees a relative file name but did not see a DW_AT_comp_dir attribute. Bootstrapped and ran libbacktrace testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian 2013-01-25 Jakub Jelinek PR other/56076 * dwarf.c (read_line_header): Don't crash if DW_AT_comp_dir attribute was not seen. Index: dwarf.c =================================================================== --- dwarf.c (revision 195436) +++ dwarf.c (working copy) @@ -1655,7 +1655,8 @@ read_line_header (struct backtrace_state strnlen ((const char *) hdr_buf.buf, hdr_buf.left) + 1)) return 0; dir_index = read_uleb128 (&hdr_buf); - if (IS_ABSOLUTE_PATH (filename)) + if (IS_ABSOLUTE_PATH (filename) + || (dir_index == 0 && u->comp_dir == NULL)) hdr->filenames[i] = filename; else {