nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

Update CO_ODinterface.c: fix memcpy boundary verification

Browse source
This commit is contained in:
Janez 2024-06-26 12:15:30 +02:00 committed by GitHub
parent 11771f889c
commit c643683b24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
301/CO_ODinterface.c
View file

@ -80,6 +80,7 @@ ODR_t OD_writeOriginal(OD_stream_t *stream, const void *buf,
}
OD_size_t dataLenToCopy = stream->dataLength; /* length of OD variable */
OD_size_t dataLenRemain = dataLenToCopy; /* remaining length of dataOrig buffer */
uint8_t *dataOrig = stream->dataOrig;
if (dataOrig == NULL) {
@ -97,6 +98,7 @@ ODR_t OD_writeOriginal(OD_stream_t *stream, const void *buf,
}
/* reduce for already copied data */
dataLenToCopy -= stream->dataOffset;
dataLenRemain = dataLenToCopy;
dataOrig += stream->dataOffset;
if (dataLenToCopy > count) {
@ -116,7 +118,8 @@ ODR_t OD_writeOriginal(OD_stream_t *stream, const void *buf,
return ODR_DATA_LONG;
}
if (((dataLenToCopy + stream->dataOffset) <= stream->dataLength) && (dataLenToCopy <= count)) {
/* additional check for Misra c compliance */
if ((dataLenToCopy <= dataLenRemain) && (dataLenToCopy <= count)) {
(void)memcpy((void *)dataOrig, (const void *)buf, dataLenToCopy);
}
else {