Skip to content

Parse IP addresses from JSON-like strings to allow better IPv6 address handling #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Parse IP addresses from JSON-like strings to allow better IPv6 address handling #514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2964c4e
Parse IP Addresses from JSON-like strings to allow better IPv6 addres…
uzlonewolf Dec 4, 2021
2944ffc
Tighten up _getdns_ipaddr_dict_mf() so it does not grab random string…
uzlonewolf Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ _getdns_ipaddr_dict_mf(struct mem_funcs *mf, const char *ipstr)
tsig_name_str = "";
}
}
if (*ipstr == '*') {
if (*ipstr == '*' && *(ipstr+1) == '\0') {
getdns_dict_util_set_string(r, "address_type", "IPv6");
addr.size = 16;
(void) memset(buf, 0, 16);
Expand Down Expand Up @@ -1612,6 +1612,11 @@ static int _jsmn_get_item(struct mem_funcs *mf, const char *js, jsmntok_t *t,
if (t->end < t->start)
*r = GETDNS_RETURN_GENERIC_ERROR;

else if (_jsmn_get_ipdict(mf, js, t, &item->data.dict)) {
item->dtype = t_dict;
*r = GETDNS_RETURN_GOOD;
return 1;
}
else if (!(item->data.bindata =
GETDNS_MALLOC(*mf, getdns_bindata)))
*r = GETDNS_RETURN_MEMORY_ERROR;
Expand Down