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

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-07-14 10:32:04 +02:00
parent 314cd9cdd5
commit ef01f6ac13
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ntdll/unix/env.c
View File

@ -1064,7 +1064,7 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char
{ {
if (unix_to_nt_file_name( path, &nt_name )) return; if (unix_to_nt_file_name( path, &nt_name )) return;
append_envW( env, pos, name, nt_name ); append_envW( env, pos, name, nt_name );
RtlFreeHeap( GetProcessHeap(), 0, nt_name ); free( nt_name );
} }
} }
@ -1217,7 +1217,7 @@ void CDECL get_initial_directory( UNICODE_STRING *dir )
memcpy( dir->Buffer, nt_name, dir->Length ); memcpy( dir->Buffer, nt_name, dir->Length );
dir->Buffer[1] = '\\'; dir->Buffer[1] = '\\';
} }
RtlFreeHeap( GetProcessHeap(), 0, nt_name ); free( nt_name );
} }
} }

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

@ -1834,7 +1834,7 @@ static NTSTATUS fill_name_info( const char *unix_name, FILE_NAME_INFORMATION *in
else *name_len = info->FileNameLength; else *name_len = info->FileNameLength;
memcpy( info->FileName, ptr, *name_len ); memcpy( info->FileName, ptr, *name_len );
RtlFreeHeap( GetProcessHeap(), 0, nt_name ); free( nt_name );
} }
return status; return status;
@ -3447,8 +3447,7 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt )
else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status;
lenW = wcslen( prefix ); lenW = wcslen( prefix );
if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, (lenA + lenW + 1) * sizeof(WCHAR) ))) if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY;
return STATUS_NO_MEMORY;
memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); memcpy( buffer, prefix, lenW * sizeof(WCHAR) );
lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA );
buffer[lenW] = 0; buffer[lenW] = 0;
@ -3474,7 +3473,7 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_
if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name );
else status = STATUS_BUFFER_TOO_SMALL; else status = STATUS_BUFFER_TOO_SMALL;
*size = wcslen(nt_name) + 1; *size = wcslen(nt_name) + 1;
RtlFreeHeap( GetProcessHeap(), 0, nt_name ); free( nt_name );
} }
return status; return status;
} }
@ -6411,7 +6410,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas
wcscpy( p->Name.Buffer, nt_name ); wcscpy( p->Name.Buffer, nt_name );
} }
if (used_len) *used_len = sizeof(*p) + size; if (used_len) *used_len = sizeof(*p) + size;
RtlFreeHeap( GetProcessHeap(), 0, nt_name ); free( nt_name );
} }
RtlFreeHeap( GetProcessHeap(), 0, unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name );
break; break;