experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't copy more variant elements than allowed by tensor shape

Browse Source 
PiperOrigin-RevId: 261962798
This commit is contained in:
Mihai Maruseac 2019-08-06 11:49:17 -07:00
parent 135639d075
commit 100f54cd9a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tensorflow/core/framework/tensor.cc
View File

@ -515,7 +515,12 @@ TensorBuffer* FromProtoField<Variant>(Allocator* a, const TensorProto& in,
if (in_n <= 0) {
std::fill_n(data, n, Variant());
} else {
for (int64 i = 0; i < in_n; ++i) {
// If tensor shape says we have n < in_n elements in the output tensor
// then make sure to only decode the first n out of the in_n elements in the
// in tensors. In all other cases, we decode all in_n elements of in and set
// the remaining elements up to n to be the default Variant() value.
const int64 real_n = n < in_n ? n : in_n;
for (int64 i = 0; i < real_n; ++i) {
data[i] = in.variant_val(i);
if (!DecodeUnaryVariant(&data[i])) {
LOG(ERROR) << "Could not decode variant with type_name: \""