cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix stupid error in UncachedKeyRing

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-05 18:59:44 +02:00
parent 1af6a2796c
commit 2d2dce754d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@@ -19,6 +19,7 @@
package org.sufficientlysecure.keychain.pgp; package org.sufficientlysecure.keychain.pgp;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@@ -170,7 +171,8 @@ public class UncachedKeyRing {
} }
public static IteratorWithIOThrow<UncachedKeyRing> fromStream(final InputStream stream) { public static IteratorWithIOThrow<UncachedKeyRing> fromStream(InputStream rawStream) {
final InputStream stream = rawStream.markSupported() ? rawStream: new BufferedInputStream(rawStream);
return new IteratorWithIOThrow<UncachedKeyRing>() { return new IteratorWithIOThrow<UncachedKeyRing>() {
@@ -183,9 +185,15 @@ public class UncachedKeyRing {
} }
try { try {
while (stream.available() > 0) { while (true) {
// if there are no objects left from the last factory, create a new one // if there are no objects left from the last factory, create a new one
if (mObjectFactory == null) { if (mObjectFactory == null) {
stream.mark(1);
if (stream.read() == -1) {
break;
}
stream.reset();
InputStream in = PGPUtil.getDecoderStream(stream); InputStream in = PGPUtil.getDecoderStream(stream);
mObjectFactory = new PGPObjectFactory(in, new JcaKeyFingerprintCalculator()); mObjectFactory = new PGPObjectFactory(in, new JcaKeyFingerprintCalculator());
} }