dart:io | Fix handling of exceptions from onBadCertificate callback.

runtime/bin/secure_socket.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/secure_socket.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ skipping 623 matching lines @@
         "Called SecureSocket.initialize more than once",
         Dart_Null()));
   }
 }
 
 
 SECStatus BadCertificateCallback(void* filter, PRFileDesc* fd) {
   SSLFilter* ssl_filter = static_cast<SSLFilter*>(filter);
   Dart_Handle callback = ssl_filter->bad_certificate_callback();
   if (Dart_IsNull(callback)) return SECFailure;
-
-  Dart_EnterScope();
   Dart_Handle x509_object = ssl_filter->PeerCertificate();
-  Dart_Handle result =
-      ThrowIfError(Dart_InvokeClosure(callback, 1, &x509_object));
-  bool c_result = Dart_IsBoolean(result) && DartUtils::GetBooleanValue(result);
-  Dart_ExitScope();
+  Dart_Handle result = Dart_InvokeClosure(callback, 1, &x509_object);
+  if (Dart_IsError(result)) {
+    ssl_filter->callback_error = result;
+    return SECFailure;
+  }
+  // Our wrapper is guaranteed to return a boolean.
+  bool c_result = DartUtils::GetBooleanValue(result);
   return c_result ? SECSuccess : SECFailure;
 }
 
 
 Dart_Handle SSLFilter::PeerCertificate() {
   CERTCertificate* certificate = SSL_PeerCertificate(filter_);
   if (certificate == NULL) return Dart_Null();
   Dart_Handle x509_object = X509FromCertificate(certificate);
   CERT_DestroyCertificate(certificate);
   return x509_object;
@@ skipping 156 matching lines @@
 
 void SSLFilter::Handshake() {
   SECStatus status = SSL_ForceHandshake(filter_);
   if (status == SECSuccess) {
     if (in_handshake_) {
       ThrowIfError(Dart_InvokeClosure(
           Dart_HandleFromPersistent(handshake_complete_), 0, NULL));
       in_handshake_ = false;
     }
   } else {
+    if (callback_error != NULL) {
+      Dart_PropagateError(callback_error);
+    }
     PRErrorCode error = PR_GetError();
     if (error == PR_WOULD_BLOCK_ERROR) {
       if (!in_handshake_) {
         in_handshake_ = true;
       }
     } else {
       if (is_server_) {
         ThrowPRException("HandshakeException",
                          "Handshake error in server");
       } else {
@@ skipping 157 matching lines @@
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }
 
 
 }  // namespace bin
 }  // namespace dart