OSGeo · rouault · Jun 30, 2025 · Jun 27, 2025 · Jun 28, 2025 · Jun 27, 2025
diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp
@@ -240,10 +240,11 @@ int main(int argc, char **argv) {
     /* coverity[tainted_data] */
     o = opt_parse(argc, argv, "hvI", "cdozts", longflags, longkeys);
     if (nullptr == o)
-        return 0;
+        return 1;
 
     if (opt_given(o, "h") || argc == 1) {
         printf(usage, o->progname);
+        free(o);
         return 0;
     }
 
@@ -258,6 +259,7 @@ int main(int argc, char **argv) {
    
     if (opt_given(o, "version")) {
         print(PJ_LOG_NONE, "%s: %s", o->progname, pj_get_release());
+        free(o);
         return 0;
     }
 
@@ -419,6 +421,7 @@ int main(int argc, char **argv) {
         /* fail if an inverse operation is not available */
         if (!info.has_inverse) {
             print(PJ_LOG_ERROR, "Inverse operation not available");
+            free(o);
             if (stdout != fout)
                 fclose(fout);
             return 1;

diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp
@@ -281,7 +281,7 @@ int main(int argc, char **argv) {
     /* coverity[tainted_data] */
     o = opt_parse(argc, argv, "hlvq", "o", longflags, longkeys);
     if (nullptr == o)
-        return 0;
+        return 1;
 
     if (opt_given(o, "h") || argc == 1) {
         printf(usage, o->progname);
@@ -335,8 +335,9 @@ int main(int argc, char **argv) {
     for (i = 0; i < o->fargc; i++) {
         FILE *f = fopen(o->fargv[i], "rt");
         if (f == nullptr) {
-            fprintf(T.fout, "%sCannot open specified input file '%s' - bye!\n",
+            fprintf(stderr, "%sCannot open specified input file '%s' - bye!\n",
                     delim, o->fargv[i]);
+            free(o);
             return 1;
         }
         fclose(f);

diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt
@@ -23,6 +23,9 @@ endif()
 if(BUILD_PROJSYNC)
   set(PROJSYNC_EXE "$<TARGET_FILE:projsync>")
 endif()
+if(BUILD_GIE)
+  set(GIE_EXE "$<TARGET_FILE:gie>")
+endif()
 
 if(UNIX)
   if(BUILD_CS2CS)
@@ -123,6 +126,9 @@ if(Python_for_cli_tests)
   if(BUILD_PROJINFO)
     proj_run_cli_test(test_projinfo.yaml PROJINFO_EXE)
   endif()
+  if(BUILD_GIE)
+    proj_run_cli_test(test_gie.yaml GIE_EXE)
+  endif()
 
   # auto-test run_cli_test.py if pytest available
   find_Python_package("pytest" HAS_PYTEST)

diff --git a/test/cli/test_cct.yaml b/test/cli/test_cct.yaml
@@ -1,5 +1,19 @@
 exe: cct
 tests:
+
+- comment: Test version argument
+  args: --version
+  sub: ["cct(_d)?(\\.exe)?: Rel.*", "cct: Rel"]
+  stdout: "cct: Rel"
+  exitcode: 0
+
+- comment: Test help argument
+  args: -h
+  grep: "Usage: "
+  sub: ["cct(_d)?(\\.exe)?", "cct"]
+  stdout: "Usage: cct [-options]... [+operator_specs]... infile..."
+  exitcode: 0
+
 - args: -d 8 +proj=merc +R=1
   in: 90 45 0
   out: "   1.57079633     0.88137359    0.00000000           inf"

diff --git a/test/cli/test_gie.yaml b/test/cli/test_gie.yaml
@@ -0,0 +1,24 @@
+exe: gie
+tests:
+- comment: Test invalid argument
+  args: --invalid
+  stderr: "Invalid option \"invalid\""
+  exitcode: 1
+
+- comment: Test version argument
+  args: --version
+  sub: ["gie(_d)?(\\.exe)?: Rel.*", "gie: Rel"]
+  stdout: "gie: Rel"
+  exitcode: 0
+
+- comment: Test help argument
+  args: -h
+  grep: "Usage: "
+  sub: ["gie(_d)?(\\.exe)?", "gie"]
+  stdout: "Usage: gie [-options]... infile..."
+  exitcode: 0
+
+- comment: Test gie with non existing input file
+  args: i_do_not_exist.txt
+  stderr: "-------------------------------------------------------------------------------\nCannot open specified input file 'i_do_not_exist.txt' - bye!\n"
+  exitcode: 1