Merge pull request #566 from ikedas/issue-565

Crash with broken S/MIME user certificate (cf. #565)
sympa-community · Mar 7, 2019 · bac9b6f · bac9b6f
2 parents de6f3d1 + ee72f3b
commit bac9b6f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/lib/Sympa/Message.pm b/src/lib/Sympa/Message.pm
@@ -1117,7 +1117,12 @@ sub smime_encrypt {
     # encrypt the incoming message parse it.
     my $smime = Crypt::SMIME->new();
     #FIXME: Add intermediate CA certificates if any.
-    $smime->setPublicKey($cert);
+    eval { $smime->setPublicKey($cert); };
+    if ($EVAL_ERROR) {
+        $log->syslog('err', 'Unable to encrypt message to %s: %s',
+            $email, $EVAL_ERROR);
+        return undef;
+    }
 
     # don't; cf RFC2633 3.1. netscape 4.7 at least can't parse encrypted
     # stuff that contains a whole header again... since MIME::Tools has