diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:05:29 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:05:29 -0400 |
commit | 62527e6f18f0a035a234cf584e31f7eea93fd4a7 (patch) | |
tree | 29f532cde7b0cf0fbf96cd4def3c89c77717b8fb /indra/llmessage/llhost.h | |
parent | 02b7e7ce07948a25bc1f58fdbfe3499dc917340f (diff) |
MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
The problem was that class-static LLUrlEntryParcel::sRegionHost was being
initialized by copying class-static LLHost::invalid. Naturally, these two
statics are initialized in different source files. Since C++ makes no promises
about the relative order in which objects in different object files are
initialized, it seems we hit a case in which we were trying to initialize
sRegionHost by copying a completely uninitialized LLHost::invalid.
In general we might attempt to address such cross-translation-unit issues by
introducing an LLSingleton. But in this particular case, the punch line is
that LLHost::invalid is explicitly constructed identically to a
default-constructed LLHost! In other words, LLHost::invalid provides nothing
we couldn't get from LLHost(). All it gives us is an opportunity for glitches
such as the above.
Remove LLHost::invalid and all references, replacing with LLHost().
Diffstat (limited to 'indra/llmessage/llhost.h')
-rwxr-xr-x | indra/llmessage/llhost.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llmessage/llhost.h b/indra/llmessage/llhost.h index 9a221e2a6e..376371cffd 100755 --- a/indra/llmessage/llhost.h +++ b/indra/llmessage/llhost.h @@ -42,8 +42,6 @@ protected: U32 mIP; std::string mUntrustedSimCap; public: - - static LLHost invalid; // CREATORS LLHost() |