summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-11-20 17:32:42 +0100
committerGitHub <noreply@github.com>2019-11-20 17:32:42 +0100
commit145d27ad23004f96b7cf007242618c2dae81a325 (patch)
treebed58314a602efa76cd6f1e3c084e0ef2b31bd4d
parent839e854f5daba487fb2a36934f04243847b6d5f4 (diff)
parentd8ee3a8f8d68fc938e2026edd8072246efc4fdf7 (diff)
downloadATCD-145d27ad23004f96b7cf007242618c2dae81a325.tar.gz
Merge pull request #1001 from knutpett/crash
Prevent crash
-rw-r--r--TAO/TAO_IDL/ast/ast_annotation_appls.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
index 47132667e01..7f4949ddbd2 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
@@ -102,7 +102,13 @@ AST_Annotation_Appls::find (const char *annotation)
return 0;
}
- AST_Decl* decl = idl_global->scopes ().bottom ()->lookup_by_name (annotation);
+ UTL_Scope* bottom = idl_global->scopes ().bottom ();
+ if (!bottom)
+ {
+ return 0;
+ }
+
+ AST_Decl* decl = bottom->lookup_by_name (annotation);
if (!decl)
{
return 0;