aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2011-01-04 18:24:05 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2011-01-04 18:24:05 +0000
commit7516c36883bb2326d8e0c02f5e9415bd66014819 (patch)
tree4a48c58c417e4a3cce03970a0f7650d97857fba5 /gcc
parent1b7029893ba1ea62d13a28bf9c1be0d398f718db (diff)
downloadgcc-7516c36883bb2326d8e0c02f5e9415bd66014819.zip
gcc-7516c36883bb2326d8e0c02f5e9415bd66014819.tar.gz
gcc-7516c36883bb2326d8e0c02f5e9415bd66014819.tar.bz2
Don't crash if package import fails.
From-SVN: r168477
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/gogo.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 1b00549..c274424 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -330,8 +330,11 @@ Gogo::import_package(const std::string& filename,
Import imp(stream, location);
imp.register_builtin_types(this);
Package* package = imp.import(this, local_name, is_local_name_exported);
- this->imports_.insert(std::make_pair(filename, package));
- package->set_is_imported();
+ if (package != NULL)
+ {
+ this->imports_.insert(std::make_pair(filename, package));
+ package->set_is_imported();
+ }
delete stream;
}