croc checks for error in file name

schollz · schollz · commit 7c3dc4453ae1 · 2024-06-26T06:58:12.000-07:00
diff --git a/src/croc/croc.go b/src/croc/croc.go
@@ -1210,8 +1210,9 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
 			return true, fmt.Errorf("invalid path detected: '%s'", fi.FolderRemote)
 		}
 		// Issue #595 - disallow filenames with invisible characters
-		if !utils.ValidFileName(path.Join(c.FilesToTransfer[i].FolderRemote, fi.Name)) {
-			return true, fmt.Errorf("invalid filename detected: '%s'", fi.Name)
+		errFileName := utils.ValidFileName(path.Join(c.FilesToTransfer[i].FolderRemote, fi.Name))
+		if errFileName != nil {
+			return true, errFileName
 		}
 	}
 	c.TotalNumberOfContents = 0

Original file line number	Diff line number	Diff line change
`@@ -1210,8 +1210,9 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error`
`1210`	`1210`	`return true, fmt.Errorf("invalid path detected: '%s'", fi.FolderRemote)`
`1211`	`1211`	`}`
`1212`	`1212`	`// Issue #595 - disallow filenames with invisible characters`
`1213`		`- if !utils.ValidFileName(path.Join(c.FilesToTransfer[i].FolderRemote, fi.Name)) {`
`1214`		`- return true, fmt.Errorf("invalid filename detected: '%s'", fi.Name)`
	`1213`	`+ errFileName := utils.ValidFileName(path.Join(c.FilesToTransfer[i].FolderRemote, fi.Name))`
	`1214`	`+ if errFileName != nil {`
	`1215`	`+ return true, errFileName`
`1215`	`1216`	`}`
`1216`	`1217`	`}`
`1217`	`1218`	`c.TotalNumberOfContents = 0`