ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Use malloc() to allocate temporary filename buffers. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-07-14 10:33:23 +02:00
parent e9abe3f739
commit 83f9e784e4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/ntdll/unix/file.c
View File

@ -1503,7 +1503,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
/* is a symbolic link and a directory, consider these "reparse points" */ /* is a symbolic link and a directory, consider these "reparse points" */
if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT;
} }
else if (S_ISDIR( st->st_mode ) && (parent_path = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) + 4 ))) else if (S_ISDIR( st->st_mode ) && (parent_path = malloc( strlen(path) + 4 )))
{ {
struct stat parent_st; struct stat parent_st;
@ -1514,7 +1514,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
&& (st->st_dev != parent_st.st_dev || st->st_ino == parent_st.st_ino)) && (st->st_dev != parent_st.st_dev || st->st_ino == parent_st.st_ino))
*attr |= FILE_ATTRIBUTE_REPARSE_POINT; *attr |= FILE_ATTRIBUTE_REPARSE_POINT;
RtlFreeHeap( GetProcessHeap(), 0, parent_path ); free( parent_path );
} }
*attr |= get_file_attributes( st ); *attr |= get_file_attributes( st );
return ret; return ret;
@ -1858,8 +1858,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] )
struct stat st; struct stat st;
unsigned int i; unsigned int i;
if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, if ((buffer = malloc( strlen(config_dir) + sizeof("/dosdevices/a:") )))
strlen(config_dir) + sizeof("/dosdevices/a:") )))
{ {
strcpy( buffer, config_dir ); strcpy( buffer, config_dir );
strcat( buffer, "/dosdevices/a:" ); strcat( buffer, "/dosdevices/a:" );
@ -1880,7 +1879,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] )
cache[i].ino = 0; cache[i].ino = 0;
} }
} }
RtlFreeHeap( GetProcessHeap(), 0, buffer ); free( buffer );
} }
last_update = now; last_update = now;
} }
@ -1911,7 +1910,7 @@ static int find_dos_device( const char *path )
while (len > 1 && path[len - 1] == '/') len--; while (len > 1 && path[len - 1] == '/') len--;
/* make a copy of the path */ /* make a copy of the path */
if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) return -1; if (!(buffer = malloc( len + 1 ))) return -1;
memcpy( buffer, path, len ); memcpy( buffer, path, len );
buffer[len] = 0; buffer[len] = 0;
@ -1928,7 +1927,7 @@ static int find_dos_device( const char *path )
if (len == 1) len = 0; /* preserve root slash in returned path */ if (len == 1) len = 0; /* preserve root slash in returned path */
TRACE( "%s -> drive %c:, root=%s, name=%s\n", TRACE( "%s -> drive %c:, root=%s, name=%s\n",
debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len));
RtlFreeHeap( GetProcessHeap(), 0, buffer ); free( buffer );
return drive; return drive;
} }
} }
@ -1938,7 +1937,7 @@ static int find_dos_device( const char *path )
while (path[len - 1] == '/') len--; while (path[len - 1] == '/') len--;
buffer[len] = 0; buffer[len] = 0;
} }
RtlFreeHeap( GetProcessHeap(), 0, buffer ); free( buffer );
return -1; return -1;
} }
@ -3467,13 +3466,13 @@ static NTSTATUS unmount_device( HANDLE handle )
#else #else
static const char umount[] = "umount >/dev/null 2>&1 "; static const char umount[] = "umount >/dev/null 2>&1 ";
#endif #endif
char *cmd = RtlAllocateHeap( GetProcessHeap(), 0, strlen(mount_point)+sizeof(umount)); char *cmd = malloc( strlen(mount_point)+sizeof(umount));
if (cmd) if (cmd)
{ {
strcpy( cmd, umount ); strcpy( cmd, umount );
strcat( cmd, mount_point ); strcat( cmd, mount_point );
system( cmd ); system( cmd );
RtlFreeHeap( GetProcessHeap(), 0, cmd ); free( cmd );
#ifdef linux #ifdef linux
/* umount will fail to release the loop device since we still have /* umount will fail to release the loop device since we still have
a handle to it, so we release it here */ a handle to it, so we release it here */
@ -3993,7 +3992,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
char *tmpbuf; char *tmpbuf;
ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000; ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000;
if (size > 0x10000) size = 0x10000; if (size > 0x10000) size = 0x10000;
if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) if ((tmpbuf = malloc( size )))
{ {
if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))
{ {
@ -4002,7 +4001,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE;
if (needs_close) close( fd ); if (needs_close) close( fd );
} }
RtlFreeHeap( GetProcessHeap(), 0, tmpbuf ); free( tmpbuf );
} }
} }
} }