1 files changed, 7 insertions, 4 deletions

diff --git a/file.c b/file.c
index f36ed235a5..fbe0c84336 100644
--- a/file.c
+++ b/file.c
@@ -2008,13 +2008,16 @@ rb_file_s_utime(argc, argv)
     VALUE *argv;
 {
     VALUE atime, mtime, rest;
-    struct timeval tvp[2];
+    struct timeval tvs[2], *tvp = NULL;
     long n;
 
     rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
 
-    tvp[0] = rb_time_timeval(atime);
-    tvp[1] = rb_time_timeval(mtime);
+    if (!NIL_P(atime) || !NIL_P(mtime)) {
+	tvp = tvs;
+	tvp[0] = rb_time_timeval(atime);
+	tvp[1] = rb_time_timeval(mtime);
+    }
 
     n = apply2files(utime_internal, rest, tvp);
     return LONG2FIX(n);
@@ -2047,7 +2050,7 @@ rb_file_s_utime(argc, argv)
     VALUE atime, mtime, rest;
     long n;
     struct timeval tv;
-    struct utimbuf utbuf;
+    struct utimbuf utbuf, *utp = NULL;
 
     rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);