From 8c2aa326833e7f287a2059547cfd7fa5af59c130 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Wed, 11 Dec 2019 17:14:27 +0000
Subject: [PATCH]   * Remove duplicate ibextraheader handling.   * Move
 SymAnsiStr boolean setting inside parseextraheader function.   * Only accept
 same CurrentPPULongVersion in parseextraheader function.

git-svn-id: trunk@43672 -
---
 compiler/utils/ppuutils/ppudump.pp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
index 50005c68a9..d466336e87 100644
--- a/compiler/utils/ppuutils/ppudump.pp
+++ b/compiler/utils/ppuutils/ppudump.pp
@@ -4709,15 +4709,6 @@ begin
        b:=readentry;
        case b of
 
-         ibextraheader:
-           begin
-             CurUnit.LongVersion:=cardinal(getlongint);
-             Writeln(['LongVersion: ',CurUnit.LongVersion]);
-             getset(tppuset4(CurUnit.ModuleFlags));
-             if mf_symansistr in CurUnit.ModuleFlags then
-               SymAnsiStr:=true;
-           end;
-
          ibmodulename :
            begin
              CurUnit.Name:=getstring;
@@ -4908,7 +4899,9 @@ begin
   CurUnit.LongVersion:=cardinal(ppufile.getlongint);
   Writeln(['LongVersion: ',CurUnit.LongVersion]);
   ppufile.getset(tppuset4(CurUnit.ModuleFlags));
-  result:=ppufile.EndOfEntry;
+  result:=ppufile.EndOfEntry and (CurUnit.LongVersion=CurrentPPULongVersion);
+  if mf_symansistr in CurUnit.ModuleFlags then
+    SymAnsiStr:=true;
 end;
 
 procedure dofile (filename : string);