Skip to content

Commit

Permalink
This closes qax-os#677 and closes qax-os#679, fix panic when enabling…
Browse files Browse the repository at this point in the history
… compiler inline flags
  • Loading branch information
xuri committed Aug 6, 2020
1 parent fcbc7e3 commit 843bd24
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
11 changes: 2 additions & 9 deletions lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"io"
"strconv"
"strings"
"unsafe"
)

// ReadZipReader can be used to read the spreadsheet in memory without touching the
Expand Down Expand Up @@ -251,17 +250,11 @@ func namespaceStrictToTransitional(content []byte) []byte {
StrictNameSpaceSpreadSheet: NameSpaceSpreadSheet.Value,
}
for s, n := range namespaceTranslationDic {
content = bytesReplace(content, stringToBytes(s), stringToBytes(n), -1)
content = bytesReplace(content, []byte(s), []byte(n), -1)
}
return content
}

// stringToBytes cast a string to bytes pointer and assign the value of this
// pointer.
func stringToBytes(s string) []byte {
return *(*[]byte)(unsafe.Pointer(&s))
}

// bytesReplace replace old bytes with given new.
func bytesReplace(s, old, new []byte, n int) []byte {
if n == 0 {
Expand Down Expand Up @@ -366,7 +359,7 @@ func getXMLNamespace(space string, attr []xml.Attr) string {
// replaceNameSpaceBytes provides a function to replace the XML root element
// attribute by the given component part path and XML content.
func (f *File) replaceNameSpaceBytes(path string, contentMarshal []byte) []byte {
var oldXmlns = stringToBytes(`xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">`)
var oldXmlns = []byte(`xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">`)
var newXmlns = []byte(templateNamespaceIDMap)
if attr, ok := f.xmlAttr[path]; ok {
newXmlns = []byte(genXMLNamespace(attr))
Expand Down
4 changes: 2 additions & 2 deletions sheet.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ func (f *File) setAppXML() {
// strict requirements about the structure of the input XML. This function is
// a horrible hack to fix that after the XML marshalling is completed.
func replaceRelationshipsBytes(content []byte) []byte {
oldXmlns := stringToBytes(`xmlns:relationships="http://schemas.openxmlformats.org/officeDocument/2006/relationships" relationships`)
newXmlns := stringToBytes("r")
oldXmlns := []byte(`xmlns:relationships="http://schemas.openxmlformats.org/officeDocument/2006/relationships" relationships`)
newXmlns := []byte("r")
return bytesReplace(content, oldXmlns, newXmlns, -1)
}

Expand Down
2 changes: 1 addition & 1 deletion stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ func writeCell(buf *bufferedWriter, c xlsxC) {
buf.WriteString(`>`)
if c.V != "" {
buf.WriteString(`<v>`)
xml.EscapeText(buf, stringToBytes(c.V))
xml.EscapeText(buf, []byte(c.V))
buf.WriteString(`</v>`)
}
buf.WriteString(`</c>`)
Expand Down

0 comments on commit 843bd24

Please sign in to comment.