Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crash fix for empty media URL.

Browse Source 
Apparently LLViewerMediaImpl::navigateInternal could be called with
an empty url. That lead to a curl request with an empty url, which
failed because that leads to an empty 'service' string, which is
not allowed.

Patched the code to ignore empty media urls and hardened AICurl
to deal with any remaining cases.
This commit is contained in:
Aleric Inglewood
2013-09-22 23:25:40 +02:00
parent 992d8e960c
commit 12d3873aa7
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewermedia.cpp
View File

@@ -2595,6 +2595,12 @@ void LLViewerMediaImpl::unload()
//////////////////////////////////////////////////////////////////////////////////////////
void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mime_type, bool rediscover_type, bool server_request)
{
if (url.empty())
{
llwarns << "Calling LLViewerMediaImpl::navigateTo with empty url" << llendl;
return;
}
cancelMimeTypeProbe();
if(mMediaURL != url)
@@ -2639,6 +2645,12 @@ void LLViewerMediaImpl::navigateInternal()
// Helpful to have media urls in log file. Shouldn't be spammy.
llinfos << "media id= " << mTextureId << " url=" << mMediaURL << " mime_type=" << mMimeType << llendl;
if (mMediaURL.empty())
{
llwarns << "Calling LLViewerMediaImpl::navigateInternal() with empty mMediaURL" << llendl;
return;
}
if(mNavigateSuspended)
{
llwarns << "Deferring navigate." << llendl;