--- Merging r48282 into '.':

U    packages/fcl-base/src/bufstream.pp
A    tests/webtbs/tw38351.pp
--- Recording mergeinfo for merge of r48282 into '.':
 U   .

# revisions: 48282
r48282 | florian | 2021-01-21 22:08:13 +0100 (Thu, 21 Jan 2021) | 1 line
Changed paths:
   M /trunk/packages/fcl-base/src/bufstream.pp
   A /trunk/tests/webtbs/tw38351.pp

  * fix TBufferedFileStream.Seek(0,soBeginning) as proposed by Andrey Zubarev, resolves #38351


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49111 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 34 insertions, 1 deletions

diff --git a/packages/fcl-base/src/bufstream.pp b/packages/fcl-base/src/bufstream.pp
index 81ae8d377a..2517542e97 100644
--- a/packages/fcl-base/src/bufstream.pp
+++ b/packages/fcl-base/src/bufstream.pp
@@ -812,7 +812,7 @@ begin
         lNewOffset:=FCacheStreamPosition+Offset;
       end;
   end;
-  if lNewOffset>0 then begin
+  if lNewOffset>=0 then begin
     FCacheStreamPosition:=lNewOffset;
     Result:=lNewOffset;
   end else begin
diff --git a/tests/webtbs/tw38351.pp b/tests/webtbs/tw38351.pp
new file mode 100644
index 0000000000..d76d639b4c
--- /dev/null
+++ b/tests/webtbs/tw38351.pp
@@ -0,0 +1,33 @@
+{$MODE OBJFPC}

+{$APPTYPE CONSOLE}

+

+uses Classes, BufStream, Sysutils;

+

+procedure TestBufferedFileStream;

+var

+  F: TStream;

+  pf: File;

+begin

+  Assign(pf,'tw38351.tmp');

+  Rewrite(pf,1);

+  Seek(pf,100);

+  Close(pf);

+  F := TBufferedFileStream.Create('tw38351.tmp', fmOpenRead);

+  try

+    Writeln(F.Position);

+    if F.Position<>0 then

+      halt(1);

+    Writeln(F.Seek(0, soBeginning)); // TFileStream = 0, TBufferedFileStream = -1

+    Writeln(F.Position);

+    if F.Position<>0 then

+      halt(1);

+  finally

+    F.Free;

+    DeleteFile('tw38351.tmp');

+  end;

+end;

+

+begin

+  TestBufferedFileStream;

+  writeln('ok');

+end.