mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Terminal - crash

Browse source
This commit is contained in:
Alexander Koblov 2022-01-23 14:08:38 +03:00
commit ad8ee310b7
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/virtualterminal/source/vtemuctl.pas
View file

@ -514,19 +514,23 @@ var
DstAddr: Pointer;
SrcAddr: Pointer;
BytesToMove: Integer;
Top, Bottom, Height: Integer;
Top, Bottom: Integer;
begin
Top:= FScrollRange.Top;
Bottom:= FScrollRange.Bottom;
Height:= FScrollRange.Height + 1;
if Count > Height then Count:= Height;
DstAddr := (FBuffer + (Row - 1) * FColumns * SizeOf(TComTermChar));
SrcAddr := (FBuffer + (Row + Count - 1) * FColumns * SizeOf(TComTermChar));
BytesToMove := (Bottom - Top - Count + 1) * FColumns * SizeOf(TComTermChar);
if (Row < Top) or (Row > Bottom) then Exit;
if (Row - 1) + Count > Bottom then Count:= Bottom - Row + 1;
// scroll in buffer
Move(SrcAddr^, DstAddr^, BytesToMove);
if Row < Bottom then
begin
DstAddr := (FBuffer + (Row - 1) * FColumns * SizeOf(TComTermChar));
SrcAddr := (FBuffer + (Row + Count - 1) * FColumns * SizeOf(TComTermChar));
BytesToMove := (Bottom - Row - Count + 1) * FColumns * SizeOf(TComTermChar);
// scroll in buffer
Move(SrcAddr^, DstAddr^, BytesToMove);
end;
B:= PComTermChar(FBuffer) + ((Bottom - Count) * FColumns);
for Index:= 0 to Count * FColumns - 1 do
@ -550,19 +554,23 @@ var
DstAddr: Pointer;
SrcAddr: Pointer;
BytesToMove: Integer;
Top, Bottom, Height: Integer;
Top, Bottom: Integer;
begin
Top:= FScrollRange.Top;
Bottom:= FScrollRange.Bottom;
Height:= FScrollRange.Height + 1;
if Count > Height then Count:= Height;
SrcAddr := (FBuffer + (Row - 1) * FColumns * SizeOf(TComTermChar));
DstAddr := (FBuffer + (Row + Count - 1) * FColumns * SizeOf(TComTermChar));
BytesToMove := (Bottom - Top - Count + 1) * FColumns * SizeOf(TComTermChar);
if (Row < Top) or (Row > Bottom) then Exit;
if (Row - 1) + Count > Bottom then Count:= Bottom - Row + 1;
// scroll in buffer
Move(SrcAddr^, DstAddr^, BytesToMove);
if Row < Bottom then
begin
SrcAddr := (FBuffer + (Row - 1) * FColumns * SizeOf(TComTermChar));
DstAddr := (FBuffer + (Row + Count - 1) * FColumns * SizeOf(TComTermChar));
BytesToMove := (Bottom - Row - Count + 1) * FColumns * SizeOf(TComTermChar);
// scroll in buffer
Move(SrcAddr^, DstAddr^, BytesToMove);
end;
B:= PComTermChar(FBuffer) + ((Row - 1) * FColumns);
for Index:= 0 to Count * FColumns - 1 do