From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 13 Sep 2020 03:11:15 +0000 (-0700)
Subject: fix resource leakage in cvtgxl
X-Git-Tag: 2.46.0~20^2^2~73^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c48adbfd77a0272d6ff7c639b253100fca0792b;p=graphviz

fix resource leakage in cvtgxl

This addresses the following Coverity warning:

  Error: RESOURCE_LEAK (CWE-772): [#def50]
  graphviz-2.40.1/cmd/tools/cvtgxl.c:153: alloc_fn: Storage is returned from allocation function "openFile".
  graphviz-2.40.1/cmd/tools/cvtgxl.c:65:5: alloc_fn: Storage is returned from allocation function "fopen".
  graphviz-2.40.1/cmd/tools/cvtgxl.c:65:5: var_assign: Assigning: "fp" = "fopen(name, mode)".
  graphviz-2.40.1/cmd/tools/cvtgxl.c:76:5: return_alloc: Returning allocated memory "fp".
  graphviz-2.40.1/cmd/tools/cvtgxl.c:153: var_assign: Assigning: "outFile" = storage returned from "openFile(optarg, "w")".
  graphviz-2.40.1/cmd/tools/cvtgxl.c:153: overwrite_var: Overwriting "outFile" in "outFile = openFile(optarg, "w")" leaks the storage that "outFile" points to.
  #  151|         break;
  #  152|     case 'o':
  #  153|->       outFile = openFile(optarg, "w");
  #  154|         break;
  #  155|     case ':':

Related to #1464.
---

diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c
index 02f648240..9081d4670 100644
--- a/cmd/tools/cvtgxl.c
+++ b/cmd/tools/cvtgxl.c
@@ -150,6 +150,8 @@ static void initargs(int argc, char **argv)
 	    act = ToGXL;
 	    break;
 	case 'o':
+	    if (outFile != NULL)
+		fclose(outFile);
 	    outFile = openFile(optarg, "w");
 	    break;
 	case ':':