diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-10-13 12:38:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-10-14 15:57:52 +0200 |
| commit | 2f82562bad423d1190912a4b209647dfac966db2 (patch) | |
| tree | 766d61a085ee9674d8034351a83f64bcdf5d45bb /src/test/test-hostname-util.c | |
| parent | 5222651ecc6f46391e5e0d9cf19793bfe65b0ec8 (diff) | |
| download | systemd-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/test/test-hostname-util.c')
| -rw-r--r-- | src/test/test-hostname-util.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index 6d62958d67..2ac6622624 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -53,45 +53,45 @@ static void test_hostname_cleanup(void) { log_info("/* %s */", __func__); - s = strdupa("foobar"); + s = strdupa_safe("foobar"); assert_se(streq(hostname_cleanup(s), "foobar")); - s = strdupa("foobar.com"); + s = strdupa_safe("foobar.com"); assert_se(streq(hostname_cleanup(s), "foobar.com")); - s = strdupa("foobar.com."); + s = strdupa_safe("foobar.com."); assert_se(streq(hostname_cleanup(s), "foobar.com")); - s = strdupa("foo-bar.-com-."); + s = strdupa_safe("foo-bar.-com-."); assert_se(streq(hostname_cleanup(s), "foo-bar.com")); - s = strdupa("foo-bar-.-com-."); + s = strdupa_safe("foo-bar-.-com-."); assert_se(streq(hostname_cleanup(s), "foo-bar--com")); - s = strdupa("--foo-bar.-com"); + s = strdupa_safe("--foo-bar.-com"); assert_se(streq(hostname_cleanup(s), "foo-bar.com")); - s = strdupa("fooBAR"); + s = strdupa_safe("fooBAR"); assert_se(streq(hostname_cleanup(s), "fooBAR")); - s = strdupa("fooBAR.com"); + s = strdupa_safe("fooBAR.com"); assert_se(streq(hostname_cleanup(s), "fooBAR.com")); - s = strdupa("fooBAR."); + s = strdupa_safe("fooBAR."); assert_se(streq(hostname_cleanup(s), "fooBAR")); - s = strdupa("fooBAR.com."); + s = strdupa_safe("fooBAR.com."); assert_se(streq(hostname_cleanup(s), "fooBAR.com")); - s = strdupa("fööbar"); + s = strdupa_safe("fööbar"); assert_se(streq(hostname_cleanup(s), "fbar")); - s = strdupa(""); + s = strdupa_safe(""); assert_se(isempty(hostname_cleanup(s))); - s = strdupa("."); + s = strdupa_safe("."); assert_se(isempty(hostname_cleanup(s))); - s = strdupa(".."); + s = strdupa_safe(".."); assert_se(isempty(hostname_cleanup(s))); - s = strdupa("foobar."); + s = strdupa_safe("foobar."); assert_se(streq(hostname_cleanup(s), "foobar")); - s = strdupa(".foobar"); + s = strdupa_safe(".foobar"); assert_se(streq(hostname_cleanup(s), "foobar")); - s = strdupa("foo..bar"); + s = strdupa_safe("foo..bar"); assert_se(streq(hostname_cleanup(s), "foo.bar")); - s = strdupa("foo.bar.."); + s = strdupa_safe("foo.bar.."); assert_se(streq(hostname_cleanup(s), "foo.bar")); - s = strdupa("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + s = strdupa_safe("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); assert_se(streq(hostname_cleanup(s), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")); - s = strdupa("xxxx........xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + s = strdupa_safe("xxxx........xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); assert_se(streq(hostname_cleanup(s), "xxxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")); } |