Merge pull request #33 from jxltom/jxltom-patch-2

autowp · web-flow · commit a00d5dbaeee5 · 2020-03-12T09:27:22.000+03:00
Avoid overflow when Can frame DLC is not set correctly
diff --git a/mcp2515.cpp b/mcp2515.cpp
@@ -573,6 +573,10 @@ MCP2515::ERROR MCP2515::setFilter(const RXF num, const bool ext, const uint32_t
 
 MCP2515::ERROR MCP2515::sendMessage(const TXBn txbn, const struct can_frame *frame)
 {
+    if (frame->can_dlc > CAN_MAX_DLEN) {
+        return ERROR_FAILTX;
+    }
+
     const struct TXBn_REGS *txbuf = &TXB[txbn];
 
     uint8_t data[13];

Original file line number	Diff line number	Diff line change
`@@ -573,6 +573,10 @@ MCP2515::ERROR MCP2515::setFilter(const RXF num, const bool ext, const uint32_t`
`573`	`573`
`574`	`574`	`MCP2515::ERROR MCP2515::sendMessage(const TXBn txbn, const struct can_frame *frame)`
`575`	`575`	`{`
	`576`	`+ if (frame->can_dlc > CAN_MAX_DLEN) {`
	`577`	`+ return ERROR_FAILTX;`
	`578`	`+ }`
	`579`	`+`
`576`	`580`	`const struct TXBn_REGS *txbuf = &TXB[txbn];`
`577`	`581`
`578`	`582`	`uint8_t data[13];`