diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-22 09:49:47 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-22 09:49:47 +0000 |
| commit | bc2059720e537a8895a3fa1a291974372c1fb471 (patch) | |
| tree | 35eb84f730f696ace2963c76f827aad4f8fbfca3 | |
| parent | 37e64ce170ecf9ba382e00b2a29dc5f367777e53 (diff) | |
| download | fpc-bc2059720e537a8895a3fa1a291974372c1fb471.tar.gz | |
--- Merging r49219 into '.':
U packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r49219 into '.':
U .
# revisions: 49219
r49219 | marco | 2021-04-17 16:30:42 +0200 (Sat, 17 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-base/src/streamex.pp
* Apply fix from bug #0038734 from Andrea Mauri to update vpbyte after fillbuffer in a loop. The second instance of fillbuffer is safe, because it is at the procedure exit, and vpbyte is a local variable.
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49243 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fcl-base/src/streamex.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/fcl-base/src/streamex.pp b/packages/fcl-base/src/streamex.pp index 92684d57b5..a15db45e91 100644 --- a/packages/fcl-base/src/streamex.pp +++ b/packages/fcl-base/src/streamex.pp @@ -432,6 +432,7 @@ begin Move(FBuffer[VPosition], AString[Succ(VStrLength)], VLength); end; FillBuffer; + VPByte := @FBuffer[FBufferPosition]; VPosition := FBufferPosition; end; until (FBufferPosition = FBufferRead) or (VPByte^ in [10, 13]); |