AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix static initialization ordering bug that caused crashes at startup when

Browse Source 
compiling on Mac with static linking.
This commit is contained in:
temporal 2008-07-25 04:38:05 +00:00
parent f206351d14
commit 6fdb0964e3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/google/protobuf/descriptor.cc
View File

@ -2065,7 +2065,15 @@ const FileDescriptor* DescriptorBuilder::BuildFile(
}
result->name_ = tables_->AllocateString(proto.name());
result->package_ = tables_->AllocateString(proto.package());
if (proto.has_package()) {
result->package_ = tables_->AllocateString(proto.package());
} else {
// We cannot rely on proto.package() returning a valid string if
// proto.has_package() is false, because we might be running at static
// initialization time, in which case default values have not yet been
// initialized.
result->package_ = tables_->AllocateString("");
}
result->pool_ = pool_;
// Add to tables.