Merge pull request #62 from Goddard-Fortran-Ecosystem/hotfix/#61-segf…

…ault-on-extra-args Fixes #61 - segfault for unprocessed arguments
Goddard-Fortran-Ecosystem · Dec 20, 2019 · 5007224 · 5007224
2 parents 0aeda75 + a622769
commit 5007224
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 
 project (FARGPARSE
-  VERSION 0.9.1
+  VERSION 0.9.2
   LANGUAGES Fortran)
 
 # Most users of this software do not (should not?) have permissions to
@@ -27,16 +27,16 @@ endif()
 
 find_package (PFUNIT 4.0.1 QUIET)
 if (PFUNIT_FOUND)
-  project (GFTL-TEST
-    VERSION ${GFTL_VERSION}
+  project (FARGPARSE_-TEST
+    VERSION ${FARGPARSE_VERSION}
     LANGUAGES Fortran
     )
 
   set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GFTL_SOURCE_DIR}/cmake_utils")
   include (${CMAKE_Fortran_COMPILER_ID} RESULT_VARIABLE found)
 
   enable_testing()
-  if (NOT TARGET (tests))
+  if (NOT TARGET tests)
     add_custom_target(tests COMMAND ${CMAKE_CTEST_COMMAND})
   endif ()
 

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,7 +1,14 @@
-0.9.0 2019-09-04
-      - Updated to use pFUnit 4.0
+# Change log
+
+## [0.9.2] - 2019-12-19
+- Bug fix for extra arguments.
+- Updated gFTL to latest
+
+## [0.9.1] - 2019-11-08
+- Workaround for compiler hang in ifort 19.0.3
+- Updated gFTL for memory leak workaround in ifort 18
+
+## [0.9.0] - 2019-09-04
+- Updated to use pFUnit 4.0
 
-0.9.1 2019-11-08
-      - Workaround for compiler hang in ifort 19.0.3
-      - Updated gFTL for memory leak workaround in ifort 18
 
diff --git a/extern/gFTL b/extern/gFTL
diff --git a/extern/gFTL-shared b/extern/gFTL-shared
diff --git a/src/ArgParser.F90 b/src/ArgParser.F90
@@ -244,18 +244,21 @@ function parse_args_args(this, arguments, unused, unprocessed) result(option_val
 
          else ! is positional
             ith = ith + 1
-            act => this%positionals%at(ith)
-            select case (act%get_type())
-            case ('string')
-               call option_values%insert(act%get_destination(), argument)
-            case ('integer')
-               read(argument,*) arg_value_int
-               call option_values%insert(act%get_destination(), arg_value_int)
-            case ('real')
-               read(argument,*) arg_value_real
-               call option_values%insert(act%get_destination(), arg_value_real)
-            end select
-            if (present(unprocessed)) call unprocessed%push_back(argument)
+            if (ith <= this%positionals%size()) then
+               act => this%positionals%at(ith)
+               select case (act%get_type())
+               case ('string')
+                  call option_values%insert(act%get_destination(), argument)
+               case ('integer')
+                  read(argument,*) arg_value_int
+                  call option_values%insert(act%get_destination(), arg_value_int)
+               case ('real')
+                  read(argument,*) arg_value_real
+                  call option_values%insert(act%get_destination(), arg_value_real)
+               end select
+            else
+               if (present(unprocessed)) call unprocessed%push_back(argument)
+            end if
          end if
 
 
@@ -327,18 +330,21 @@ subroutine parse_args_kludge_args(this, option_values, arguments, unused, unproc
 
          else ! is positional
             ith = ith + 1
-            act => this%positionals%at(ith)
-            select case (act%get_type())
-            case ('string')
-               call option_values%insert(act%get_destination(), argument)
-            case ('integer')
-               read(argument,*) arg_value_int
-               call option_values%insert(act%get_destination(), arg_value_int)
-            case ('real')
-               read(argument,*) arg_value_real
-               call option_values%insert(act%get_destination(), arg_value_real)
-            end select
-            if (present(unprocessed)) call unprocessed%push_back(argument)
+            if (ith <= this%positionals%size()) then
+               act => this%positionals%at(ith)
+               select case (act%get_type())
+               case ('string')
+                  call option_values%insert(act%get_destination(), argument)
+               case ('integer')
+                  read(argument,*) arg_value_int
+                  call option_values%insert(act%get_destination(), arg_value_int)
+               case ('real')
+                  read(argument,*) arg_value_real
+                  call option_values%insert(act%get_destination(), arg_value_real)
+               end select
+            else
+               if (present(unprocessed)) call unprocessed%push_back(argument)
+            end if
          end if
 
 

diff --git a/tests/Test_ArgParser.pf b/tests/Test_ArgParser.pf
@@ -576,4 +576,25 @@ contains
 
     end subroutine test_pfunit_use_case
 
+    ! Reproducer for Issue #61
+    @test
+    subroutine test_unprocessed_argument
+      use fp_CommandLineArguments
+      use fp_String
+      type (ArgParser) :: p
+      type (StringVector) :: arguments
+      type (StringUnlimitedMap) :: options
+      class(*), pointer :: opt
+
+      p = ArgParser()
+
+      call p%add_argument('-d', '--debug', '--verbose', action='store_true', &
+           & help='make output more verbose')
+
+      ! Crashes before fix
+      call arguments%push_back('-not-a-valid-argument')
+      options = p%parse_args(arguments)
+
+    end subroutine test_unprocessed_argument
+
 end module Test_ArgParser
+25 −13		.travis.yml
+5 −5		CMakeLists.txt
+16 −5		ChangeLog.MD
+1 −1		cmake_utils/Intel.cmake
+12 −3		include/templates/map.inc
+16 −0		tests/Map/Test_map_double_assign.pf