From 524a96de10167207db41b0d643ee0edb4bb1d60c Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 30 Oct 2020 14:57:35 +1300
Subject: [PATCH] Fix warning when no entrypoing args provided.
 (flutter/engine#22136)

Fixes errors like:
GLib-CRITICAL **: 14:20:17.248: g_strv_length: assertion 'str_array != NULL' failed

Introduced in fe489569a722816acab038ebe0f882722d2434ee
---
 engine/src/flutter/shell/platform/linux/fl_engine.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine/src/flutter/shell/platform/linux/fl_engine.cc b/engine/src/flutter/shell/platform/linux/fl_engine.cc
index 40428edf406..3dc42694bb8 100644
--- a/engine/src/flutter/shell/platform/linux/fl_engine.cc
+++ b/engine/src/flutter/shell/platform/linux/fl_engine.cc
@@ -395,7 +395,8 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
   args.platform_message_callback = fl_engine_platform_message_cb;
   args.custom_task_runners = &custom_task_runners;
   args.shutdown_dart_vm_when_done = true;
-  args.dart_entrypoint_argc = g_strv_length(dart_entrypoint_args);
+  args.dart_entrypoint_argc =
+      dart_entrypoint_args != nullptr ? g_strv_length(dart_entrypoint_args) : 0;
   args.dart_entrypoint_argv =
       reinterpret_cast<const char* const*>(dart_entrypoint_args);