chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
resolved: accept UTF-8 hostnames from bus clients
[elogind.git]
/
src
/
resolve
/
resolved-dns-domain.c
diff --git
a/src/resolve/resolved-dns-domain.c
b/src/resolve/resolved-dns-domain.c
index c2a435944ca5856ca438a79d6612b498031066d3..1bb011d9e72297197c2886d1ccb493644d0d29b2 100644
(file)
--- a/
src/resolve/resolved-dns-domain.c
+++ b/
src/resolve/resolved-dns-domain.c
@@
-172,7
+172,6
@@
int dns_name_normalize(const char *s, char **_ret) {
int r;
assert(s);
- assert(_ret);
for (;;) {
_cleanup_free_ char *t = NULL;
@@
-210,8
+209,11
@@
int dns_name_normalize(const char *s, char **_ret) {
return -ENOMEM;
ret[n] = 0;
- *_ret = ret;
- ret = NULL;
+
+ if (_ret) {
+ *_ret = ret;
+ ret = NULL;
+ }
return 0;
}