Merge pull request #12441 from daniel-starke/fix-issue-12311

0xc0170 · web-flow · commit 6a79d0e26731 · 2020-02-19T14:30:43.000Z
CAN: fix length calculation (fixes #12311)
diff --git a/drivers/CAN.h b/drivers/CAN.h
@@ -65,11 +65,11 @@ class CANMessage : public CAN_Message {
      */
     CANMessage(unsigned int _id, const unsigned char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)
     {
-        len    = _len & 0xF;
+        len    = (_len > 8) ? 8 : _len;
         type   = _type;
         format = _format;
         id     = _id;
-        memcpy(data, _data, _len);
+        memcpy(data, _data, len);
     }
 
 
@@ -83,11 +83,11 @@ class CANMessage : public CAN_Message {
      */
     CANMessage(unsigned int _id, const char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)
     {
-        len    = _len & 0xF;
+        len    = (_len > 8) ? 8 : _len;
         type   = _type;
         format = _format;
         id     = _id;
-        memcpy(data, _data, _len);
+        memcpy(data, _data, len);
     }
 
     /** Creates CAN remote message.

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,11 @@ class CANMessage : public CAN_Message {`
`65`	`65`	`*/`
`66`	`66`	`CANMessage(unsigned int _id, const unsigned char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)`
`67`	`67`	`{`
`68`		`- len = _len & 0xF;`
	`68`	`+ len = (_len > 8) ? 8 : _len;`
`69`	`69`	`type = _type;`
`70`	`70`	`format = _format;`
`71`	`71`	`id = _id;`
`72`		`- memcpy(data, _data, _len);`
	`72`	`+ memcpy(data, _data, len);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`
`@@ -83,11 +83,11 @@ class CANMessage : public CAN_Message {`
`83`	`83`	`*/`
`84`	`84`	`CANMessage(unsigned int _id, const char *_data, unsigned char _len = 8, CANType _type = CANData, CANFormat _format = CANStandard)`
`85`	`85`	`{`
`86`		`- len = _len & 0xF;`
	`86`	`+ len = (_len > 8) ? 8 : _len;`
`87`	`87`	`type = _type;`
`88`	`88`	`format = _format;`
`89`	`89`	`id = _id;`
`90`		`- memcpy(data, _data, _len);`
	`90`	`+ memcpy(data, _data, len);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/** Creates CAN remote message.`