diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-06-21 11:29:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-21 11:29:38 +0300 |
| commit | d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8 (patch) | |
| tree | 767a67cd54db1beb8549106f1b729699411df431 /main/musl/0046-handle-localtime-errors-in-ctime.patch | |
| parent | 6b899d49bd1d15c8390bd53e710da0b26a36218e (diff) | |
| download | aports-d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8.tar.bz2 aports-d985d2b50a41eb5f9ba682f4afe72ac2c59b53e8.tar.xz | |
main/musl: cherry-pick upstream fixes
Diffstat (limited to 'main/musl/0046-handle-localtime-errors-in-ctime.patch')
| -rw-r--r-- | main/musl/0046-handle-localtime-errors-in-ctime.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/main/musl/0046-handle-localtime-errors-in-ctime.patch b/main/musl/0046-handle-localtime-errors-in-ctime.patch new file mode 100644 index 0000000000..00a4dce65e --- /dev/null +++ b/main/musl/0046-handle-localtime-errors-in-ctime.patch @@ -0,0 +1,30 @@ +From 5c10c33d2a35204ee76931625a007fcc8cca3228 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 15 Jun 2017 12:58:08 -0400 +Subject: [PATCH] handle localtime errors in ctime + +ctime passes the result from localtime directly to asctime. But in case +of error, localtime returns 0. This causes an error (NULL pointer +dereference) in asctime. + +based on patch by Omer Anson. +--- + src/time/ctime.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/time/ctime.c b/src/time/ctime.c +index 185ec554..36029315 100644 +--- a/src/time/ctime.c ++++ b/src/time/ctime.c +@@ -2,5 +2,7 @@ + + char *ctime(const time_t *t) + { +- return asctime(localtime(t)); ++ struct tm *tm = localtime(t); ++ if (!tm) return 0; ++ return asctime(tm); + } +-- +2.13.0 + |