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

msi: Avoid a crash when target paths have not yet been resolved.

Browse Source
This commit is contained in:
Hans Leidekker 2012-11-06 15:20:02 +01:00 committed by Alexandre Julliard
parent fa184bc2c2
commit cfadbddcaf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/msi/format.c
View File

@ -221,7 +221,8 @@ static WCHAR *deformat_component( FORMAT *format, FORMSTR *str, int *ret_len )
else else
ret = strdupW( msi_get_target_folder( format->package, comp->Directory ) ); ret = strdupW( msi_get_target_folder( format->package, comp->Directory ) );
*ret_len = strlenW( ret ); if (ret) *ret_len = strlenW( ret );
else *ret_len = 0;
msi_free( key ); msi_free( key );
return ret; return ret;
} }
@ -238,14 +239,12 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int *
if (!(file = msi_get_loaded_file( format->package, key ))) goto done; if (!(file = msi_get_loaded_file( format->package, key ))) goto done;
if (!shortname) if (!shortname)
{ {
ret = strdupW( file->TargetPath ); if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret );
len = strlenW( ret );
goto done; goto done;
} }
if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0)
{ {
ret = strdupW( file->TargetPath ); if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret );
len = strlenW( ret );
goto done; goto done;
} }
len++; len++;