Update builder.cc

xuepanchen · web-flow · commit 8dd5eaa9e44e · 2018-01-17T15:56:16.000-05:00
diff --git a/cpp/src/arrow/builder.cc b/cpp/src/arrow/builder.cc
@@ -1227,8 +1227,11 @@ Status BinaryBuilder::Resize(int64_t capacity) {
 }
   
 Status BinaryBuilder::ReserveData(int64_t capacity) {
-  DCHECK_LT(capacity, std::numeric_limits<int32_t>::max());
-  return value_data_builder_.Resize(capacity * sizeof(int64_t));
+  if(value_data_length.length() + capacity > std::numeric_limits<int32_t>::max()) {
+      return Status::Invalid("Cannot reserve capacity larger than 2^31 - 1 in length for binary data");
+  }
+  
+  return value_data_builder_.Resize(value_data_length.length() + capacity);
 }
 
 Status BinaryBuilder::AppendNextOffset() {

Original file line number	Diff line number	Diff line change
`@@ -1227,8 +1227,11 @@ Status BinaryBuilder::Resize(int64_t capacity) {`
`1227`	`1227`	`}`
`1228`	`1228`
`1229`	`1229`	`Status BinaryBuilder::ReserveData(int64_t capacity) {`
`1230`		`- DCHECK_LT(capacity, std::numeric_limits<int32_t>::max());`
`1231`		`- return value_data_builder_.Resize(capacity * sizeof(int64_t));`
	`1230`	`+ if(value_data_length.length() + capacity > std::numeric_limits<int32_t>::max()) {`
	`1231`	`+ return Status::Invalid("Cannot reserve capacity larger than 2^31 - 1 in length for binary data");`
	`1232`	`+ }`
	`1233`	`+`
	`1234`	`+ return value_data_builder_.Resize(value_data_length.length() + capacity);`
`1232`	`1235`	`}`
`1233`	`1236`
`1234`	`1237`	`Status BinaryBuilder::AppendNextOffset() {`