From 1559a6d4bd75f699e370a9593c033a3ff6113309 Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Mon, 7 Sep 2009 04:55:32 +0000
Subject: [PATCH] Do not allow  text longer than 32,767 characters in HSSF
 cells, see Bugzilla 47751

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@811994 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/poi/hssf/usermodel/HSSFCell.java   |   5 +++
 .../org/apache/poi/ss/SpreadsheetVersion.java |  21 +++++++++---
 .../apache/poi/hssf/usermodel/TestBugs.java   |  17 +++++++++-
 .../poi/hssf/usermodel/TestHSSFCell.java      |  32 ++++++++++++++++++
 .../ss/usermodel/BaseTestBugzillaIssues.java  |  32 ------------------
 test-data/spreadsheet/46368.xls               | Bin 0 -> 73216 bytes
 6 files changed, 70 insertions(+), 37 deletions(-)
 create mode 100755 test-data/spreadsheet/46368.xls

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
index 29a46c5d34..999fa287dc 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
@@ -540,6 +540,11 @@ public class HSSFCell implements Cell {
             setCellType(CELL_TYPE_BLANK, false, row, col, styleIndex);
             return;
         }
+
+        if(hvalue.length() > SpreadsheetVersion.EXCEL97.getMaxTextLength()){
+            throw new IllegalArgumentException("The maximum length of cell contents (text) is 32,767 characters");
+        }
+
         if (_cellType == CELL_TYPE_FORMULA) {
             // Set the 'pre-evaluated result' for the formula
             // note - formulas do not preserve text formatting.
diff --git a/src/java/org/apache/poi/ss/SpreadsheetVersion.java b/src/java/org/apache/poi/ss/SpreadsheetVersion.java
index 316e5af06f..d4edaec53f 100755
--- a/src/java/org/apache/poi/ss/SpreadsheetVersion.java
+++ b/src/java/org/apache/poi/ss/SpreadsheetVersion.java
@@ -36,9 +36,11 @@ public enum SpreadsheetVersion {
 	 * <li>The total number of available rows is 64k (2^16)</li>
 	 * <li>The maximum number of arguments to a function is 30</li>
 	 * <li>Number of conditional format conditions on a cell is 3</li>
+     * <li>Length of text cell contents is unlimited </li>
+     * <li>Length of text cell contents is 32767</li>
 	 * </ul>
 	 */
-	EXCEL97(0x10000, 0x0100, 30, 3),
+	EXCEL97(0x10000, 0x0100, 30, 3, 32767),
 
 	/**
 	 * Excel2007
@@ -49,21 +51,24 @@ public enum SpreadsheetVersion {
 	 * <li>The maximum number of arguments to a function is 255</li>
 	 * <li>Number of conditional format conditions on a cell is unlimited
 	 * (actually limited by available memory in Excel)</li>
+     * <li>Length of text cell contents is unlimited </li>
 	 * <ul>
 	 */
-	EXCEL2007(0x100000, 0x4000, 255, Integer.MAX_VALUE);
+	EXCEL2007(0x100000, 0x4000, 255, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
 	private final int _maxRows;
 	private final int _maxColumns;
 	private final int _maxFunctionArgs;
 	private final int _maxCondFormats;
+    private final int _maxTextLength;
 
-	private SpreadsheetVersion(int maxRows, int maxColumns, int maxFunctionArgs, int maxCondFormats) {
+	private SpreadsheetVersion(int maxRows, int maxColumns, int maxFunctionArgs, int maxCondFormats, int maxText) {
 		_maxRows = maxRows;
 		_maxColumns = maxColumns;
 		_maxFunctionArgs = maxFunctionArgs;
 		_maxCondFormats = maxCondFormats;
-	}
+        _maxTextLength = maxText;
+    }
 
 	/**
 	 * @return the maximum number of usable rows in each spreadsheet
@@ -116,4 +121,12 @@ public enum SpreadsheetVersion {
 	public String getLastColumnName() {
 		return CellReference.convertNumToColString(getLastColumnIndex());
 	}
+
+    /**
+     * @return the maximum length of a text cell
+     */
+    public int getMaxTextLength() {
+        return _maxTextLength;
+    }
+
 }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 771dd838b7..e55dd2d05d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -38,7 +38,7 @@ import org.apache.poi.hssf.record.NameRecord;
 import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
 import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
-import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.util.TempFile;
 
 /**
@@ -1494,4 +1494,19 @@ public final class TestBugs extends BaseTestBugzillaIssues {
         assertEquals(893, wb.getNumberOfNames());
         assertEquals("Matthew\\Matthew11_1\\Matthew2331_1\\Matthew2351_1\\Matthew2361_1___lab", wb.getNameName(300));
     }
+
+    /**
+     * HSSFRichTextString.length() returns negative for really long strings.
+     * The test file was created in OpenOffice 3.0 as Excel does not allow cell text longer than 32,767 characters
+     */
+    public void test46368() {
+        HSSFWorkbook wb = openSample("46368.xls");
+    	HSSFSheet s = wb.getSheetAt(0);
+        HSSFCell cell1 = s.getRow(0).getCell(0);
+        assertEquals(32770, cell1.getStringCellValue().length());
+
+        HSSFCell cell2 = s.getRow(2).getCell(0);
+        assertEquals(32766, cell2.getStringCellValue().length());
+    }
+
 }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index fdad33fec2..540e71038d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
@@ -19,6 +19,7 @@ package org.apache.poi.hssf.usermodel;
 
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.io.FileOutputStream;
 
 import junit.framework.AssertionFailedError;
 
@@ -30,6 +31,8 @@ import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.record.StringRecord;
 import org.apache.poi.ss.usermodel.BaseTestCell;
 import org.apache.poi.ss.usermodel.ErrorConstants;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.SpreadsheetVersion;
 
 /**
  * Tests various functionality having to do with {@link HSSFCell}.  For instance support for
@@ -291,5 +294,34 @@ public final class TestHSSFCell extends BaseTestCell {
 		Record dbcr = recs[index++];
 		assertEquals(DBCellRecord.class, dbcr.getClass());
 	}
+
+    /**
+     *  The maximum length of cell contents (text) is 32,767 characters.
+     */
+    public void testMaxTextLength(){
+        HSSFSheet sheet = new HSSFWorkbook().createSheet();
+        HSSFCell cell = sheet.createRow(0).createCell(0);
+
+        int maxlen = SpreadsheetVersion.EXCEL97.getMaxTextLength();
+        assertEquals(32767, maxlen);
+
+        StringBuffer b = new StringBuffer() ;
+
+        // 32767 is okay
+        for( int i = 0 ; i < maxlen ; i++ )
+        {
+            b.append( "X" ) ;
+        }
+        cell.setCellValue(b.toString());
+
+        b.append("X");
+        // 32768 produces an invalid XLS file
+        try {
+            cell.setCellValue(b.toString());
+            fail("Expected exception");
+        } catch (IllegalArgumentException e){
+            assertEquals("The maximum length of cell contents (text) is 32,767 characters", e.getMessage());
+        }
+    }
 }
 
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index 7f8edf0406..b81be5b405 100755
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
@@ -218,38 +218,6 @@ public abstract class BaseTestBugzillaIssues extends TestCase {
         assertTrue("no errors parsing formula", true);
     }
 
-    /**
-     * HSSFRichTextString.length() returns negative for really
-     *  long strings
-     */
-    public void test46368() {
-        Workbook wb = getTestDataProvider().createWorkbook();
-    	Sheet s = wb.createSheet();
-    	Row r = s.createRow(0);
-    	for(int i=0; i<15; i++) {
-    		int len = 32760 + i;
-    		Cell c = r.createCell(i);
-
-    		StringBuffer sb = new StringBuffer();
-    		for(int j=0; j<len; j++) {
-    			sb.append("x");
-    		}
-    		RichTextString rtr = wb.getCreationHelper().createRichTextString(sb.toString());
-    		assertEquals(len, rtr.length());
-    		c.setCellValue(rtr);
-    	}
-
-    	// Save and reload
-    	wb = getTestDataProvider().writeOutAndReadBack(wb);
-    	s = wb.getSheetAt(0);
-    	r = s.getRow(0);
-    	for(int i=0; i<15; i++) {
-    		int len = 32760 + i;
-    		Cell c = r.getCell(i);
-    		assertEquals(len, c.getRichStringCellValue().length());
-    	}
-    }
-
     public void test18800() {
        Workbook book = getTestDataProvider().createWorkbook();
        book.createSheet("TEST");
diff --git a/test-data/spreadsheet/46368.xls b/test-data/spreadsheet/46368.xls
new file mode 100755
index 0000000000000000000000000000000000000000..d421e77de7f7c5c0ccf29726aa702156bca74cfd
GIT binary patch
literal 73216
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
b`TKAC;bQ+&QB2goe^X6Gzoj-lO#lA_`9Muo

literal 0
HcmV?d00001

-- 
2.39.5