Changeset 325

Timestamp:

Aug 16, 2008, 6:07:02 PM (17 years ago)

Author:

RBRi

Message:

#37 fixed

File:

• branches/2.19_branch/NewView/HelpFile.pas (modified) (3 diffs)

branches/2.19_branch/NewView/HelpFile.pas

@@ -373 +373 @@
   pEntry: pTTOCEntryStart;
   pEnd: pTTOCEntryStart;
+  tmpSizeAsLongword : longword;
 begin
   LogEvent(LogParse, 'Read contents');
 
   if _pHeader^.ntoc = 0 then
+  begin
     exit; // explicit check required since ntoc is unsigned
+  end;
 
   // Presize the topics list to save reallocation time
   _Topics.Capacity := _pHeader^.ntoc;
+
+  // this has to be used because we multiply a longword with
+  // this; otherwise the compiler generates code that
+  // calculates the wrong value
+  tmpSizeAsLongword := sizeof(uint32);
 
   // read slots first so that Topics can refer to it.
   ReadFileBlock( _pSlotOffsets,
                  _pHeader^.slotsstart,
-                 _pHeader^.nslots * sizeof( uint32 ) );
+                 _pHeader^.nslots *  tmpSizeAsLongword);
 
   ReadFileBlock( _pContentsData,
@@ -496 +504 @@
   begin
     if p >= pEnd then
+    begin
       // ran off end of data
       raise EHelpFileException.Create( ErrorCorruptHelpFile );
+    end;
 
     pEntryHeader := p;
@@ -505 +515 @@
     GetMemString( p, EntryText, IndexTitleLen );
     if ( pEntryHeader^.flags and 2 ) > 0 then
+    begin
       EntryText := '- ' + EntryText;
+    end;
     if pEntryHeader^.TOCIndex < _Topics.Count then
       _Index.AddObject( EntryText, _Topics[ pEntryHeader^.TOCIndex ] )