mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-10-11 01:47:00 +01:00
Merge pull request #2400 from mcginty/mms-bad-base64-fix
Fix NPE when encrypted MMS has bad base64 encoding
This commit is contained in:
commit
5836f35291
1 file changed
+4
@@ -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) {
|
||||
|
||||
Reference in new issue
Block a user