tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Fixed segfault with pages on https://freitag.de/.

This commit is contained in:
tastytea 2019-05-16 12:03:09 +02:00
parent a3259626ff
commit 1c5927666d
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/uri.cpp
View File

@ -97,15 +97,31 @@ const string URI::extract_description(const string &html)
const string URI::strip_html(const string &html)
{
string out;
out = regex_replace(html, regex("<script[^<]+"), ""); // Remove JavaScript.
out = regex_replace(out, regex("<style[^<]+"), ""); // Remove CSS.
out = regex_replace(out, regex("<[^>]+>"), ""); // Remove tags.
out = regex_replace(out, regex("\r"), "\n"); // Replace CR with LF.
out = regex_replace(out, regex(" +\n"), "\n"); // Remove trailing space.
out = remove_html_tags(out); // Remove tags.
out = regex_replace(out, regex("\r"), ""); // Remove CR.
out = regex_replace(out, regex("\\s+\n"), "\n"); // Remove trailing space.
out = regex_replace(out, regex("\n{2,}"), "\n"); // Reduce newlines.
return unescape_html(out);
}
const string URI::remove_html_tags(const string &html)
{
// NOTE: I did this with regex_replace before, but libstdc++ segfaulted.
string out;
size_t pos = 0;
while (pos != std::string::npos)
{
size_t startpos = html.find('<', pos);
size_t endpos = html.find('>', startpos);
out += html.substr(pos, startpos - pos);
pos = endpos;
}
return out;
}
const string URI::unescape_html(const string &html)
{

1
src/uri.hpp
View File

@ -44,6 +44,7 @@ private:
const string extract_title(const string &html);
const string extract_description(const string &html);
const string strip_html(const string &html);
const string remove_html_tags(const string &html);
const string unescape_html(const string &html);
const string remove_newlines(const string &text);
};