From debf2fc88ce3e85f3d561dd345c1b5af0b8f0939 Mon Sep 17 00:00:00 2001 From: minerjr Date: Mon, 30 Dec 2024 14:22:50 -0400 Subject: [PATCH] [FIRE-35019] - fix memory access error Fixed crashing issue in LLHUDText::renderText() cause by using mSourceObject without first checking to see if it is not null as the source object could be unloaded when teleporting to different sim. Was testing going to https://maps.secondlife.com/secondlife/Blue%20Moon%20Bay/188/63/26 for hitching issue and issue was triggered. --- indra/newview/llhudtext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index b6c35a8889..cb05db5728 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -267,7 +267,7 @@ void LLHUDText::renderText() // Also, only show the background if it is show all is checked, or if on highlight, only if use hover highlight is enabled. if ((mShowBackground == SHOW_BACKGROUND_ALL || mShowBackground == SHOW_BACKGROUND_ONLY_HIGHLIGHTED && mbIsHighlighted && mbUseHoverHighlight) && - mSourceObject->getAttachmentState() == 0) + (mSourceObject.notNull() && mSourceObject->getAttachmentState() == 0)) { LLRect screen_rect; screen_rect.setCenterAndSize(0, static_cast(lltrunc(-mBackgroundHeight / 2 + mOffsetY + mBackgroundOffsetY)),