From b36737f3ce9aaa3a2e2781bc1f7f28095127edde Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Fri, 6 May 2022 19:59:04 -0700
Subject: [PATCH] Add an explicit null check to
 DartConverterWrappable::FromDart (flutter/engine#33188)

---
 engine/src/flutter/third_party/tonic/dart_wrappable.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engine/src/flutter/third_party/tonic/dart_wrappable.cc b/engine/src/flutter/third_party/tonic/dart_wrappable.cc
index 69cc7a533f6..630d6121d04 100644
--- a/engine/src/flutter/third_party/tonic/dart_wrappable.cc
+++ b/engine/src/flutter/third_party/tonic/dart_wrappable.cc
@@ -89,6 +89,9 @@ Dart_PersistentHandle DartWrappable::GetTypeForWrapper(
 }
 
 DartWrappable* DartConverterWrappable::FromDart(Dart_Handle handle) {
+  if (Dart_IsNull(handle)) {
+    return nullptr;
+  }
   intptr_t peer = 0;
   Dart_Handle result =
       Dart_GetNativeInstanceField(handle, DartWrappable::kPeerIndex, &peer);