diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index 1fd5dd51b3..af9d372130 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -3534,14 +3534,14 @@ begin
         begin
           SrcPos:=p-PChar(Src)+1;
           SkipCurlyComment;
-          if FSkippingDirectives=lssdNone then break;
+          if (FSkippingDirectives=lssdNone) or (SrcPos>SrcLen) then break;
           p:=@Src[SrcPos];
         end;
       '/':
         if p[1]='/' then begin
           SrcPos:=p-PChar(Src)+1;
           SkipLineComment;
-          if FSkippingDirectives=lssdNone then break;
+          if (FSkippingDirectives=lssdNone) or (SrcPos>SrcLen) then break;
           p:=@Src[SrcPos];
         end else
           inc(p);
@@ -3549,7 +3549,7 @@ begin
         if p[1]='*' then begin
           SrcPos:=p-PChar(Src)+1;
           SkipRoundComment;
-          if FSkippingDirectives=lssdNone then break;
+          if (FSkippingDirectives=lssdNone) or (SrcPos>SrcLen) then break;
           p:=@Src[SrcPos];
         end else
           inc(p);