deps: c-ares: cherry-pick 8ba37af8e3fb

Renegade334 · richardlau · commit c7e57f55a761 · 2026-07-03T16:04:30.000Z
Original commit message: Fixes #1056 The commit c-ares/c-ares@1d1b3d4 refactored the function to use wide strings, but didn't touch this check. Because an empty wide string would now be size 2 and not 1, the empty string would go on and cause the DNS domain list to be replaced with nothing. Signed-off-by: @dankmeme01 Refs: c-ares/c-ares@8ba37af PR-URL: #64110 Fixes: #62347 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/deps/cares/src/lib/ares_sysconfig_win.c b/deps/cares/src/lib/ares_sysconfig_win.c
@@ -106,7 +106,7 @@ static ares_bool_t get_REG_SZ(HKEY hKey, const WCHAR *leafKeyName, char **outptr
 
   /* Get the value for real */
   res = RegQueryValueExW(hKey, leafKeyName, 0, NULL, (BYTE *)val, &size);
-  if (res != ERROR_SUCCESS || size == 1) {
+  if (res != ERROR_SUCCESS || size == sizeof(WCHAR)) {
     ares_free(val);
     return ARES_FALSE;
   }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ static ares_bool_t get_REG_SZ(HKEY hKey, const WCHAR leafKeyName, char *outptr`
`106`	`106`
`107`	`107`	`/* Get the value for real */`
`108`	`108`	`res = RegQueryValueExW(hKey, leafKeyName, 0, NULL, (BYTE *)val, &size);`
`109`		`- if (res != ERROR_SUCCESS \|\| size == 1) {`
	`109`	`+ if (res != ERROR_SUCCESS \|\| size == sizeof(WCHAR)) {`
`110`	`110`	`ares_free(val);`
`111`	`111`	`return ARES_FALSE;`
`112`	`112`	`}`