Commit e76e9231 by Tobias Burnus Committed by Tobias Burnus

re PR libfortran/42996 (Incorrect length returned from get_command_argument intrinsic)

2010-02-09  Tobias Burnus  <burnus@net-b.de>

        PR fortran/42996
        * intrinsics/args.c (get_command_argument_i4): Always return
        commandline-argument length for length parameter.

From-SVN: r156630
parent 57257f0d
2010-02-09 Tobias Burnus <burnus@net-b.de>
PR fortran/42996
* intrinsics/args.c (get_command_argument_i4): Always return
commandline-argument length for length parameter.
2010-02-06 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2010-02-06 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/42742 PR libfortran/42742
......
...@@ -147,11 +147,9 @@ get_command_argument_i4 (GFC_INTEGER_4 *number, char *value, ...@@ -147,11 +147,9 @@ get_command_argument_i4 (GFC_INTEGER_4 *number, char *value,
if (value != NULL && stat_flag != GFC_GC_FAILURE) if (value != NULL && stat_flag != GFC_GC_FAILURE)
{ {
if (arglen > value_len) if (arglen > value_len)
{
arglen = value_len;
stat_flag = GFC_GC_VALUE_TOO_SHORT; 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) if (length != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment