1berry/Inno-Setup-issrc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check OutputBaseFileName and OutputManifestFile for bad chars even if Output=no since they could still be used.

Browse Source
This commit is contained in:
Martijn Laan 2018-12-01 17:19:01 +01:00
parent 7dca5b7432
commit aa0ddc6eee
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Projects/Compile.pas
View File

@ -8756,21 +8756,19 @@ begin
CheckCheckOrInstall('ChangesEnvironment', SetupHeader.ChangesEnvironment, cikDirectiveCheck);
LineNumber := SetupDirectiveLines[ssChangesAssociations];
CheckCheckOrInstall('ChangesAssociations', SetupHeader.ChangesAssociations, cikDirectiveCheck);
if Output then begin
if OutputDir = '' then begin
LineNumber := SetupDirectiveLines[ssOutput];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputDir']);
end;
if (OutputBaseFileName = '') or (PathLastDelimiter(BadFileNameChars + '\', OutputBaseFileName) <> 0) then begin
LineNumber := SetupDirectiveLines[ssOutputBaseFileName];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputBaseFileName']);
end else if OutputBaseFileName = 'setup' then
WarningsList.Add(SCompilerOutputBaseFileNameSetup);
if (SetupDirectiveLines[ssOutputManifestFile] <> 0) and
((OutputManifestFile = '') or (PathLastDelimiter(BadFilePathChars, OutputManifestFile) <> 0)) then begin
LineNumber := SetupDirectiveLines[ssOutputManifestFile];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputManifestFile']);
end;
if Output and (OutputDir = '') then begin
LineNumber := SetupDirectiveLines[ssOutput];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputDir']);
end;
if (Output and (OutputBaseFileName = '')) or (PathLastDelimiter(BadFileNameChars + '\', OutputBaseFileName) <> 0) then begin
LineNumber := SetupDirectiveLines[ssOutputBaseFileName];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputBaseFileName']);
end else if OutputBaseFileName = 'setup' then { Warn even if Output is False }
WarningsList.Add(SCompilerOutputBaseFileNameSetup);
if (SetupDirectiveLines[ssOutputManifestFile] <> 0) and
((Output and (OutputManifestFile = '')) or (PathLastDelimiter(BadFilePathChars, OutputManifestFile) <> 0)) then begin
LineNumber := SetupDirectiveLines[ssOutputManifestFile];
AbortCompileOnLineFmt(SCompilerEntryInvalid2, ['Setup', 'OutputManifestFile']);
end;
if shAlwaysUsePersonalGroup in SetupHeader.Options then
UsedUserAreas.Add('AlwaysUsePersonalGroup');