forked from mindspore-Ecosystem/mindspore
fix: memcpy_s will fail when size is larger than 2^31 - 1
This commit is contained in:
parent
c50bdbeea8
commit
19beb87552
|
@ -210,9 +210,24 @@ Status Tensor::CreateFromNpArray(const py::array &arr, std::shared_ptr<Tensor> *
|
|||
if (is_strided) {
|
||||
RETURN_IF_NOT_OK(CopyStridedArray((*out)->data_, data, shape, strides, (*out)->type_.SizeInBytes()));
|
||||
} else {
|
||||
int ret_code = memcpy_s((*out)->data_, byte_size, data, byte_size);
|
||||
if (ret_code != 0) {
|
||||
RETURN_STATUS_UNEXPECTED("Failed to copy data into Tensor.");
|
||||
// fix: memcpy_s will fail when byte_size > 2^31 - 1
|
||||
uint32_t step = 1;
|
||||
while (byte_size > (step * kDeMaxDim)) {
|
||||
int ret_code =
|
||||
memcpy_s((*out)->data_ + (step - 1) * kDeMaxDim, kDeMaxDim, data + (step - 1) * kDeMaxDim, kDeMaxDim);
|
||||
if (ret_code != 0) {
|
||||
RETURN_STATUS_UNEXPECTED("Failed to copy data into Tensor.");
|
||||
}
|
||||
step++;
|
||||
}
|
||||
|
||||
// copy the last
|
||||
if (byte_size > ((step - 1) * kDeMaxDim) && byte_size <= (step * kDeMaxDim)) {
|
||||
int ret_code = memcpy_s((*out)->data_ + (step - 1) * kDeMaxDim, byte_size - ((step - 1) * kDeMaxDim),
|
||||
data + (step - 1) * kDeMaxDim, byte_size - ((step - 1) * kDeMaxDim));
|
||||
if (ret_code != 0) {
|
||||
RETURN_STATUS_UNEXPECTED("Failed to copy data into Tensor.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue