You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/06/22 19:48:23 UTC
git commit: THRIFT-2233 Java compiler should defensively copy its
binary inputs Client: Java Patch: Andrew Gaul
Repository: thrift
Updated Branches:
refs/heads/master 9999f5295 -> bd05f9e06
THRIFT-2233 Java compiler should defensively copy its binary inputs
Client: Java
Patch: Andrew Gaul
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bd05f9e0
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bd05f9e0
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bd05f9e0
Branch: refs/heads/master
Commit: bd05f9e06c594683c650feabf240b24834a29c5a
Parents: 9999f52
Author: Jens Geyer <je...@apache.org>
Authored: Sun Jun 22 19:47:52 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sun Jun 22 19:47:52 2014 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_java_generator.cc | 32 ++++++++++++++++------
1 file changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bd05f9e0/compiler/cpp/src/generate/t_java_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index 1da60d9..9e34851 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -872,7 +872,7 @@ void t_java_generator::generate_union_constructor(ofstream& out, t_struct* tstru
if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
indent(out) << "public static " << type_name(tstruct) << " " << (*m_iter)->get_name() << "(byte[] value) {" << endl;
indent(out) << " " << type_name(tstruct) << " x = new " << type_name(tstruct) << "();" << endl;
- indent(out) << " x.set" << get_cap_name((*m_iter)->get_name()) << "(ByteBuffer.wrap(value));" << endl;
+ indent(out) << " x.set" << get_cap_name((*m_iter)->get_name()) << "(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));" << endl;
indent(out) << " return x;" << endl;
indent(out) << "}" << endl << endl;
}
@@ -907,7 +907,7 @@ void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struc
indent(out) << "public ByteBuffer buffer" << get_cap_name("for") << get_cap_name(field->get_name()) << "() {" << endl;
indent(out) << " if (getSetField() == _Fields." << constant_name(field->get_name()) << ") {" << endl;
- indent(out) << " return (ByteBuffer)getFieldValue();" << endl;
+ indent(out) << " return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());" << endl;
indent(out) << " } else {" << endl;
indent(out) << " throw new RuntimeException(\"Cannot get field '" << field->get_name()
<< "' because union is currently set to \" + getFieldDesc(getSetField()).name);" << endl;
@@ -929,7 +929,7 @@ void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struc
generate_java_doc(out, field);
if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
indent(out) << "public void set" << get_cap_name(field->get_name()) << "(byte[] value) {" << endl;
- indent(out) << " set" << get_cap_name(field->get_name()) << "(ByteBuffer.wrap(value));" << endl;
+ indent(out) << " set" << get_cap_name(field->get_name()) << "(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));" << endl;
indent(out) << "}" << endl;
out << endl;
@@ -1418,8 +1418,15 @@ void t_java_generator::generate_java_struct_definition(ofstream &out,
indent(out) << "this();" << endl;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
- indent(out) << "this." << (*m_iter)->get_name() << " = " <<
- (*m_iter)->get_name() << ";" << endl;
+ t_type* type = get_true_type((*m_iter)->get_type());
+ if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
+ indent(out) << "this." << (*m_iter)->get_name()
+ << " = org.apache.thrift.TBaseHelper.copyBinary("
+ << (*m_iter)->get_name() << ");" << endl;
+ } else {
+ indent(out) << "this." << (*m_iter)->get_name() << " = "
+ << (*m_iter)->get_name() << ";" << endl;
+ }
generate_isset_set(out, (*m_iter), "");
}
}
@@ -1952,7 +1959,7 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out,
indent(out) << "}" << endl << endl;
indent(out) << "public ByteBuffer buffer" << get_cap_name("for") << cap_name << "() {" << endl;
- indent(out) << " return " << field_name << ";" << endl;
+ indent(out) << " return org.apache.thrift.TBaseHelper.copyBinary(" << field_name << ");" << endl;
indent(out) << "}" << endl << endl;
} else {
indent(out) << "public " << type_name(type);
@@ -1979,7 +1986,10 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out,
out << type_name(tstruct);
}
out << " set" << cap_name << "(byte[] " << field_name << ") {" << endl;
- indent(out) << " set" << cap_name << "(" << field_name << " == null ? (ByteBuffer)null : ByteBuffer.wrap(" << field_name << "));" << endl;
+ indent(out) << " this." << field_name << " = "
+ << field_name << " == null ? (ByteBuffer)null"
+ << " : ByteBuffer.wrap(Arrays.copyOf("
+ << field_name << ", " << field_name << ".length));" << endl;
if (!bean_style_) {
indent(out) << " return this;" << endl;
}
@@ -1993,7 +2003,13 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out,
}
out << " set" << cap_name << "(" << type_name(type) << " " << field_name << ") {" << endl;
indent_up();
- indent(out) << "this." << field_name << " = " << field_name << ";" << endl;
+ indent(out) << "this." << field_name << " = ";
+ if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
+ out << "org.apache.thrift.TBaseHelper.copyBinary(" << field_name << ")";
+ } else {
+ out << field_name;
+ }
+ out << ";" << endl;
generate_isset_set(out, field, "");
if (!bean_style_) {
indent(out) << "return this;" << endl;