mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-23 08:16:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3052 from restic/error-on-invalid-size

Browse source 
Return an error for invalid sizes
This commit is contained in:
Alexander Neumann 2020-11-03 12:13:49 +01:00 committed by GitHub
commit 0db9024aad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/restic/exclude.go
View file

@ -314,6 +314,10 @@ func rejectBySize(maxSizeStr string) (RejectFunc, error) {
}
func parseSizeStr(sizeStr string) (int64, error) {
if sizeStr == "" {
return 0, errors.New("expected size, got empty string")
}
numStr := sizeStr[:len(sizeStr)-1]
var unit int64 = 1
@ -333,7 +337,7 @@ func parseSizeStr(sizeStr string) (int64, error) {
}
value, err := strconv.ParseInt(numStr, 10, 64)
if err != nil {
return 0, nil
return 0, err
}
return value * unit, nil
}

19
cmd/restic/exclude_test.go
View file

@ -219,6 +219,25 @@ func TestParseSizeStr(t *testing.T) {
}
}
func TestParseInvalidSizeStr(t *testing.T) {
invalidSizes := []string{
"",
" ",
"foobar",
"zzz",
}
for _, s := range invalidSizes {
v, err := parseSizeStr(s)
if err == nil {
t.Errorf("wanted error for invalid value %q, got nil", s)
}
if v != 0 {
t.Errorf("wanted zero for invalid value %q, got: %v", s, v)
}
}
}
// TestIsExcludedByFileSize is for testing the instance of
// --exclude-larger-than parameters
func TestIsExcludedByFileSize(t *testing.T) {