From c3d1d7ddddd02d9d8d39204dd891250222bb9ee4 Mon Sep 17 00:00:00 2001
From: xuri <xuri.me@gmail.com>
Date: Sat, 28 Aug 2021 09:23:44 +0800
Subject: Preserve XML control character in bstrUnmarshal result

---
 lib.go | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'lib.go')

diff --git a/lib.go b/lib.go
index 424d3f9..31b64a5 100644
--- a/lib.go
+++ b/lib.go
@@ -21,7 +21,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode"
 )
 
 // ReadZipReader can be used to read the spreadsheet in memory without touching the
@@ -588,10 +587,6 @@ func bstrUnmarshal(s string) (result string) {
 		subStr := s[match[0]:match[1]]
 		if subStr == "_x005F_" {
 			cursor = match[1]
-			if l > match[1]+6 && !bstrEscapeExp.MatchString(s[match[1]:match[1]+6]) {
-				result += subStr
-				continue
-			}
 			result += "_"
 			continue
 		}
@@ -607,15 +602,7 @@ func bstrUnmarshal(s string) (result string) {
 				result += subStr
 				continue
 			}
-			hasRune := false
-			for _, c := range v {
-				if unicode.IsControl(c) {
-					hasRune = true
-				}
-			}
-			if !hasRune {
-				result += v
-			}
+			result += v
 		}
 	}
 	if cursor < l {
-- 
cgit v1.2.1