mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-19 06:43:42 +00:00
fix: ByteFmt panic on negative int64 values (#1200)
This commit is contained in:
1 parent
3abf6ed933
commit
5515a1c48c
2 files changed
+30
-2
No files matched your search
+14
-1
@@ -5,14 +5,27 @@ import (
|
|||||||
"math"
|
"math"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const unknownSize = "unknown"
|
||||||
|
|
||||||
var unitArr = []string{"B", "KB", "MB", "GB", "TB", "PB", "EB"}
|
var unitArr = []string{"B", "KB", "MB", "GB", "TB", "PB", "EB"}
|
||||||
|
|
||||||
func ByteFmt(size int64) string {
|
func ByteFmt(size int64) string {
|
||||||
if size == 0 {
|
if size == 0 {
|
||||||
return "unknown"
|
return unknownSize
|
||||||
|
}
|
||||||
|
// Handle negative values
|
||||||
|
if size < 0 {
|
||||||
|
return unknownSize
|
||||||
}
|
}
|
||||||
fs := float64(size)
|
fs := float64(size)
|
||||||
p := int(math.Log(fs) / math.Log(1024))
|
p := int(math.Log(fs) / math.Log(1024))
|
||||||
|
// Ensure index is within bounds
|
||||||
|
if p < 0 {
|
||||||
|
p = 0
|
||||||
|
}
|
||||||
|
if p >= len(unitArr) {
|
||||||
|
p = len(unitArr) - 1
|
||||||
|
}
|
||||||
val := fs / math.Pow(1024, float64(p))
|
val := fs / math.Pow(1024, float64(p))
|
||||||
_, frac := math.Modf(val)
|
_, frac := math.Modf(val)
|
||||||
if frac > 0 {
|
if frac > 0 {
|
||||||
|
|||||||
@@ -14,7 +14,17 @@ func TestByteFmt(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "unknown",
|
name: "unknown",
|
||||||
args: args{size: int64(0)},
|
args: args{size: int64(0)},
|
||||||
want: "unknown",
|
want: unknownSize,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "negative value",
|
||||||
|
args: args{size: int64(-1)},
|
||||||
|
want: unknownSize,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "negative min int64",
|
||||||
|
args: args{size: int64(-9223372036854775808)},
|
||||||
|
want: unknownSize,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "100B",
|
name: "100B",
|
||||||
@@ -51,6 +61,11 @@ func TestByteFmt(t *testing.T) {
|
|||||||
args: args{size: int64(1024 * 1024 * 2)},
|
args: args{size: int64(1024 * 1024 * 2)},
|
||||||
want: "2MB",
|
want: "2MB",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "large value",
|
||||||
|
args: args{size: int64(9223372036854775807)}, // max int64
|
||||||
|
want: "8EB",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
|||||||
Reference in new issue
Block a user