Merge pull request cesanta#183 from cesanta/fix_176

Fix cesanta#176
kaplan2539 · Dec 21, 2014 · 942d51d · 942d51d
2 parents 8cede17 + f804e4f
commit 942d51d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/fossa.c b/fossa.c
@@ -4457,6 +4457,16 @@ static int ns_get_ip_address_of_nameserver(char *name, size_t name_len) {
           &type, value, &len) == ERROR_SUCCESS ||
           RegQueryValueEx(hSub, "DhcpNameServer", 0,
           &type, value, &len) == ERROR_SUCCESS)) {
+        /*
+         * See https://github.com/cesanta/fossa/issues/176
+         * The value taken from the registry can be empty, a single
+         * IP address, or multiple IP addresses separated by comma.
+         * If it's multiple IP addresses, take the first one.
+         */
+        char *comma = strchr(value, ',');
+        if (comma != NULL) {
+          *comma = '\0';
+        }
         strncpy(name, value, name_len);
         ret++;
         RegCloseKey(hSub);

diff --git a/src/resolv.c b/src/resolv.c
@@ -56,6 +56,16 @@ static int ns_get_ip_address_of_nameserver(char *name, size_t name_len) {
           &type, value, &len) == ERROR_SUCCESS ||
           RegQueryValueEx(hSub, "DhcpNameServer", 0,
           &type, value, &len) == ERROR_SUCCESS)) {
+        /*
+         * See https://github.com/cesanta/fossa/issues/176
+         * The value taken from the registry can be empty, a single
+         * IP address, or multiple IP addresses separated by comma.
+         * If it's multiple IP addresses, take the first one.
+         */
+        char *comma = strchr(value, ',');
+        if (comma != NULL) {
+          *comma = '\0';
+        }
         strncpy(name, value, name_len);
         ret++;
         RegCloseKey(hSub);