summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2020-01-23 14:46:24 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2020-01-23 14:51:55 -0800
commitdde3eda412d5fc8be118f7569f4014d39be5c402 (patch)
treed336638c04de86234d4c2d10d1ebd1cb81b6dac5
parentd1c46ecb316453ea8d3cc0b148c35a816772532b (diff)
low-can: fix aborting on can_data not being an json_type_arrayicefish_8.99.5icefish/8.99.58.99.5
Bug-AGL: SPEC-3129 Change-Id: I41928c5f4c467edb176ad6234c9b775e70035319 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--low-can-binding/binding/low-can-cb.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 3897f8b4..d994dd24 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -558,7 +558,9 @@ static void write_raw_frame(afb_req_t request, const std::string& bus_name, mess
message->set_maxdlen(J1939_MAX_DLEN);
#endif
- if(message->get_length() > 0 && message->get_length() <= message->get_maxdlen())
+ if(message->get_length() > 0 &&
+ message->get_length() <= message->get_maxdlen() &&
+ json_object_get_type(can_data) == json_type_array)
{
std::vector<uint8_t> data;
for (int i = 0 ; i < message->get_length() ; i++)