Edge cases for iMessage owner addresses.

icculus · Jun 21, 2016 · a3da2be · a3da2be
1 parent 9f6c64a
commit a3da2be
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/archive_imessage.pl b/archive_imessage.pl
@@ -806,6 +806,7 @@ sub lookup_address {
     next if not defined $account;
     my $address = $account;
     $address =~ s/\A[ep]\://i or fail("Unexpected account format '$account'");
+    next if $address eq '';
     dbgprint("distinct account: '$account' -> '$address'\n");
     lookup_address($account, $address);
     $default_account = $account if not defined $default_account;  # oh well.
@@ -930,6 +931,7 @@ sub talk_gap {
         flush_conversation(0);
 
         $account = $default_account if (not defined $account); # happens on old SMS messages.
+        $account = $default_account if $account =~ /\A[ep]\:\Z/i;
 
         $imessageuser = $account;
         if ($imessageuser =~ s/\A([ep])\://i) {