Skip to content

fix(nntp): materialize ARTICLE/HEAD/BODY multiline data to prevent em… #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ros32 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(nntp): materialize ARTICLE/HEAD/BODY multiline data to prevent em… #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions Usenet/Nntp/Parsers/ArticleResponseParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ public NntpArticleResponse Parse(int code, string message, IEnumerable<string> d
return new NntpArticleResponse(code, message, true, new NntpArticle(number, messageId, null, null, null));
}

using (IEnumerator<string> enumerator = dataBlock.GetEnumerator())
// Materialize lines to avoid returning a body tied to a disposed enumerator
var lines = dataBlock?.ToList();

using (IEnumerator<string> enumerator = (lines ?? Enumerable.Empty<string>()).GetEnumerator())
{
// get headers if requested
MultiValueDictionary<string, string> headers = (requestType & ArticleRequestType.Head) == ArticleRequestType.Head
Expand All @@ -83,15 +86,8 @@ public NntpArticleResponse Parse(int code, string message, IEnumerable<string> d

// get body if requested
IEnumerable<string> bodyLines = (requestType & ArticleRequestType.Body) == ArticleRequestType.Body
? EnumerateBodyLines(enumerator)
: new string[0];

if (dataBlock is ICollection<string>)
{
// no need to keep enumerator if input is not a stream
// memoize the body lines
bodyLines = bodyLines.ToList();
}
? EnumerateBodyLines(enumerator).ToList()
: new List<string>(0);

return new NntpArticleResponse(
code, message, true,
Expand Down