diff options
| author | Jose <jose@zeroc.com> | 2016-07-25 16:13:11 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-25 16:13:11 +0200 |
| commit | 2916890ba55f241b7c304d27bc25312d5bac3225 (patch) | |
| tree | fec4a357f297f5b305eddc872650ab14edc223d6 /cpp/src | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-2916890ba55f241b7c304d27bc25312d5bac3225.tar.bz2 ice-2916890ba55f241b7c304d27bc25312d5bac3225.tar.xz ice-2916890ba55f241b7c304d27bc25312d5bac3225.zip | |
Fix ICE-7250 - slice2cpp crash with optionals demo
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 6b64c5832b1..f08f83e8c09 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6617,7 +6617,7 @@ Slice::Gen::Cpp11ObjectVisitor::emitDataMember(const DataMemberPtr& p) if(!defaultValue.empty()) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(p->type()); - if(p->optional() && builtin->kind() == Builtin::KindString) + if(p->optional() && builtin && builtin->kind() == Builtin::KindString) { // // = "<string literal>" doesn't work for optional<std::string> |