Merge pull request #2400 from mcginty/mms-bad-base64-fix

Fix NPE when encrypted MMS has bad base64 encoding
This commit is contained in:
Moxie Marlinspike 2015-02-06 16:19:20 -08:00
commit 5836f35291

View File

@ -61,6 +61,10 @@ public class MmsCipher {
byte[] decodedCiphertext = textTransport.getDecodedMessage(ciphertext.get());
byte[] plaintext;
if (decodedCiphertext == null) {
throw new InvalidMessageException("failed to decode ciphertext");
}
try {
plaintext = sessionCipher.decrypt(new WhisperMessage(decodedCiphertext));
} catch (InvalidMessageException e) {