From fad5d3e2eb7aeb782858ddacca7244854cf32167 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Mon, 20 Jun 2016 07:22:24 +0000
Subject: [PATCH] nntp: use lookup_mail instead of lookup_message
lookup_mail is safer since it won't inadvertently load ghosts.
---
lib/PublicInbox/NNTP.pm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 93f654f6..4b116a7d 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -711,8 +711,7 @@ sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin
sub search_header_for {
my ($srch, $mid, $field) = @_;
- my $smsg = $srch->lookup_message($mid) or return;
- $smsg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
+ my $smsg = $srch->lookup_mail($mid) or return;
$smsg->$field;
}
@@ -847,10 +846,9 @@ sub cmd_over ($;$) {
my ($self, $range) = @_;
if ($range && $range =~ /\A<(.+)>\z/) {
my ($ng, $n) = mid_lookup($self, $1);
- my $smsg = $ng->search->lookup_message($range) or
+ my $smsg = $ng->search->lookup_mail($range) or
return '430 No article with that message-id';
more($self, '224 Overview information follows (multi-line)');
- $smsg = PublicInbox::SearchMsg->load_doc($smsg->{doc});
# Only set article number column if it's the current group
my $self_ng = $self->{ng};
--
2.51.0