commit ec61aba5517ba6967efafc73de06c9e4215c0ade
author Kenny Root <kroot@google.com> Fri Mar 15 16:51:17 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 15 16:51:17 2013 +0000
tree 3a5fd0b475e84d6742d0b57ee8dc203cf9ae0bd9
parent fe7c0039e934b7f4681a58fbebd9cd2d1e018818
parent 41dbe2157cc4e6c8ec2beb4c17e88caa84ea7dfc

Merge "NativeCrypto: catch null input streams in cert factory"

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLX509CertificateFactory.java

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLX509CertificateFactory.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLX509CertificateFactory.java
index c56f0b6..09e2507 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLX509CertificateFactory.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLX509CertificateFactory.java
@@ -61,6 +61,10 @@
      */
     private static abstract class Parser<T> {
         public T generateItem(InputStream inStream) throws ParsingException {
+            if (inStream == null) {
+                throw new ParsingException("inStream == null");
+            }
+
             final boolean markable = inStream.markSupported();
             if (markable) {
                 inStream.mark(PKCS7_MARKER.length);