From b9f890052974ac0e71221a48f32e1af24bf79894 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Mar 2018 20:03:23 +0100
Subject: Fix 'src/cct.c:235,error,resourceLeak,Resource leak: fout' cppcheck
 warning

---
 src/cct.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/cct.c')

diff --git a/src/cct.c b/src/cct.c
index 1853a962..96019f2b 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -232,6 +232,8 @@ int main(int argc, char **argv) {
         /* fail if an inverse operation is not available */
         if (!proj_pj_info(P).has_inverse) {
             fprintf (stderr, "Inverse operation not available\n");
+            if (stdout != fout)
+                fclose (fout);
             return 1;
         }
         /* We have no API call for inverting an operation, so we brute force it. */
-- 
cgit v1.2.3


From 0682897c358c41f21871ef87001d4825b3076784 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Mar 2018 22:15:37 +0100
Subject: cct.c: fix memory leak (spotted by clang static analyzer)

---
 src/cct.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/cct.c')

diff --git a/src/cct.c b/src/cct.c
index 96019f2b..57e53f97 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -308,6 +308,7 @@ int main(int argc, char **argv) {
     if (stdout != fout)
         fclose (fout);
     free (o);
+    free (buf);
     return 0;
 }
 
-- 
cgit v1.2.3


From 5b0a54f8d7ab0bd15a81352566f21d932facbb2c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Mar 2018 23:50:28 +0100
Subject: Avoid 'invalidscanf,scanf without field width limits can crash with
 huge input data on some versions of libc' with older cppcheck versions

---
 src/cct.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/cct.c')

diff --git a/src/cct.c b/src/cct.c
index 57e53f97..8096986d 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -202,6 +202,7 @@ int main(int argc, char **argv) {
     }
 
     if (opt_given (o, "c")) {
+        /* cppcheck-suppress invalidscanf */
         int ncols = sscanf (opt_arg (o, "c"), "%d,%d,%d,%d", columns_xyzt, columns_xyzt+1, columns_xyzt+2, columns_xyzt+3);
         if (ncols != nfields) {
             fprintf (stderr, "%s: Too few input columns given: '%s'\n", o->progname, opt_arg (o, "c"));
-- 
cgit v1.2.3