mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Fix bug on MS-Windows with frame title when system-name is non-ASCII

Browse source 
* src/w32.c (sys_gethostname): Convert system name to UTF-8.
Ensure the buffer passed to 'gethostname' is large enough.
(Bug#80472)
This commit is contained in:
Eli Zaretskii 2026-02-27 17:55:05 +02:00
parent 13cc7c2b54
commit 76c7c867d6
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/w32.c
View file

@ -8264,25 +8264,38 @@ sys_inet_addr (const char * cp)
pfn_inet_addr (cp) : INADDR_NONE;
}
/* Wrapper for gethostname. Note: NAMELEN is the space available in
NAME excluding the terminating null. */
int
sys_gethostname (char * name, int namelen)
{
int retval;
int nlen = namelen;
char sname[256+1];
if (winsock_lib != NULL)
{
int retval;
check_errno ();
retval = pfn_gethostname (name, namelen);
retval = pfn_gethostname (sname, sizeof(sname));
if (retval == SOCKET_ERROR)
set_errno ();
return retval;
}
if (namelen > MAX_COMPUTERNAME_LENGTH)
return !GetComputerName (name, (DWORD *)&namelen);
errno = EFAULT;
return SOCKET_ERROR;
else if (sizeof(sname) > MAX_COMPUTERNAME_LENGTH)
retval = !GetComputerNameA (sname, (DWORD *)&nlen);
else
{
retval = SOCKET_ERROR;
errno = EFAULT;
}
/* The rest of the code wants the name in UTF-8. The host name is not
a file name, but it's encoded in the ANSI codepage and its size
must be at most 256 characters. So treating it as a file name
should be okay. */
char hostname[MAX_UTF8_PATH];
filename_from_ansi (sname, hostname);
strncpy (name, hostname, namelen);
name[namelen] = '\0';
return retval;
}
struct hostent *