*(home): fix small filters update

 Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1554
This commit is contained in:
Andrey Meshkov
2020-04-07 23:29:03 +03:00
parent ea38612a1d
commit 2f9bc13ffd
2 changed files with 29 additions and 10 deletions

View File

@@ -24,12 +24,6 @@ var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf
@@ -447,8 +441,9 @@ func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) {
}
// Allows printable UTF-8 text with CR, LF, TAB characters
func isPrintableText(data []byte) bool {
for _, c := range data {
func isPrintableText(data []byte, len int) bool {
for i := 0; i < len; i++ {
c := data[i]
if (c >= ' ' && c != 0x7f) || c == '\n' || c == '\r' || c == '\t' {
continue
}
@@ -549,7 +544,7 @@ func (f *Filtering) updateIntl(filter *filter) (bool, error) {
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
if !isPrintableText(firstChunk, firstChunkLen) {
return false, fmt.Errorf("data contains non-printable characters")
}