Merge pull request #349 from jqnatividad/formula_empty_string_value

Formula empty string value handling
tafia · Sep 4, 2023 · c860397 · c860397
2 parents a54bd9c + 18b332e
commit c860397
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/xls.rs b/src/xls.rs
@@ -1314,9 +1314,12 @@ fn parse_formula(
 /// FormulaValue [MS-XLS 2.5.133]
 fn parse_formula_value(r: &[u8]) -> Result<Option<DataType>, XlsError> {
     match *r {
-        [0x00, .., 0xFF, 0xFF] => Ok(None), // String, value should be in next record
+        // String, value should be in next record
+        [0x00, .., 0xFF, 0xFF] => Ok(None),
         [0x01, _, b, .., 0xFF, 0xFF] => Ok(Some(DataType::Bool(b != 0))),
         [0x02, _, e, .., 0xFF, 0xFF] => parse_err(e).map(Some),
+        // ignore, return blank string value
+        [0x03, _, .., 0xFF, 0xFF] => Ok(Some(DataType::String("".to_string()))),
         [e, .., 0xFF, 0xFF] => Err(XlsError::Unrecognized {
             typ: "error",
             val: e,

diff --git a/tests/issue343.xls b/tests/issue343.xls
diff --git a/tests/test.rs b/tests/test.rs
@@ -1288,6 +1288,16 @@ fn issue281_vba() {
     );
 }
 
+#[test]
+fn issue343() {
+    setup();
+
+    let path = format!("{}/tests/issue343.xls", env!("CARGO_MANIFEST_DIR"));
+
+    // should not panic
+    let _: Xls<_> = open_workbook(&path).unwrap();
+}
+
 #[test]
 fn any_sheets_xlsx() {
     setup();