niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

server: Replace some malloc/sprintf/strcpy calls with asprintf.

Browse source
This commit is contained in:
Brendan Shanks 2024-03-19 15:15:29 -07:00 • committed by Alexandre Julliard
parent d7cf25dcd4
commit 4e04b2d528
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
server/request.c
View file

@ -601,9 +601,8 @@ static void create_dir( const char *name, struct stat *st )
static char *create_server_dir( int force )
{
const char *prefix = getenv( "WINEPREFIX" );
char *p, *config_dir;
char *p, *config_dir, *base_dir;
struct stat st, st2;
size_t len = sizeof("/server-") + 2 * sizeof(st.st_dev) + 2 * sizeof(st.st_ino) + 2;
/* open the configuration directory */
@ -646,23 +645,19 @@ static char *create_server_dir( int force )
/* create the base directory if needed */
#ifdef __ANDROID__ /* there's no /tmp dir on Android */
len += strlen( config_dir ) + sizeof("/.wineserver");
if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" );
strcpy( server_dir, config_dir );
strcat( server_dir, "/.wineserver" );
if (asprintf( &base_dir, "%s/.wineserver", config_dir ) == -1)
fatal_error( "out of memory\n" );
#else
len += sizeof("/tmp/.wine-") + 12;
if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" );
sprintf( server_dir, "/tmp/.wine-%u", getuid() );
if (asprintf( &base_dir, "/tmp/.wine-%u", getuid() ) == -1)
fatal_error( "out of memory\n" );
#endif
create_dir( server_dir, &st2 );
create_dir( base_dir, &st2 );
/* now create the server directory */
strcat( server_dir, "/server-" );
p = server_dir + strlen(server_dir);
sprintf( p, "%llx-%llx", (unsigned long long)st.st_dev, (unsigned long long)st.st_ino );
if (asprintf( &server_dir, "%s/server-%llx-%llx", base_dir,
(unsigned long long)st.st_dev, (unsigned long long)st.st_ino ) == -1)
fatal_error( "out of memory\n" );
create_dir( server_dir, &st );
@ -675,6 +670,7 @@ static char *create_server_dir( int force )
if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino)
fatal_error( "chdir did not end up in %s\n", server_dir );
free( base_dir );
free( config_dir );
return server_dir;
}

10
server/unicode.c
View file

@ -265,11 +265,7 @@ static char *get_nls_dir(void)
}
*(++p) = 0;
if (p > dir + 8 && !strcmp( p - 8, "/server/" )) nlsdir = "../nls"; /* inside build tree */
if ((ret = malloc( strlen(dir) + strlen( nlsdir ) + 1 )))
{
strcpy( ret, dir );
strcat( ret, nlsdir );
}
asprintf( &ret, "%s%s", dir, nlsdir );
free( dir );
return ret;
}
@ -292,9 +288,7 @@ struct fd *load_intl_file(void)
for (i = 0; i < ARRAY_SIZE( nls_dirs ); i++)
{
if (!nls_dirs[i]) continue;
if (!(path = malloc( strlen(nls_dirs[i]) + sizeof("/l_intl.nls" )))) continue;
strcpy( path, nls_dirs[i] );
strcat( path, "/l_intl.nls" );
if (asprintf( &path, "%s/l_intl.nls", nls_dirs[i] ) == -1) continue;
if ((fd = open_fd( NULL, path, nt_name, O_RDONLY, &mode, FILE_READ_DATA,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))) break;