like20
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!19774 Use destMax in memcpy_ss r.13 

Merge pull request !19774 from h.farahat/tensor_safe_memcpy
This commit is contained in:
i-robot 2021-07-14 01:13:07 +00:00 committed by Gitee
parent d9493456c8 31569abf64
commit b60027b8d3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mindspore/ccsrc/minddata/dataset/core/tensor.cc
View File

@ -69,8 +69,8 @@ namespace dataset {
errno_t memcpy_ss(uchar *dest, size_t destMax, const uchar *src, size_t count) {
uint32_t step = 0;
while (count >= SECUREC_MEM_MAX_LEN) {
int ret_code = memcpy_s(dest + step * SECUREC_MEM_MAX_LEN, SECUREC_MEM_MAX_LEN, src + step * SECUREC_MEM_MAX_LEN,
SECUREC_MEM_MAX_LEN);
int ret_code = memcpy_s(dest + step * SECUREC_MEM_MAX_LEN, destMax - step * SECUREC_MEM_MAX_LEN,
src + step * SECUREC_MEM_MAX_LEN, SECUREC_MEM_MAX_LEN);
if (ret_code != 0) {
return ret_code;
}
@ -78,7 +78,8 @@ errno_t memcpy_ss(uchar *dest, size_t destMax, const uchar *src, size_t count) {
step++;
}
if (count > 0) {
return memcpy_s(dest + step * SECUREC_MEM_MAX_LEN, count, src + step * SECUREC_MEM_MAX_LEN, count);
return memcpy_s(dest + step * SECUREC_MEM_MAX_LEN, destMax - step * SECUREC_MEM_MAX_LEN,
src + step * SECUREC_MEM_MAX_LEN, count);
}
return 0;
}