Issue 5858 - WebRequest Reader is not closed

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequest.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.libadblockplus.android;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
 
@@ skipping 101 matching lines @@
       if (response.getResponseStatus() == 200)
       {
         final InputStream inputStream =
           (compressedStream && ENCODING_GZIP.equals(connection.getContentEncoding())
             ? new GZIPInputStream(connection.getInputStream())
             : connection.getInputStream());
         final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
         final StringBuilder sb = new StringBuilder();
 
         String line;
-        while ((line = reader.readLine()) != null)
+        try
         {
-          // We're only appending non-element-hiding filters here.
-          //
-          // See:
-          //      https://issues.adblockplus.org/ticket/303
-          //
-          // Follow-up issue for removing this hack:
-          //      https://issues.adblockplus.org/ticket/1541
-          //
-          if (this.elemhideEnabled || !isListedSubscriptionUrl(url) || line.indexOf('#') == -1)
+          while ((line = reader.readLine()) != null)
           {
-            sb.append(line);
-            sb.append('\n');
+            // We're only appending non-element-hiding filters here.
+            //
+            // See:
+            //      https://issues.adblockplus.org/ticket/303
+            //
+            // Follow-up issue for removing this hack:
+            //      https://issues.adblockplus.org/ticket/1541
+            //
+            if (this.elemhideEnabled || !isListedSubscriptionUrl(url) || line.indexOf('#') == -1)
+            {
+              sb.append(line);
+              sb.append('\n');
+            }
+          }
+        }
+        finally
+        {
+          try
+          {
+            reader.close();
+          }
+          catch (IOException e)
+          {
+            // ignored
           }
         }
 
         response.setStatus(NsStatus.OK);
         response.setResponse(sb.toString());
 
         if (connection.getHeaderFields().size() > 0)
         {
           List<HeaderEntry> responseHeaders = new LinkedList<HeaderEntry>();
           for (Map.Entry<String, List<String>> eachEntry : connection.getHeaderFields().entrySet())
@@ skipping 18 matching lines @@
       Log.d(TAG, "Downloading finished");
       return response;
     }
     catch (final Throwable t)
     {
       Log.e(TAG, "WebRequest failed", t);
       throw new AdblockPlusException("WebRequest failed", t);
     }
   }
 }