commit 41dbe2157cc4e6c8ec2beb4c17e88caa84ea7dfc
author Kenny Root <kroot@google.com> Fri Mar 15 09:02:16 2013 -0700
committer Kenny Root <kroot@google.com> Fri Mar 15 09:05:03 2013 -0700
tree 796196464073313ce001a6ab3695259aca9637af
parent 13bf44777fbbfa387b25da07b4779347c273eb53

NativeCrypto: catch null input streams in cert factory

Change-Id: I7b4a9d89cab8d35491d2d6efb6dfc0fae8e705d7

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);