From 73c64196569e955b3cb8c3783c7cea828dd7b315 Mon Sep 17 00:00:00 2001 From: Joshy Date: Tue, 19 Jan 2010 16:53:49 +0000 Subject: [PATCH] Fixed read beyond Worksheet count, resolves Mantis #15546 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1127 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/xlsbiff8.pas | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/fpspreadsheet/xlsbiff8.pas b/components/fpspreadsheet/xlsbiff8.pas index 6ff20ef26..f56079f9f 100755 --- a/components/fpspreadsheet/xlsbiff8.pas +++ b/components/fpspreadsheet/xlsbiff8.pas @@ -1271,6 +1271,9 @@ begin while (not BIFF8EOF) do begin + //Safe to not read beyond assigned worksheet names. + if FCurrentWorksheet>FWorksheetNames.Count-1 then break; + ReadWorksheet(AStream, AData); // Check for the end of the file