From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3uCVuXggKCrUhVZiidXcbjjbgZ.XjhgdWVWdbVdgnjpmXZrVmZ.jmb@flex--maennich.bounces.google.com> Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by sourceware.org (Postfix) with ESMTPS id 341273937437 for ; Sun, 15 Mar 2020 12:55:21 +0000 (GMT) Received: by mail-wr1-x44a.google.com with SMTP id o9so7338697wrw.14 for ; Sun, 15 Mar 2020 05:55:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lUQCxbiJQKUa0yUCdWqmdRPFkjepLj53TEnmTh/JPTs=; b=CvhvDhMeoK6XpHosgeBIYPzTVYvZcosmpf4CXEx7tLmJcczZpT0k9yDjdl6wyeaqjw +/quSBp1FQ116ZKHiwWPWRqzzw/EOUDS8fIQL9Fg+902KfYhdAHq/n2K3mgDEHg8G95E akAq0iOriyMksNntGZHEsHf0HCnC2a3TKQv9wGBspJYkCIIix6JjP1GLF0Rhmpe9Mt+A C0mxce/uzRRdbb4lVTTgNwPQrDay6NXClaZiBHnjDbTj4jebGCloN5y5RUlYASMMCjUs ZIOCJu3zaTFYOkJ1yWuUnvUY8mZ25Z1cinifGOwiRh1nhV1stZhnjp0PNPIspliQYoqg YC5A== X-Gm-Message-State: ANhLgQ3o7zUsERg1ieLsOttSajKbEnbOJB3wuE2h44nEa2fH7ePR0/Mi tRxWuf6+nGT+qSKiWCtLep6lDkrSMg22rQLMDW2SoIq7b0DYNZZLCMVFoxzzlqJb4yrz8cqPd5w DXhGYlPTj4eEtCKFITsMpLv+DajL+wgtqM75YUMQyupFqO4c9KGBmTbuiEXui3pHBBTLMx/M= X-Google-Smtp-Source: ADFU+vtvH1pe7YVMHo3i9IFnakDrwbWrPSN1QE7JpTd9pysM6sgu8XLNRvpUt6HFDp6OglsyZ6B8zebQ8UVzfQ== X-Received: by 2002:adf:decc:: with SMTP id i12mr18265040wrn.27.1584276920108; Sun, 15 Mar 2020 05:55:20 -0700 (PDT) Date: Sun, 15 Mar 2020 13:55:12 +0100 In-Reply-To: <20200315125512.256054-1-maennich@google.com> Message-Id: <20200315125512.256054-2-maennich@google.com> Mime-Version: 1.0 References: <20200315125512.256054-1-maennich@google.com> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog Subject: [PATCH 2/2] dwarf-reader: remove superfluous ABG_ASSERT From: Matthias Maennich To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-32.7 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2020 12:55:22 -0000 maybe_adjust_et_rel_sym_addr_to_abs_addr contained an ABG_ASSERT to ensure symbol_section is not used on an invalid value. Since maybe_adjust_et_rel_sym_addr_to_abs_addr handles this case, this assert can be removed. * src/abg-dwarf-reader.cc (maybe_adjust_et_rel_sym_addr_to_abs_addr): improve NULL check, remove superfluous ABG_ASSERT * tests/data/Makefile.am: Add new test case to the distribution. * tests/test-read-dwarf.cc: Likewise. * tests/data/test-read-dwarf/test27-bogus-binary.elf: New test case. Signed-off-by: Matthias Maennich --- src/abg-dwarf-reader.cc | 3 +-- tests/data/Makefile.am | 1 + .../data/test-read-dwarf/test27-bogus-binary.elf | Bin 0 -> 1024 bytes tests/test-read-dwarf.cc | 6 ++++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tests/data/test-read-dwarf/test27-bogus-binary.elf diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 3454fcf5cf7c..ff532cfd244e 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -8585,7 +8585,7 @@ public: GElf_Addr maybe_adjust_et_rel_sym_addr_to_abs_addr(GElf_Addr addr, Elf_Scn *section) { - if (section == 0) + if (!section) return addr; Elf* elf = elf_handle(); @@ -8623,7 +8623,6 @@ public: maybe_adjust_et_rel_sym_addr_to_abs_addr(GElf_Sym *sym) { Elf_Scn *symbol_section = elf_getscn(elf_handle(), sym->st_shndx); - ABG_ASSERT(symbol_section); GElf_Addr result = sym->st_value; result = maybe_adjust_et_rel_sym_addr_to_abs_addr(result, symbol_section); return result; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 802b709fc5f5..3c819b26ad3f 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -437,6 +437,7 @@ test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0 \ test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi \ test-read-dwarf/test25-bogus-binary.elf \ test-read-dwarf/test26-bogus-binary.elf \ +test-read-dwarf/test27-bogus-binary.elf \ \ test-annotate/test0.abi \ test-annotate/test1.abi \ diff --git a/tests/data/test-read-dwarf/test27-bogus-binary.elf b/tests/data/test-read-dwarf/test27-bogus-binary.elf new file mode 100644 index 0000000000000000000000000000000000000000..3240f53915c60f9c9808a6bff9f958b8a136eece GIT binary patch literal 1024 zcmb<-^>JflWbAif0D+kd?En9_%m4rXkCA}|ECM3)Ud_M9@FCXnzbC^vCLrHK^%PhR zS%E%Kf%X3e77d`Fk&&^1nUR?i7H}6TrU;iag0l!Q?5_Xcbtinrk;q3C>w0SMOE82S zf@oPS2h*wrWGKTp$TS0x^B)50lo%MnE>}=u0QrVNNdQ?T7B)~HNF6t(lp-5QzlE_W zlBJi?lmRVk_y-aTQIq4_z-7^!8}gSy*!0K8hdVQ0tqPN}dFt5yUwD;9ae;xs)YYF{ zE=>CFv)jCiOd!DLp>TS6Np{-Re_1hAPj@xgc}Yy%eKJuknM?zr+B67)-9S5VDf;k> zg@5|=;;4_SH?3LgkTK)Qt4X>ync5OQCk=uuY IRA}x~0RO9kcmMzZ literal 0 HcmV?d00001 diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc index a8ea0619ccbb..7c99d21889d0 100644 --- a/tests/test-read-dwarf.cc +++ b/tests/test-read-dwarf.cc @@ -265,6 +265,12 @@ InOutSpec in_out_specs[] = "", "", }, + { + "data/test-read-dwarf/test27-bogus-binary.elf", + "", + "", + "", + }, // This should be the last entry. {NULL, NULL, NULL, NULL} }; -- 2.25.1.481.gfbce0eb801-goog