SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time-util: do not use strdupa()

Browse Source 
The input string may come from command line, config files.
This commit is contained in:
Yu Watanabe
2023-02-24 08:55:27 +09:00
parent 17d1ebfc43
commit 804537bdc4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+12 -4
View File
@@ -682,9 +682,13 @@ static int parse_timestamp_impl(const char *t, usec_t *ret, bool with_tz) {
}
if ((k = endswith(t, " ago"))) {
t = strndupa_safe(t, k - t);
_cleanup_free_ char *buf = NULL;
r = parse_sec(t, &minus);
buf = strndup(t, k - t);
if (!buf)
return -ENOMEM;
r = parse_sec(buf, &minus);
if (r < 0)
return r;
@@ -692,9 +696,13 @@ static int parse_timestamp_impl(const char *t, usec_t *ret, bool with_tz) {
}
if ((k = endswith(t, " left"))) {
t = strndupa_safe(t, k - t);
_cleanup_free_ char *buf = NULL;
r = parse_sec(t, &plus);
buf = strndup(t, k - t);
if (!buf)
return -ENOMEM;
r = parse_sec(buf, &plus);
if (r < 0)
return r;