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

ntdll: Use malloc() to allocate the buffer in get_device_mount_point(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-07-14 10:33:05 +02:00
parent 9ec5be2cea
commit b2d38f1531
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,8 +947,7 @@ static char *get_device_mount_point( dev_t dev )
if (device && !stat( device, &st ) && S_ISBLK(st.st_mode) && st.st_rdev == dev) if (device && !stat( device, &st ) && S_ISBLK(st.st_mode) && st.st_rdev == dev)
{ {
ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry->mnt_dir) + 1 ); ret = strdup( entry->mnt_dir );
if (ret) strcpy( ret, entry->mnt_dir );
break; break;
} }
} }
@ -968,8 +967,7 @@ static char *get_device_mount_point( dev_t dev )
if (stat( entry[i].f_mntfromname, &st ) == -1) continue; if (stat( entry[i].f_mntfromname, &st ) == -1) continue;
if (S_ISBLK(st.st_mode) && st.st_rdev == dev) if (S_ISBLK(st.st_mode) && st.st_rdev == dev)
{ {
ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry[i].f_mntonname) + 1 ); ret = strdup( entry[i].f_mntonname );
if (ret) strcpy( ret, entry[i].f_mntonname );
break; break;
} }
} }
@ -1089,11 +1087,11 @@ static int get_dir_case_sensitivity_attr( const char *dir )
attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES;
if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0)
{ {
RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); free( mntpoint );
add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE );
return TRUE; return TRUE;
} }
RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); free( mntpoint );
if (caps.size == sizeof(caps) && if (caps.size == sizeof(caps) &&
(caps.caps.valid[VOL_CAPABILITIES_FORMAT] & (caps.caps.valid[VOL_CAPABILITIES_FORMAT] &
(VOL_CAP_FMT_CASE_SENSITIVE | VOL_CAP_FMT_CASE_PRESERVING)) == (VOL_CAP_FMT_CASE_SENSITIVE | VOL_CAP_FMT_CASE_PRESERVING)) ==
@ -3500,7 +3498,7 @@ static NTSTATUS unmount_device( HANDLE handle )
if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 ); if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 );
#endif #endif
} }
RtlFreeHeap( GetProcessHeap(), 0, mount_point ); free( mount_point );
} }
} }
if (needs_close) close( unix_fd ); if (needs_close) close( unix_fd );