Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segfault/heap buffer overflow in `{Experimental,}DatasetToTFRecor… #51189

Merged
merged 1 commit into from Aug 5, 2021
Merged

Fix segfault/heap buffer overflow in `{Experimental,}DatasetToTFRecor… #51189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion tensorflow/core/kernels/data/experimental/to_tf_record_op.cc
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
#include "tensorflow/core/framework/function_handle_cache.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/resource_mgr.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/kernels/data/dataset_utils.h"
#include "tensorflow/core/kernels/ops_util.h"
#include "tensorflow/core/lib/core/threadpool.h"
Expand Down Expand Up @@ -87,8 +88,20 @@ class ToTFRecordOp : public AsyncOpKernel {
TF_RETURN_IF_ERROR(dataset->MakeIterator(
&iter_ctx, /*parent=*/nullptr, "ToTFRecordOpIterator", &iterator));

const int num_output_dtypes = dataset->output_dtypes().size();
if (num_output_dtypes != 1) {
return errors::InvalidArgument(
"ToTFRecordOp currently only support datasets of 1 single column, ",
"but got ", num_output_dtypes);
}
const DataType dt = dataset->output_dtypes()[0];
if (dt != DT_STRING) {
return errors::InvalidArgument(
"ToTFRecordOp currently only supports DT_STRING dataypes, but got ",
DataTypeString(dt));
}
std::vector<Tensor> components;
components.reserve(dataset->output_dtypes().size());
components.reserve(num_output_dtypes);
bool end_of_sequence;
do {
TF_RETURN_IF_ERROR(
Expand Down