From c8f8bbf75fbe6e5e6150b8979ecb063370a4e5dd Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 24 Jun 2016 10:22:18 -0700
Subject: [PATCH] MAINT-6521: A compare against a static const empty string
causes segfault in integration tests on Mac and Linux. Use empty() test
instead.
---
indra/llcommon/llevents.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index 0e367416162..e38fc5b2a65 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -320,7 +320,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
// if the supplied name is empty we are not interested in the ordering mechanism
// and can bypass attempting to find the optimal location to insert the new
// listener. We'll just tack it on to the end.
- if (name != ANONYMOUS)
+ if (!name.empty()) // should be the same as testing against ANONYMOUS
{
// Check for duplicate name before connecting listener to mSignal
ConnectionMap::const_iterator found = mConnections.find(name);
@@ -464,7 +464,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
// connect it.
LLBoundListener bound = mSignal->connect(nodePosition, listener);
- if (name != ANONYMOUS)
+ if (!name.empty())
{ // note that we are not tracking anonymous listeners here either.
// This means that it is the caller's responsibility to either assign
// to a TempBoundListerer (scoped_connection) or manually disconnect
--
GitLab