about summary refs log tree commit diff
diff options
context:
space:
mode:
authorÉrico Rolim <ericonr@disroot.org>2020-11-12 17:52:23 -0300
committerRich Felker <dalias@aerifal.cx>2020-11-29 00:57:24 -0500
commitc5d118ebbcfe41d928d8ffc913bc532c59237189 (patch)
tree9ee3a3d08b232c8832dc6c2e485bca0ab55e5398
parent67f774625e84ad941d722f745f085c0bd4ae7582 (diff)
downloadmusl-c5d118ebbcfe41d928d8ffc913bc532c59237189.tar.gz
musl-c5d118ebbcfe41d928d8ffc913bc532c59237189.tar.xz
musl-c5d118ebbcfe41d928d8ffc913bc532c59237189.zip
fix segfault in lutimes when tv argument is NULL
calling lutimes with tv=0 is valid if the application wants to set the
timestamps to the current time. this commit makes it so the timespec
struct is populated with values from tv only if tv != 0 and calls
utimensat with times=0 if tv == 0.
-rw-r--r--src/legacy/lutimes.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/legacy/lutimes.c b/src/legacy/lutimes.c
index 2e5502d1..dd465923 100644
--- a/src/legacy/lutimes.c
+++ b/src/legacy/lutimes.c
@@ -6,9 +6,11 @@
 int lutimes(const char *filename, const struct timeval tv[2])
 {
 	struct timespec times[2];
-	times[0].tv_sec  = tv[0].tv_sec;
-	times[0].tv_nsec = tv[0].tv_usec * 1000;
-	times[1].tv_sec  = tv[1].tv_sec;
-	times[1].tv_nsec = tv[1].tv_usec * 1000;
-	return utimensat(AT_FDCWD, filename, times, AT_SYMLINK_NOFOLLOW);
+	if (tv) {
+		times[0].tv_sec  = tv[0].tv_sec;
+		times[0].tv_nsec = tv[0].tv_usec * 1000;
+		times[1].tv_sec  = tv[1].tv_sec;
+		times[1].tv_nsec = tv[1].tv_usec * 1000;
+	}
+	return utimensat(AT_FDCWD, filename, tv ? times : 0, AT_SYMLINK_NOFOLLOW);
 }