summaryrefslogtreecommitdiff
path: root/src/journal-remote/journal-remote-main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-10-13 12:38:37 +0200
committerLennart Poettering <lennart@poettering.net>2021-10-14 15:57:52 +0200
commit2f82562bad423d1190912a4b209647dfac966db2 (patch)
tree766d61a085ee9674d8034351a83f64bcdf5d45bb /src/journal-remote/journal-remote-main.c
parent5222651ecc6f46391e5e0d9cf19793bfe65b0ec8 (diff)
downloadsystemd-2f82562bad423d1190912a4b209647dfac966db2.tar.gz
alloc-util: add strdupa_safe() + strndupa_safe() and use it everywhere
Let's define two helpers strdupa_safe() + strndupa_safe() which do the same as their non-safe counterparts, except that they abort if called with allocations larger than ALLOCA_MAX. This should ensure that all our alloca() based allocations are subject to this limit. afaics glibc offers three alloca() based APIs: alloca() itself, strndupa() + strdupa(). With this we have now replacements for all of them, that take the limit into account.
Diffstat (limited to 'src/journal-remote/journal-remote-main.c')
-rw-r--r--src/journal-remote/journal-remote-main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index ba2a00da64..91b28d0410 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -662,7 +662,7 @@ static int create_remoteserver(
else
url = strjoina(arg_url, "/entries");
} else
- url = strdupa(arg_url);
+ url = strdupa_safe(arg_url);
log_info("Spawning curl %s...", url);
fd = spawn_curl(url);
@@ -673,7 +673,7 @@ static int create_remoteserver(
if (!hostname)
hostname = arg_url;
- hostname = strndupa(hostname, strcspn(hostname, "/:"));
+ hostname = strndupa_safe(hostname, strcspn(hostname, "/:"));
r = journal_remote_add_source(s, fd, (char *) hostname, false);
if (r < 0)