Fixed Mantis #6634: Access violation in JvJCLUtils: GetWordOnPos2

project-jedi · Oct 2, 2018 · dfd5ee6 · dfd5ee6
1 parent 610f9d9
commit dfd5ee6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/jvcl/run/JvJCLUtils.pas b/jvcl/run/JvJCLUtils.pas
@@ -1465,7 +1465,7 @@ function GetWordOnPosW(const S: WideString; const P: Integer): WideString;
 function GetWordOnPos2(const S: string; P: Integer; var iBeg, iEnd: Integer): string;
 begin
   Result := '';
-  if P < 1 then
+  if (P > Length(S)) or (P < 1) then
     Exit;
   if CharInSet(S[P], Separators) and ((P < 1) or CharInSet(S[P - 1], Separators)) then
     Inc(P);
@@ -1491,7 +1491,7 @@ function GetWordOnPos2(const S: string; P: Integer; var iBeg, iEnd: Integer): st
 function GetWordOnPos2W(const S: WideString; P: Integer; var iBeg, iEnd: Integer): WideString;
 begin
   Result := '';
-  if P < 1 then
+  if (P > Length(S)) or (P < 1) then
     Exit;
   if CharInSetW(S[P], Separators) and
     ((P < 1) or (CharInSetW(S[P - 1], Separators))) then