From d356e2be0ffbc64b5df28b49d8bc3e043957fa21 Mon Sep 17 00:00:00 2001
From: paul_productengine <none@none>
Date: Fri, 24 Feb 2012 21:29:59 +0200
Subject: [PATCH] MAINT-387 FIXED [PUBLIC]Possible crash in
llviewermenufile/upload_done_callback
- Just moved the deletion to the inspected block
---
indra/newview/llviewermenufile.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 7e830e14bf2..cacb8a87663 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -949,11 +949,12 @@ void upload_done_callback(
args["REASON"] = std::string(LLAssetStorage::getErrorString(result));
LLNotificationsUtil::add("CannotUploadReason", args);
}
+
+ delete data;
+ data = NULL;
}
LLUploadDialog::modalUploadFinished();
- delete data;
- data = NULL;
// *NOTE: This is a pretty big hack. What this does is check the
// file picker if there are any more pending uploads. If so,
--
GitLab