diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-15 15:41:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-15 15:41:53 +0000 |
| commit | 63e819adbb4d2d8215f5d3d8297dc50bf2fe3329 (patch) | |
| tree | 33912f4d1966adb1bd4c9813dbc1c2276b1ac49d /src/google/protobuf/compiler/javanano/javanano_enum_field.cc | |
| parent | 39cee9f1f5cd513a53ac5100eb208ed431f99af0 (diff) | |
| parent | e03e9f4b5774c0ffe04140d83bbdb532863b1720 (diff) | |
| download | external_protobuf-63e819adbb4d2d8215f5d3d8297dc50bf2fe3329.zip external_protobuf-63e819adbb4d2d8215f5d3d8297dc50bf2fe3329.tar.gz external_protobuf-63e819adbb4d2d8215f5d3d8297dc50bf2fe3329.tar.bz2 | |
Merge "Protect against null repeated fields."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_enum_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_enum_field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc index 420d3c2..cdb3d09 100644 --- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc @@ -293,7 +293,7 @@ GenerateMergingCode(io::Printer* printer) const { void RepeatedEnumFieldGenerator:: GenerateSerializationCode(io::Printer* printer) const { printer->Print(variables_, - "if (this.$name$.length > 0) {\n"); + "if (this.$name$ != null && this.$name$.length > 0) {\n"); printer->Indent(); if (descriptor_->options().packed()) { @@ -317,7 +317,7 @@ GenerateSerializationCode(io::Printer* printer) const { void RepeatedEnumFieldGenerator:: GenerateSerializedSizeCode(io::Printer* printer) const { printer->Print(variables_, - "if (this.$name$.length > 0) {\n"); + "if (this.$name$ != null && this.$name$.length > 0) {\n"); printer->Indent(); printer->Print(variables_, |