Fixed (potential) OOBs unveiled by link-time code-optimization (LTO). (…

…#60) Fixed (potential) OOBs unveiled by link-time code-optimization (LTO). CPASSERT the length of the destination string prior to assignment.
cp2k · Oct 30, 2018 · 9a24425 · 9a24425
1 parent 0d23b48
commit 9a24425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/atom_upf.F b/src/atom_upf.F
@@ -343,17 +343,18 @@ SUBROUTINE upf_header_option(parser, pot)
             CALL parser_get_object(parser, pot%comment)
          CASE ("ELEMENT")
             CALL parser_get_object(parser, line)
+            CPASSERT(2 <= LEN(pot%symbol))
             pot%symbol = line(2:3)
          CASE ("PSEUDO_TYPE")
             CALL parser_get_object(parser, line)
             line = ADJUSTL(line)
             il = LEN_TRIM(line)
-            pot%pseudo_type = line(2:il-1)
+            READ (line(2:il-1), *) pot%pseudo_type
          CASE ("RELATIVISTIC")
             CALL parser_get_object(parser, line)
             line = ADJUSTL(line)
             il = LEN_TRIM(line)
-            pot%relativistic = line(2:il-1)
+            READ (line(2:il-1), *) pot%relativistic
          CASE ("IS_ULTRASOFT")
             CALL parser_get_object(parser, line)
             line = ADJUSTL(line)

diff --git a/src/input/cp_output_handling.F b/src/input/cp_output_handling.F
@@ -742,6 +742,7 @@ FUNCTION cp_print_key_generate_filename(logger, print_key, middle_name, extensio
 
       CALL section_vals_val_get(print_key, "FILENAME", c_val=outPath)
       IF (outPath(1:1) == '=') THEN
+         CPASSERT(LEN(outPath)-1 <= LEN(filename))
          filename = outPath(2:)
          RETURN
       END IF