Merge pull request #217 from arduino/fix-wno-null

Fix: do not call "memcpy" if there is a) no data to copy, or b) the src pointer is null.
arduino · Sep 27, 2023 · 65633ce · 65633ce
2 parents f1ae7d0 + fc4a570
commit 65633ce
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/api/CanMsg.h b/api/CanMsg.h
@@ -45,7 +45,8 @@ class CanMsg : public Printable
   , data_length{min(can_data_len, MAX_DATA_LENGTH)}
   , data{0}
   {
-    memcpy(data, can_data_ptr, data_length);
+    if (data_length && can_data_ptr)
+      memcpy(data, can_data_ptr, data_length);
   }
 
   CanMsg() : CanMsg(0, 0, nullptr) { }
@@ -54,7 +55,8 @@ class CanMsg : public Printable
   {
     this->id          = other.id;
     this->data_length = other.data_length;
-    memcpy(this->data, other.data, this->data_length);
+    if (this->data_length && other.data)
+      memcpy(this->data, other.data, this->data_length);
   }
 
   virtual ~CanMsg() { }
@@ -65,7 +67,8 @@ class CanMsg : public Printable
     {
       this->id          = other.id;
       this->data_length = other.data_length;
-      memcpy(this->data, other.data, this->data_length);
+      if (this->data_length && other.data)
+        memcpy(this->data, other.data, this->data_length);
     }
     return (*this);
   }