From ad7f2bea513e6ab70415a7ad51bae6037c087dbf Mon Sep 17 00:00:00 2001 From: burnus Date: Tue, 9 Feb 2010 17:04:57 +0000 Subject: [PATCH] 2010-02-09 Tobias Burnus PR fortran/42996 * intrinsics/args.c (get_command_argument_i4): Always return commandline-argument length for length parameter. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156630 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/intrinsics/args.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 3f52e5f..cd99c41 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2010-02-09 Tobias Burnus + + PR fortran/42996 + * intrinsics/args.c (get_command_argument_i4): Always return + commandline-argument length for length parameter. + 2010-02-06 Jerry DeLisle PR libfortran/42742 diff --git a/libgfortran/intrinsics/args.c b/libgfortran/intrinsics/args.c index 7187bec..83a0502 100644 --- a/libgfortran/intrinsics/args.c +++ b/libgfortran/intrinsics/args.c @@ -147,11 +147,9 @@ get_command_argument_i4 (GFC_INTEGER_4 *number, char *value, if (value != NULL && stat_flag != GFC_GC_FAILURE) { if (arglen > value_len) - { - arglen = value_len; stat_flag = GFC_GC_VALUE_TOO_SHORT; - } - memcpy (value, argv[*number], arglen); + + memcpy (value, argv[*number], arglen <= value_len ? arglen : value_len); } if (length != NULL) -- 2.7.4