Skip to content

Commit fda3f3b

Browse files
committed
MessageDecoder: rewrite handle_LeaveArray
1 parent ef68b85 commit fda3f3b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/cbor/MessageDecoder.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ CBORMessageDecoder::ArrayParserState CBORMessageDecoder::handle_EnterArray(CborV
105105

106106
CBORMessageDecoder::ArrayParserState CBORMessageDecoder::handle_LeaveArray(CborValue * main_iter, CborValue * array_iter) {
107107
// Advance to the next parameter (the last one in the array)
108-
if (cbor_value_advance(array_iter) != CborNoError) {
109-
return ArrayParserState::Error;
110-
}
111-
// Leave the array
112-
if (cbor_value_leave_container(main_iter, array_iter) != CborNoError) {
113-
return ArrayParserState::Error;
108+
if (cbor_value_advance(array_iter) == CborNoError) {
109+
// Leave the array
110+
if (cbor_value_leave_container(main_iter, array_iter) == CborNoError) {
111+
return ArrayParserState::Complete;
112+
}
114113
}
115-
return ArrayParserState::Complete;
114+
115+
return ArrayParserState::Error;
116116
}
117117

118118
/******************************************************************************

0 commit comments

Comments
 (0)