Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1760585 - in
 /httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http:
 impl/sync/ResponseEntityProxy.java io/EofSensorInputStream.java
Date: Tue, 13 Sep 2016 18:32:38 -0000
To: commits@hc.apache.org
From: olegk@apache.org
Message-Id: <20160913183239.0AE8C3A01DD@svn01-us-west.apache.org>
archived-at: Tue, 13 Sep 2016 18:32:43 -0000

Author: olegk
Date: Tue Sep 13 18:32:38 2016
New Revision: 1760585

URL: http://svn.apache.org/viewvc?rev=1760585&view=rev
Log:
HTTPCLIENT-1767: Null pointer dereference in EofSensorInputStream and ResponseEntityProxy

EofSensorInputStream is generating NullPointerExceptions in some rare situations. This commit fixes that behaviour for the check methods by dereferencing the instance variable to a final local variable to ensure that if it is not null at the null guard, that it will be not null after that point also to successfully close/abort the stream

In some rare cases, null parameters are sent to ReponseEntityProxy methods, this adds checks on those to ensure that the connections are still released, but the null variable is not dereferenced.

Contributed by Peter Ansell <p_ansell@yahoo.com>

Conflicts:
	httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java

Modified:
    httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java
    httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java

Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java?rev=1760585&r1=1760584&r2=1760585&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java Tue Sep 13 18:32:38 2016
@@ -92,7 +92,9 @@ class ResponseEntityProxy extends HttpEn
     @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         try {
-            super.writeTo(outstream);
+            if (outstream != null) {
+                super.writeTo(outstream);
+            }
             releaseConnection();
         } catch (IOException | RuntimeException ex) {
             abortConnection();
@@ -107,7 +109,9 @@ class ResponseEntityProxy extends HttpEn
         try {
             // there may be some cleanup required, such as
             // reading trailers after the response body:
-            wrapped.close();
+            if (wrapped != null) {
+                wrapped.close();
+            }
             releaseConnection();
         } catch (IOException | RuntimeException ex) {
             abortConnection();
@@ -125,7 +129,9 @@ class ResponseEntityProxy extends HttpEn
             // this assumes that closing the stream will
             // consume the remainder of the response body:
             try {
-                wrapped.close();
+                if (wrapped != null) {
+                    wrapped.close();
+                }
                 releaseConnection();
             } catch (final SocketException ex) {
                 if (open) {

Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java?rev=1760585&r1=1760584&r2=1760585&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java Tue Sep 13 18:32:38 2016
@@ -193,14 +193,15 @@ public class EofSensorInputStream extend
      */
     protected void checkEOF(final int eof) throws IOException {
 
-        if ((wrappedStream != null) && (eof < 0)) {
+        final InputStream toCheckStream = wrappedStream;
+        if ((toCheckStream != null) && (eof < 0)) {
             try {
                 boolean scws = true; // should close wrapped stream?
                 if (eofWatcher != null) {
-                    scws = eofWatcher.eofDetected(wrappedStream);
+                    scws = eofWatcher.eofDetected(toCheckStream);
                 }
                 if (scws) {
-                    wrappedStream.close();
+                    toCheckStream.close();
                 }
             } finally {
                 wrappedStream = null;
@@ -221,14 +222,15 @@ public class EofSensorInputStream extend
      */
     protected void checkClose() throws IOException {
 
-        if (wrappedStream != null) {
+        final InputStream toCloseStream = wrappedStream;
+        if (toCloseStream != null) {
             try {
                 boolean scws = true; // should close wrapped stream?
                 if (eofWatcher != null) {
-                    scws = eofWatcher.streamClosed(wrappedStream);
+                    scws = eofWatcher.streamClosed(toCloseStream);
                 }
                 if (scws) {
-                    wrappedStream.close();
+                    toCloseStream.close();
                 }
             } finally {
                 wrappedStream = null;
@@ -251,14 +253,15 @@ public class EofSensorInputStream extend
      */
     protected void checkAbort() throws IOException {
 
-        if (wrappedStream != null) {
+        final InputStream toAbortStream = wrappedStream;
+        if (toAbortStream != null) {
             try {
                 boolean scws = true; // should close wrapped stream?
                 if (eofWatcher != null) {
-                    scws = eofWatcher.streamAbort(wrappedStream);
+                    scws = eofWatcher.streamAbort(toAbortStream);
                 }
                 if (scws) {
-                    wrappedStream.close();
+                    toAbortStream.close();
                 }
             } finally {
                 wrappedStream = null;