From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id 5796D3858407; Mon, 7 Nov 2022 16:36:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5796D3858407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667839015; bh=WJeZ+a55URWSfIHpCmeITrBFda2pco4oTF38veZASfs=; h=From:To:Subject:Date:From; b=DKbtjSPmeH80Ir8fLgl1C+aU0zj95agSPSW0qTYlO0tAdm0nyQhnaZo0L4HUyfmhY ScXO9Lap/bNVVXNGE2lWqT8CcSb6093G3t6g90QXeGwIyUir1p+2dAULvxHi2Bj1L+ dl2FHxAdEgaHIiXKWfWDBD4ymwaFrQNSrP3WuBGY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3756] Fix NULL filename handling X-Act-Checkin: gcc X-Git-Author: Richard Purdie X-Git-Refname: refs/heads/master X-Git-Oldrev: cb0ceeaee9e041aaac3edd089b07b439621d0f29 X-Git-Newrev: 9aa1b63a5554563b7a3081391358d6cedcabea88 Message-Id: <20221107163655.5796D3858407@sourceware.org> Date: Mon, 7 Nov 2022 16:36:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9aa1b63a5554563b7a3081391358d6cedcabea88 commit r13-3756-g9aa1b63a5554563b7a3081391358d6cedcabea88 Author: Richard Purdie Date: Mon Nov 7 17:26:44 2022 +0100 Fix NULL filename handling The previous commit introduced a regression as some Ada tests end up passing NULL as the filename to remap_filename. Handle this as before to fix them. gcc/ * file-prefix-map.cc (remap_filename): Handle NULL filenames. Diff: --- gcc/file-prefix-map.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/file-prefix-map.cc b/gcc/file-prefix-map.cc index 439586bd2b5..40b10edcf92 100644 --- a/gcc/file-prefix-map.cc +++ b/gcc/file-prefix-map.cc @@ -73,7 +73,7 @@ remap_filename (file_prefix_map *maps, const char *filename) char *realname; size_t name_len; - if (lbasename (filename) == filename) + if (!filename || lbasename (filename) == filename) return filename; realname = lrealpath (filename);