From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id E663C385840A; Fri, 5 Nov 2021 21:17:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E663C385840A Received: by mail-wr1-x42d.google.com with SMTP id u1so15707423wru.13; Fri, 05 Nov 2021 14:17:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nqpm+uXGcNKoc4iNlVnfiOzzzR+mGYJZV9jEl4ETi1Q=; b=FKMbklvshCk7W+ePRnAAEmxGCCbyqKuov4oeirPbfxdTSjiw4AgEU3goEA+7EXVreb NzWharfyeb9e5Tfdz4YtnxiKI3IL/5r3wiGOjctC9UpaDn3EM7EmeNw9MiVm8vql3SDm dQw+HSn28BNufLPD0u7HTSxG6/KxIzD94j1/bBmFHtLa+VCsmYyzDdkbqpoyz6kJwfEt S/0WWXqTypCb7Gwm3ZKY6PsVcaXZx0Hzp0OJ1ROh/QsPKlVKqI6TrKnYMGJJJp+SPr0M hSL5KWMWNl3rjQM5L+TlCS4LOE0bPJIT8YX2wgEVW8VbZk6zF+3AuDd3hRhzJRss8VmB Ri/g== X-Gm-Message-State: AOAM532Y4kILXUDiZ78PDJYCFmGshPgoxBu3f6f8tXTK4a0j4+BhoGnO ct0ek6QnaulGjcujn3zGJ2qd6HqWqiM= X-Google-Smtp-Source: ABdhPJzTtRe1n5KGz6V7xjEDpL6r/fANyyhrwFFCAOoYUS2TWq4iYCl5UBrYy7UxKCRtWubk8wfFlg== X-Received: by 2002:a05:6000:1813:: with SMTP id m19mr67199679wrh.51.1636147058794; Fri, 05 Nov 2021 14:17:38 -0700 (PDT) Received: from nbbrfq.weghof (dynamic-2bq7di4u2lfl4qjka9-pd01.res.v6.highway.a1.net. [2001:871:227:33a8:f6a3:c58c:7641:e771]) by smtp.gmail.com with ESMTPSA id p27sm8300557wmi.28.2021.11.05.14.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 14:17:38 -0700 (PDT) Received: from b by nbbrfq.weghof with local (Exim 4.95) (envelope-from ) id 1mj6af-009UNG-KP; Fri, 05 Nov 2021 22:17:37 +0100 From: Bernhard Reutner-Fischer To: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Cc: Bernhard Reutner-Fischer , Bernhard Reutner-Fischer Subject: [PATCH 2/2] Fortran: Fix memory leak in gfc_add_include_path [PR68800] Date: Fri, 5 Nov 2021 22:17:18 +0100 Message-Id: <20211105211718.2261686-3-rep.dot.nop@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211105211718.2261686-1-rep.dot.nop@gmail.com> References: <20211105211718.2261686-1-rep.dot.nop@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2021 21:17:41 -0000 From: Bernhard Reutner-Fischer gcc/fortran/ChangeLog: PR fortran/68800 * cpp.h (gfc_cpp_free_cpp_dirs): New declaration. * cpp.c (gfc_cpp_free_cpp_dirs): New definition. (gfc_cpp_add_include_path, gfc_cpp_add_include_path_after): Add comment. * f95-lang.c (gfc_finish): Call gfc_cpp_free_cpp_dirs. * scanner.c (add_path_to_list): Allocate unzeroed memory. (gfc_add_include_path): Add comment and fix formatting. --- Bootstrapped and regtested without regressions on x86_64-unknown-linux. Ok for trunk? Note: in add_path_to_list i changed dir->path = XCNEWVEC to XNEWVEC since strcpy and strcat add a terminating null byte for us anyway. Fixes: -== 68 bytes in 1 blocks are still reachable in loss record 228 of 371 -== at : malloc (vg_replace_malloc.c:380) -== by : xmalloc (xmalloc.c:149) -== by : xstrdup (xstrdup.c:34) -== by : gfc_add_include_path(char const*, bool, bool, bool, bool) (scanner.c :428) -== by : gfc_handle_option(unsigned long, char const*, long, int, unsigned in t, cl_option_handlers const*) (options.c:702) -== by : handle_option(gcc_options*, gcc_options*, cl_decoded_option const*, unsigned int, int, unsigned int, cl_option_handlers const*, bool, diagnostic_con text*) (opts-common.c:1181) -== by : read_cmdline_option(gcc_options*, gcc_options*, cl_decoded_option*, unsigned int, unsigned int, cl_option_handlers const*, diagnostic_context*) (opt s-common.c:1431) -== by : read_cmdline_options (opts-global.c:237) -== by : decode_options(gcc_options*, gcc_options*, cl_decoded_option*, unsig ned int, unsigned int, diagnostic_context*, void (*)()) (opts-global.c:319) -== by : toplev::main(int, char**) (toplev.c:2273) -== by : main (main.c:39) --- gcc/fortran/cpp.c | 13 +++++++++++-- gcc/fortran/cpp.h | 1 + gcc/fortran/f95-lang.c | 2 +- gcc/fortran/scanner.c | 7 ++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index e86386c8b17..04fe8fe460b 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -728,12 +728,20 @@ gfc_cpp_done (void) cpp_clear_file_cache (cpp_in); } -/* PATH must be malloc-ed and NULL-terminated. */ +/* Free all cpp include dirs. */ +void +gfc_cpp_free_cpp_dirs (void) +{ + free_cpp_dirs (); +} + +/* PATH must be NULL-terminated. */ void gfc_cpp_add_include_path (char *path, bool user_supplied) { /* CHAIN sets cpp_dir->sysp which differs from 0 if PATH is a system - include path. Fortran does not define any system include paths. */ + include path. Fortran does not define any system include paths. + incpath.c manages the incoming, xstrdup()ed path. */ int cxx_aware = 0; add_path (path, INC_BRACKET, cxx_aware, user_supplied); @@ -742,6 +750,7 @@ gfc_cpp_add_include_path (char *path, bool user_supplied) void gfc_cpp_add_include_path_after (char *path, bool user_supplied) { + /* incpath.c manages the incoming, xstrdup()ed path. */ int cxx_aware = 0; add_path (path, INC_AFTER, cxx_aware, user_supplied); } diff --git a/gcc/fortran/cpp.h b/gcc/fortran/cpp.h index 44644a2a333..963b9a9c89e 100644 --- a/gcc/fortran/cpp.h +++ b/gcc/fortran/cpp.h @@ -46,6 +46,7 @@ void gfc_cpp_post_options (bool); bool gfc_cpp_preprocess (const char *source_file); void gfc_cpp_done (void); +void gfc_cpp_free_cpp_dirs (void); void gfc_cpp_add_include_path (char *path, bool user_supplied); void gfc_cpp_add_include_path_after (char *path, bool user_supplied); diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 58dcaf01d75..ec4c2cf01d9 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -275,7 +275,7 @@ gfc_finish (void) gfc_cpp_done (); gfc_done_1 (); gfc_release_include_path (); - return; + gfc_cpp_free_cpp_dirs (); } /* These functions and variables deal with binding contours. We only diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 69b81ab97f8..268d1e3e7fb 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -370,7 +370,7 @@ add_path_to_list (gfc_directorylist **list, const char *path, char *q; size_t len; int i; - + p = path; while (*p == ' ' || *p == '\t') /* someone might do "-I include" */ if (*p++ == '\0') @@ -409,7 +409,7 @@ add_path_to_list (gfc_directorylist **list, const char *path, *list = dir; dir->use_for_modules = use_for_modules; dir->warn = warn; - dir->path = XCNEWVEC (char, strlen (p) + 2); + dir->path = XNEWVEC (char, strlen (p) + 2); strcpy (dir->path, p); strcat (dir->path, "/"); /* make '/' last character */ } @@ -424,8 +424,9 @@ gfc_add_include_path (const char *path, bool use_for_modules, bool file_dir, defer_warn); /* For '#include "..."' these directories are automatically searched. */ + /* CPP manages 'path' on it's own via incpath.c so give it it's own copy. */ if (!file_dir) - gfc_cpp_add_include_path (xstrdup(path), true); + gfc_cpp_add_include_path (xstrdup (path), true); } -- 2.33.0