shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-01 05:47:04 +03:00
Code

dhcp6: remove assertions in dhcp6_option_parse_domainname()

Browse Source 
Assertions are for programming errors; here the input comes directly
from the DHCP response packet.

(cherry picked from commit af710b535b4ceacd0aecec6748a4f8ee57742e99)
This commit is contained in:
Beniamino Galvani 2020-07-22 05:03:47 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 41f9f2816d
commit f784c9ccb7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsystemd-network/dhcp6-option.c
View File

@ -647,8 +647,10 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char *
_cleanup_strv_free_ char **names = NULL;
int r;
assert_return(optlen > 1, -ENODATA);
assert_return(optval[optlen - 1] == '\0', -EINVAL);
if (optlen <= 1)
return -ENODATA;
if (optval[optlen - 1] != '\0')
return -EINVAL;
while (pos < optlen) {
_cleanup_free_ char *ret = NULL;