_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

notmuch: ignore comments and blank lines when processing query-map file 

A segmentation fault occurs when using the notmuch backend and a `query-map`
file that contains blank lines or comments.
This commit is contained in:
Matt Snider 2019-10-27 13:54:22 +00:00 committed by Drew DeVault
parent 310bec2702
commit cd39e8f90c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worker/notmuch/worker.go
View File

@ -387,6 +387,10 @@ func (w *worker) loadQueryMap(acctConfig *config.AccountConfig) error {
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
if line == "" || line[0] == '#' {
continue
}
split := strings.SplitN(line, "=", 2) split := strings.SplitN(line, "=", 2)
if len(split) != 2 { if len(split) != 2 {
return fmt.Errorf("invalid line %q, want name=query", line) return fmt.Errorf("invalid line %q, want name=query", line)