From 1bd802adb6fdaf176d43b0e73fa4e8dc47277bc8 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 19 Mar 2021 10:22:03 +0000 Subject: --- Merging r48982 into '.': U packages/fcl-process/src/processbody.inc --- Recording mergeinfo for merge of r48982 into '.': U . # revisions: 48982 r48982 | marco | 2021-03-15 16:58:05 +0100 (Mon, 15 Mar 2021) | 1 line Changed paths: M /trunk/packages/fcl-process/src/processbody.inc * buffer overflow in ReadInputStream if a stream read> READ_BYTES (=64k) large. The overloaded tstream one is ok. git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49007 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/fcl-process/src/processbody.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fcl-process/src/processbody.inc b/packages/fcl-process/src/processbody.inc index d07a2839a7..7737162a64 100644 --- a/packages/fcl-process/src/processbody.inc +++ b/packages/fcl-process/src/processbody.inc @@ -492,7 +492,7 @@ begin begin if (BytesRead + available > DataLength) then begin - DataLength:=BytesRead + READ_BYTES; + DataLength:=BytesRead + max(READ_BYTES,available); Setlength(Data,DataLength); end; NumBytes := p.Read(data[1+BytesRead], Available); -- cgit v1.2.1