diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-10-19 22:18:53 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-10-19 22:20:02 +0000 |
| commit | 55c392b0f8dbb2b9639d975bdf2121f863785980 (patch) | |
| tree | ed25c491fae597cecf1a16b87c9dda4deb873aa0 /main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch | |
| parent | 334dd84114a19a8e3025abcc6fc9afb7cb255f3f (diff) | |
| download | aports-55c392b0f8dbb2b9639d975bdf2121f863785980.tar.bz2 aports-55c392b0f8dbb2b9639d975bdf2121f863785980.tar.xz | |
main/musl: upgrade to 1.1.17
Diffstat (limited to 'main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch')
| -rw-r--r-- | main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch b/main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch deleted file mode 100644 index 37d608e4a3..0000000000 --- a/main/musl/0048-handle-errors-from-localtime_r-in-ctime_r.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 64f855874c32e192382df69f4765a7e32057a005 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 20 Jun 2017 20:31:35 -0400 -Subject: [PATCH] handle errors from localtime_r in ctime_r - -POSIX requires ctime_r return a null pointer on failure, which can -occur if the input time_t value is not representable in broken down -form. - -based on patch by Alexander Monakov. ---- - src/time/ctime_r.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/time/ctime_r.c b/src/time/ctime_r.c -index d2260a16..3e24aa68 100644 ---- a/src/time/ctime_r.c -+++ b/src/time/ctime_r.c -@@ -2,7 +2,6 @@ - - char *ctime_r(const time_t *t, char *buf) - { -- struct tm tm; -- localtime_r(t, &tm); -- return asctime_r(&tm, buf); -+ struct tm tm, *tm_p = localtime_r(t, &tm); -+ return tm_p ? asctime_r(tm_p, buf) : 0; - } --- -2.13.0 - |