Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 13:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

BIP38PrivateKey: Early check for NetworkParameters not null.

Browse Source
This commit is contained in:
Andreas Schildbach
2016-01-01 13:04:59 +01:00
parent 18bad5d899
commit 4d1ed91737
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java
View File

@@ -33,6 +33,7 @@ import java.security.GeneralSecurityException;
import java.text.Normalizer;
import java.util.Arrays;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
/**
@@ -68,7 +69,7 @@ public class BIP38PrivateKey extends VersionedChecksummedBytes {
@Deprecated
public BIP38PrivateKey(NetworkParameters params, String encoded) throws AddressFormatException {
super(encoded);
this.params = params;
this.params = checkNotNull(params);
if (version != 0x01)
throw new AddressFormatException("Mismatched version number: " + version);
if (bytes.length != 38)
@@ -202,6 +203,6 @@ public class BIP38PrivateKey extends VersionedChecksummedBytes {
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
params = NetworkParameters.fromID(in.readUTF());
params = checkNotNull(NetworkParameters.fromID(in.readUTF()));
}
}