Skip to content

Commit 864c4c3

Browse files
mercataemersion
authored andcommitted
imapserver: don't swallow errors in readSearchKeyWithAtom()
1 parent 9139e6b commit 864c4c3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

imapserver/search.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func readSearchKeyWithAtom(criteria *imap.SearchCriteria, dec *imapwire.Decoder,
308308
}
309309
var not imap.SearchCriteria
310310
if err := readSearchKey(&not, dec); err != nil {
311-
return nil
311+
return err
312312
}
313313
criteria.Not = append(criteria.Not, not)
314314
case "OR":
@@ -317,13 +317,13 @@ func readSearchKeyWithAtom(criteria *imap.SearchCriteria, dec *imapwire.Decoder,
317317
}
318318
var or [2]imap.SearchCriteria
319319
if err := readSearchKey(&or[0], dec); err != nil {
320-
return nil
320+
return err
321321
}
322322
if !dec.ExpectSP() {
323323
return dec.Err()
324324
}
325325
if err := readSearchKey(&or[1], dec); err != nil {
326-
return nil
326+
return err
327327
}
328328
criteria.Or = append(criteria.Or, or)
329329
case "$":

0 commit comments

Comments
 (0)