From adec1bdfd06cee6c02334246fe969eb8d0b49018 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 10 Apr 2019 10:57:44 -0400 Subject: [PATCH] SPARK-678 Dont' crash on null array --- .../api/Channels/QuickBusClientChannel.cs | 28 ++++++++++--------- src/lib/api/core/ApiClientInterop.cpp | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index ac054c2c8..593edf9f7 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -110,19 +110,21 @@ namespace bts.api.core { the_update.Clear(); try { if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - foreach (var change in changes) { - switch (change.type) { - case ApiNativeMethods.ChangeType.REMOVE: - the_update.removed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.REPLACE: - the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.changed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.CREATE: - the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.added_keys.Add(change.key); - break; + if (changes != null) { + foreach (var change in changes) { + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; + } } } observer.OnNext(the_update); diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index 3927bbc3e..487b2eabb 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -176,7 +176,7 @@ void safe_call_subscription_callback(raw_subscription_callback cb, EventType typ if (updates.size() > 0) cb(type, &updates[0], updates.size(), extra); else - cb(type, nullptr, updates.size(), extra); + cb(type, nullptr, 0, extra); }); }