diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 3f52e5f99bfb..cd99c41a3e44 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	PR libfortran/42742
diff --git a/libgfortran/intrinsics/args.c b/libgfortran/intrinsics/args.c
index 7187beccb74a..83a0502fe15f 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)