paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 09:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Packager: Reveal a Nil reference bug with assertions.

Browse Source 
git-svn-id: trunk@48408 -
This commit is contained in:
juha 2015-03-17 22:51:49 +00:00
parent 2a7329ce1d
commit ca503d94f3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packager/interpkgconflictfiles.pas
View File

@ -155,7 +155,9 @@ var
F1: TPGInterPkgFile absolute File1;
F2: TPGInterPkgFile absolute File2;
begin
Result:=CompareDottedIdentifiers(PChar(Pointer(F1.AnUnitName)),PChar(Pointer(F2.AnUnitName)));
Assert(Assigned(F1), 'ComparePGInterPkgUnitnames: File1=Nil.');
Assert(Assigned(F2), 'ComparePGInterPkgUnitnames: File2=Nil.');
Result:=CompareDottedIdentifiers(PChar(F1.AnUnitName),PChar(F2.AnUnitName));
end;
function ComparePGInterPkgShortFilename(File1, File2: Pointer): integer;
@ -863,8 +865,10 @@ var
continue;
//debugln(['CheckPPUFilesInWrongDirs duplicate units found: file1="',CurUnit.FullFilename,'"(',CurUnit.OwnerInfo.Name,') file2="',OtherFile.FullFilename,'"(',OtherFile.OwnerInfo.Name,')']);
FindUnitSourcePPU(OtherFile,OtherPPUFile);
if FileGroup=nil then
if FileGroup=nil then begin
FindUnitSourcePPU(CurUnit,PPUFile);
Assert(Assigned(CurUnit), 'CheckDuplicateUnits: FindUnitSourcePPU() changed CurUnit to Nil. Not good!');
end;
if (CurUnit<>nil) and (OtherFile<>nil)
and (CompareFilenames(CurUnit.FullFilename,OtherFile.FullFilename)=0) then
begin