Merge pull request #39 from gpshead/strncpy-msc_dev_ids

Fixes #33: Remove invalid use of strncpy()

1 files changed, 12 insertions, 6 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index d8bb72216..abc051252 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -265,14 +265,20 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
           .is_removable         = 1,

           .version              = 2,

           .response_data_format = 2,

-          .vendor_id            = "Adafruit",

-          .product_id           = "Feather52840",

-          .product_rev          = "1.0"

+          .vendor_id            = "        ",

+          .product_id           = "                ",

+          .product_rev          = "    ",

       };

+      size_t len;

 

-      strncpy((char*) inquiry_rsp.vendor_id  , CFG_TUD_MSC_VENDOR     , sizeof(inquiry_rsp.vendor_id));

-      strncpy((char*) inquiry_rsp.product_id , CFG_TUD_MSC_PRODUCT    , sizeof(inquiry_rsp.product_id));

-      strncpy((char*) inquiry_rsp.product_rev, CFG_TUD_MSC_PRODUCT_REV, sizeof(inquiry_rsp.product_rev));

+      #define _min(a,b) ((a) < (b) ? (a) : (b))

+      len = strlen(CFG_TUD_MSC_VENDOR);

+      memcpy(inquiry_rsp.vendor_id  , CFG_TUD_MSC_VENDOR     , _min(len, sizeof(inquiry_rsp.vendor_id)));

+      len = strlen(CFG_TUD_MSC_PRODUCT);

+      memcpy(inquiry_rsp.product_id , CFG_TUD_MSC_PRODUCT    , _min(len, sizeof(inquiry_rsp.product_id)));

+      len = strlen(CFG_TUD_MSC_PRODUCT_REV);

+      memcpy(inquiry_rsp.product_rev, CFG_TUD_MSC_PRODUCT_REV, _min(len, sizeof(inquiry_rsp.product_rev)));

+      #undef _min

 

       ret = sizeof(inquiry_rsp);

       memcpy(buffer, &inquiry_rsp, ret);