Skip to content

Commit 12d3e88

Browse files
committed
message decoder improve coverage
1 parent 4750902 commit 12d3e88

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/cbor/MessageDecoder.cpp

+7-12
Original file line numberDiff line numberDiff line change
@@ -177,34 +177,29 @@ CBORMessageDecoder::ArrayParserState CBORMessageDecoder::decodeLastValuesUpdateC
177177
}
178178

179179
CBORMessageDecoder::ArrayParserState CBORMessageDecoder::decodeOtaUpdateCmdDown(CborValue * param, Message * message) {
180+
CborError error = CborNoError;
180181
OtaUpdateCmdDown * ota = (OtaUpdateCmdDown *) message;
181182

182183
// Message is composed 4 parameters: id, url, initialSha, finalSha
183184
if (!copyCBORByteToArray(param, ota->params.id, sizeof(ota->params.id))) {
184185
return ArrayParserState::Error;
185186
}
186187

187-
if (cbor_value_advance(param) != CborNoError) {
188-
return ArrayParserState::Error;
189-
}
188+
error = cbor_value_advance(param);
190189

191-
if (!copyCBORStringToArray(param, ota->params.url, sizeof(ota->params.url))) {
190+
if (error || !copyCBORStringToArray(param, ota->params.url, sizeof(ota->params.url))) {
192191
return ArrayParserState::Error;
193192
}
194193

195-
if (cbor_value_advance(param) != CborNoError) {
196-
return ArrayParserState::Error;
197-
}
194+
error = cbor_value_advance(param);
198195

199-
if (!copyCBORByteToArray(param, ota->params.initialSha256, sizeof(ota->params.initialSha256))) {
196+
if (error || !copyCBORByteToArray(param, ota->params.initialSha256, sizeof(ota->params.initialSha256))) {
200197
return ArrayParserState::Error;
201198
}
202199

203-
if (cbor_value_advance(param) != CborNoError) {
204-
return ArrayParserState::Error;
205-
}
200+
error = cbor_value_advance(param);
206201

207-
if (!copyCBORByteToArray(param, ota->params.finalSha256, sizeof(ota->params.finalSha256))) {
202+
if (error || !copyCBORByteToArray(param, ota->params.finalSha256, sizeof(ota->params.finalSha256))) {
208203
return ArrayParserState::Error;
209204
}
210205

0 commit comments

Comments
 (0)