Fix array size allocate overflow

xuri · xuri · commit 39c2d7bed7e3 · 2025-02-24T11:12:27.000+08:00
- Upgrade the dependencies package version
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/xuri/excelize-py
 go 1.20
 
 require (
-	github.com/xuri/excelize/v2 v2.9.1-0.20250208014036-718417e15ed6
+	github.com/xuri/excelize/v2 v2.9.1-0.20250219061259-52642854413f
 	golang.org/x/image v0.24.0
 )
 
diff --git a/go.sum b/go.sum
@@ -10,8 +10,8 @@ github.com/tiendc/go-deepcopy v1.5.0 h1:TbtS9hclrKZcF1AHby8evDm4mIQU36i6tSYuvx/T
 github.com/tiendc/go-deepcopy v1.5.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
 github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6 h1:8m6DWBG+dlFNbx5ynvrE7NgI+Y7OlZVMVTpayoW+rCc=
 github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.9.1-0.20250208014036-718417e15ed6 h1:fT911cTvmhbFNfEhUjz5hY0tcXEedJyx1HkwhOQcm3s=
-github.com/xuri/excelize/v2 v2.9.1-0.20250208014036-718417e15ed6/go.mod h1:QPDLfWgowGnzIqBhd8g4iNoymgms2UL7Ok/Qm/NSPsg=
+github.com/xuri/excelize/v2 v2.9.1-0.20250219061259-52642854413f h1:6r2z3li0dWKGsis3HqEsZnEb/FKq/AE88eBwV4zMkog=
+github.com/xuri/excelize/v2 v2.9.1-0.20250219061259-52642854413f/go.mod h1:pLb4VqhRJ56LzWGi1Oa30+VQ4Jbmn8kbPLfiwAvBuCA=
 github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71 h1:hOh7aVDrvGJRxzXrQbDY8E+02oaI//5cHL+97oYpEPw=
 github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
diff --git a/main.go b/main.go
@@ -1071,13 +1071,12 @@ func GetCellRichText(idx int, sheet, cell *C.char) C.struct_GetCellRichTextResul
 		return C.struct_GetCellRichTextResult{Err: C.CString(err.Error())}
 	}
 	cArray := C.malloc(C.size_t(len(runs)) * C.size_t(unsafe.Sizeof(C.struct_RichTextRun{})))
-	cStructArray := (*[1 << 30]C.struct_RichTextRun)(cArray)[:len(runs):len(runs)]
 	for i, r := range runs {
 		cVal, err := goValueToC(reflect.ValueOf(r), reflect.ValueOf(&C.struct_RichTextRun{}))
 		if err != nil {
 			return C.struct_GetCellRichTextResult{Err: C.CString(err.Error())}
 		}
-		cStructArray[i] = cVal.Elem().Interface().(C.struct_RichTextRun)
+		*(*C.struct_RichTextRun)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(C.struct_RichTextRun{}))) = cVal.Elem().Interface().(C.struct_RichTextRun)
 	}
 	return C.struct_GetCellRichTextResult{RunsLen: C.int(len(runs)), Runs: (*C.struct_RichTextRun)(cArray), Err: C.CString(emptyString)}
 }
@@ -1332,13 +1331,12 @@ func GetTables(idx int, sheet *C.char) C.struct_GetTablesResult {
 		return C.struct_GetTablesResult{Err: C.CString(err.Error())}
 	}
 	cArray := C.malloc(C.size_t(len(tables)) * C.size_t(unsafe.Sizeof(C.struct_Table{})))
-	cStructArray := (*[1 << 30]C.struct_Table)(cArray)[:len(tables):len(tables)]
 	for i, t := range tables {
 		cVal, err := goValueToC(reflect.ValueOf(t), reflect.ValueOf(&C.struct_Table{}))
 		if err != nil {
 			return C.struct_GetTablesResult{Err: C.CString(err.Error())}
 		}
-		cStructArray[i] = cVal.Elem().Interface().(C.struct_Table)
+		*(*C.struct_Table)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(C.struct_Table{}))) = cVal.Elem().Interface().(C.struct_Table)
 	}
 	return C.struct_GetTablesResult{TablesLen: C.int(len(tables)), Tables: (*C.struct_Table)(cArray), Err: C.CString(emptyString)}
 }
@@ -1915,9 +1913,8 @@ func SearchSheet(idx int, sheet, value *C.char, reg bool) C.struct_StringArrayEr
 		return C.struct_StringArrayErrorResult{Err: C.CString(err.Error())}
 	}
 	cArray := C.malloc(C.size_t(len(result)) * C.size_t(unsafe.Sizeof(uintptr(0))))
-	cArrayPtr := (*[1 << 30]*C.char)(cArray)
 	for i, v := range result {
-		cArrayPtr[i] = C.CString(v)
+		*(*unsafe.Pointer)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(uintptr(0)))) = unsafe.Pointer(C.CString(v))
 	}
 	return C.struct_StringArrayErrorResult{ArrLen: C.int(len(result)), Arr: (**C.char)(cArray), Err: C.CString(emptyString)}
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/xuri/excelize-py`
`3`	`3`	`go 1.20`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/xuri/excelize/v2 v2.9.1-0.20250208014036-718417e15ed6`
	`6`	`+ github.com/xuri/excelize/v2 v2.9.1-0.20250219061259-52642854413f`
`7`	`7`	`golang.org/x/image v0.24.0`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1071,13 +1071,12 @@ func GetCellRichText(idx int, sheet, cell *C.char) C.struct_GetCellRichTextResul`
`1071`	`1071`	`return C.struct_GetCellRichTextResult{Err: C.CString(err.Error())}`
`1072`	`1072`	`}`
`1073`	`1073`	`cArray := C.malloc(C.size_t(len(runs)) * C.size_t(unsafe.Sizeof(C.struct_RichTextRun{})))`
`1074`		`- cStructArray := (*[1 << 30]C.struct_RichTextRun)(cArray)[:len(runs):len(runs)]`
`1075`	`1074`	`for i, r := range runs {`
`1076`	`1075`	`cVal, err := goValueToC(reflect.ValueOf(r), reflect.ValueOf(&C.struct_RichTextRun{}))`
`1077`	`1076`	`if err != nil {`
`1078`	`1077`	`return C.struct_GetCellRichTextResult{Err: C.CString(err.Error())}`
`1079`	`1078`	`}`
`1080`		`- cStructArray[i] = cVal.Elem().Interface().(C.struct_RichTextRun)`
	`1079`	`+ (C.struct_RichTextRun)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(C.struct_RichTextRun{}))) = cVal.Elem().Interface().(C.struct_RichTextRun)`
`1081`	`1080`	`}`
`1082`	`1081`	`return C.struct_GetCellRichTextResult{RunsLen: C.int(len(runs)), Runs: (*C.struct_RichTextRun)(cArray), Err: C.CString(emptyString)}`
`1083`	`1082`	`}`
`@@ -1332,13 +1331,12 @@ func GetTables(idx int, sheet *C.char) C.struct_GetTablesResult {`
`1332`	`1331`	`return C.struct_GetTablesResult{Err: C.CString(err.Error())}`
`1333`	`1332`	`}`
`1334`	`1333`	`cArray := C.malloc(C.size_t(len(tables)) * C.size_t(unsafe.Sizeof(C.struct_Table{})))`
`1335`		`- cStructArray := (*[1 << 30]C.struct_Table)(cArray)[:len(tables):len(tables)]`
`1336`	`1334`	`for i, t := range tables {`
`1337`	`1335`	`cVal, err := goValueToC(reflect.ValueOf(t), reflect.ValueOf(&C.struct_Table{}))`
`1338`	`1336`	`if err != nil {`
`1339`	`1337`	`return C.struct_GetTablesResult{Err: C.CString(err.Error())}`
`1340`	`1338`	`}`
`1341`		`- cStructArray[i] = cVal.Elem().Interface().(C.struct_Table)`
	`1339`	`+ (C.struct_Table)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(C.struct_Table{}))) = cVal.Elem().Interface().(C.struct_Table)`
`1342`	`1340`	`}`
`1343`	`1341`	`return C.struct_GetTablesResult{TablesLen: C.int(len(tables)), Tables: (*C.struct_Table)(cArray), Err: C.CString(emptyString)}`
`1344`	`1342`	`}`
`@@ -1915,9 +1913,8 @@ func SearchSheet(idx int, sheet, value *C.char, reg bool) C.struct_StringArrayEr`
`1915`	`1913`	`return C.struct_StringArrayErrorResult{Err: C.CString(err.Error())}`
`1916`	`1914`	`}`
`1917`	`1915`	`cArray := C.malloc(C.size_t(len(result)) * C.size_t(unsafe.Sizeof(uintptr(0))))`
`1918`		`- cArrayPtr := ([1 << 30]C.char)(cArray)`
`1919`	`1916`	`for i, v := range result {`
`1920`		`- cArrayPtr[i] = C.CString(v)`
	`1917`	`+ (unsafe.Pointer)(unsafe.Pointer(uintptr(unsafe.Pointer(cArray)) + uintptr(i)*unsafe.Sizeof(uintptr(0)))) = unsafe.Pointer(C.CString(v))`
`1921`	`1918`	`}`
`1922`	`1919`	`return C.struct_StringArrayErrorResult{ArrLen: C.int(len(result)), Arr: (**C.char)(cArray), Err: C.CString(emptyString)}`
`1923`	`1920`	`}`