From df29aab81ba962d29b541fb84ffe0a682abcfaf5 Mon Sep 17 00:00:00 2001
From: rider <rider@lindenlab.com>
Date: Fri, 13 Nov 2015 16:38:35 -0800
Subject: [PATCH] Throw away any incomplete llsd messages that may have get
sent on CR
---
indra/media_plugins/cef/media_plugin_cef.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 9e7c390eb22..be69858d475 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -727,6 +727,12 @@ void MediaPluginCEF::keyEvent(LLCEFLib::EKeyEvent key_event, int key, LLCEFLib::
{
#if LL_DARWIN
+ if (!native_key_data.has("event_type") ||
+ !native_key_data.has("event_modifiers") ||
+ !native_key_data.has("event_keycode") ||
+ !native_key_data.has("event_isrepeat"))
+ return;
+
uint32_t eventType = native_key_data["event_type"].asInteger();
uint32_t eventModifiers = native_key_data["event_modifiers"].asInteger();
uint32_t eventKeycode = native_key_data["event_keycode"].asInteger();
--
GitLab