TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/crypto/MmsCipher.java
View File

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