Fix bug #51832 - handle XLS files where the WRITEPROTECT record preceeds the FILEPASS one, rather than following as normal

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1172575 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 0 deletions

diff --git a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
index 479169a5c2..344ad07ef3 100644
--- a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
+++ b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
@@ -57,11 +57,26 @@ public final class RecordFactoryInputStream {
 			FilePassRecord fpr = null;
 			if (rec instanceof BOFRecord) {
 				_hasBOFRecord = true;
+				
+				// Fetch the next record, and see if it indicates whether
+				//  the document is encrypted or not
 				if (rs.hasNextRecord()) {
 					rs.nextRecord();
 					rec = RecordFactory.createSingleRecord(rs);
 					recSize += rec.getRecordSize();
 					outputRecs.add(rec);
+					
+					// Encrypted is normally BOF then FILEPASS
+					// May sometimes be BOF, WRITEPROTECT, FILEPASS
+					if (rec instanceof WriteProtectRecord && rs.hasNextRecord()) {
+	               rs.nextRecord();
+	               rec = RecordFactory.createSingleRecord(rs);
+	               recSize += rec.getRecordSize();
+	               outputRecs.add(rec);
+					}
+					
+					// If it's a FILEPASS, track it specifically but
+					//  don't include it in the main stream
 					if (rec instanceof FilePassRecord) {
 						fpr = (FilePassRecord) rec;
 						outputRecs.remove(outputRecs.size()-1);