packages/clibcni
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check invalid argument

Browse Source 
Signed-off-by: LiuHao <liuhao27@huawei.com>
This commit is contained in:
LiuHao 2020-01-06 10:32:09 +08:00
parent 6dad59d637
commit 5ea412e4de
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/types/current.c
View File

@ -124,6 +124,9 @@ static int do_parse_ipnet(const char *cidr_str, const char *ip_str, uint8_t **ip
ERROR("Parse cidr failed: %s", *err != NULL ? *err : ""); ERROR("Parse cidr failed: %s", *err != NULL ? *err : "");
return -1; return -1;
} }
if (ip_str == NULL) {
return 0;
}
ret = parse_ip_from_str(ip_str, ip, ip_len, err); ret = parse_ip_from_str(ip_str, ip, ip_len, err);
if (ret != 0) { if (ret != 0) {
ERROR("Parse ip failed: %s", *err != NULL ? *err : ""); ERROR("Parse ip failed: %s", *err != NULL ? *err : "");

8
src/types/types.c
View File

@ -645,6 +645,10 @@ static int do_parse_ipv6_from_str(const char *addr, struct in6_addr *ipv6, uint8
{ {
int nret = 0; int nret = 0;
if (addr == NULL) {
ERROR("Empty address");
return -1;
}
nret = inet_pton(AF_INET6, addr, ipv6); nret = inet_pton(AF_INET6, addr, ipv6);
if (nret < 0) { if (nret < 0) {
nret = asprintf(err, "ipv6 inet_pton %s", strerror(errno)); nret = asprintf(err, "ipv6 inet_pton %s", strerror(errno));
@ -674,6 +678,10 @@ int parse_ip_from_str(const char *addr, uint8_t **ips, size_t *len, char **err)
struct in6_addr ipv6; struct in6_addr ipv6;
int ret = -1; int ret = -1;
if (addr == NULL) {
ERROR("Empty address");
return -1;
}
nret = inet_pton(AF_INET, addr, &ipv4); nret = inet_pton(AF_INET, addr, &ipv4);
if (nret < 0) { if (nret < 0) {
nret = asprintf(err, "ipv4 inet_pton %s", strerror(errno)); nret = asprintf(err, "ipv4 inet_pton %s", strerror(errno));