diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/lib/internet.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/lib/internet.cc')
| -rw-r--r-- | src/lib/internet.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 99ae5c214..c28e650fd 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -24,11 +24,11 @@ #include <curl/curl.h> #include <zip.h> #include "util.h" +#include "safe_stringstream.h" #include "i18n.h" using std::string; -using std::stringstream; using std::list; using boost::optional; using boost::function; @@ -130,11 +130,10 @@ ftp_ls (string url) return list<string> (); } - stringstream s (ls_raw); - string line; + SafeStringStream s (ls_raw); list<string> ls; while (s.good ()) { - getline (s, line); + string const line = s.getline (); if (line.length() > 55) { string const file = line.substr (55); if (file != "." && file != "..") { |