[Freemail] r18150 - trunk/apps/Freemail/src/freemail

[d...@freenetproject.org]

Author: dbkr
Date: 2008-02-25 17:23:08 +0000 (Mon, 25 Feb 2008)
New Revision: 18150

Modified:
   trunk/apps/Freemail/src/freemail/InboundContact.java
Log:
Fix NPE on dodgy addresses.


Modified: trunk/apps/Freemail/src/freemail/InboundContact.java
===================================================================
--- trunk/apps/Freemail/src/freemail/InboundContact.java        2008-02-25 
15:59:59 UTC (rev 18149)
+++ trunk/apps/Freemail/src/freemail/InboundContact.java        2008-02-25 
17:23:08 UTC (rev 18150)
@@ -197,6 +197,10 @@

        public boolean validateFrom(EmailAddress from) throws IOException, 
ConnectionTerminatedException {
                String sd = from.getSubDomain();
+               if (sd == null) {
+                       // well that's definately not valid. Piffle!
+                       return false;
+               }

                if (from.is_ssk_address()) {
                        return 
Base32.encode(this.ibct_dir.getName().getBytes()).equalsIgnoreCase(sd);