Fix for NPE on null encrypted MMS messages.

This commit is contained in:
Moxie Marlinspike 2013-04-23 14:49:32 -07:00
parent c3e21f3f75
commit f2475491fe

View File

@ -61,7 +61,7 @@ public class MessageMac {
} }
public static byte[] getMessageWithoutMac(byte[] message) throws InvalidMacException { public static byte[] getMessageWithoutMac(byte[] message) throws InvalidMacException {
if (message.length <= MAC_LENGTH) if (message == null || message.length <= MAC_LENGTH)
throw new InvalidMacException("Message shorter than MAC!"); throw new InvalidMacException("Message shorter than MAC!");
byte[] strippedMessage = new byte[message.length - MAC_LENGTH]; byte[] strippedMessage = new byte[message.length - MAC_LENGTH];