Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'close-feed-stream' into 'master'

Browse Source 
Close InputStream from RSS feed and prevent NPE

See merge request !572
This commit is contained in:
akwizgran
2017-07-28 15:48:01 +00:00
parent 3800cd5e4f 544c83a64c
commit ca83744a84
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
View File

@@ -59,6 +59,7 @@ import okhttp3.Dns;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
@@ -334,7 +335,9 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
private SyndFeed fetchSyndFeed(String url) private SyndFeed fetchSyndFeed(String url)
throws FeedException, IOException { throws FeedException, IOException {
// fetch feed // fetch feed
SyndFeed f = getSyndFeed(getFeedInputStream(url)); InputStream stream = getFeedInputStream(url);
SyndFeed f = getSyndFeed(stream);
stream.close();
if (f.getEntries().size() == 0) if (f.getEntries().size() == 0)
throw new FeedException("Feed has no entries"); throw new FeedException("Feed has no entries");
@@ -387,7 +390,9 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
// Execute Request // Execute Request
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
return response.body().byteStream(); ResponseBody body = response.body();
if (body != null) return body.byteStream();
throw new IOException("Empty response body");
} }
private SyndFeed getSyndFeed(InputStream stream) private SyndFeed getSyndFeed(InputStream stream)