From 1589b1d8c17de216eb96c67cadf8a676e229bafc Mon Sep 17 00:00:00 2001 From: temporal Date: Tue, 28 Apr 2009 08:09:44 +0000 Subject: Fix startup crash when statically linking on Mac. --- src/google/protobuf/descriptor_database.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc index 910f7e4e..6ea674d1 100644 --- a/src/google/protobuf/descriptor_database.cc +++ b/src/google/protobuf/descriptor_database.cc @@ -57,7 +57,10 @@ bool SimpleDescriptorDatabase::DescriptorIndex::AddFile( return false; } - string path = file.package(); + // We must be careful here -- calling file.package() if file.has_package() is + // false could access an uninitialized static-storage variable if we are being + // run at startup time. + string path = file.has_package() ? file.package() : string(); if (!path.empty()) path += '.'; for (int i = 0; i < file.message_type_size(); i++) { -- cgit v1.2.3