From f117db5798062d3f0d389a07ca5a75bac0d5cf72 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:03:17 +0000
Subject: CID-281
Checker: UNINIT_CTOR
Function: LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
File: /indra/llmessage/lltransfersourceasset.cpp
---
indra/llmessage/lltransfersourceasset.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index 7332f5c954..8f36d516d7 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -226,7 +226,10 @@ void LLTransferSourceAsset::responderCallback(LLVFS *vfs, const LLUUID& uuid, LL
-LLTransferSourceParamsAsset::LLTransferSourceParamsAsset() : LLTransferSourceParams(LLTST_ASSET)
+LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
+ : LLTransferSourceParams(LLTST_ASSET),
+
+ mAssetType(LLAssetType::AT_NONE)
{
}
--
cgit v1.2.3
From 428eb8555ee9bcd2476e3e5d61ee1cd844a0d621 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:12:31 +0000
Subject: CID-280
Checker: UNINIT_CTOR
Function: LLTransferTargetParamsVFile::LLTransferTargetParamsVFile()
File: /indra/llmessage/lltransfertargetvfile.cpp
dead field.
---
indra/llmessage/lltransfertargetvfile.h | 1 -
1 file changed, 1 deletion(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/lltransfertargetvfile.h b/indra/llmessage/lltransfertargetvfile.h
index 8c2bc7e8bb..cd18d8ce3f 100644
--- a/indra/llmessage/lltransfertargetvfile.h
+++ b/indra/llmessage/lltransfertargetvfile.h
@@ -68,7 +68,6 @@ protected:
LLTTVFCompleteCallback mCompleteCallback;
void* mUserDatap;
S32 mErrCode;
- LLVFSThread::handle_t mHandle;
};
--
cgit v1.2.3
From 4e73292e2ce7dcbce17e5edaa4ff10beeea01a51 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:14:57 +0000
Subject: CID-279
Checker: UNINIT_CTOR
Function: LLTransferTarget::LLTransferTarget(e_transfer_target_type, const LLUUID &, e_transfer_source_type)
File: /indra/llmessage/lltransfermanager.cpp
---
indra/llmessage/lltransfermanager.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 0a71ad95f2..d64b666ede 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -1196,6 +1196,7 @@ LLTransferTarget::LLTransferTarget(
mType(type),
mSourceType(source_type),
mID(transfer_id),
+ mChannelp(NULL),
mGotInfo(FALSE),
mSize(0),
mLastPacketID(-1)
--
cgit v1.2.3
From eab2f01b19b3a2ce46b2d44935097747a3eefadb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:18:22 +0000
Subject: CID-278
Checker: UNINIT_CTOR
Function: LLTransferTargetParamsFile::LLTransferTargetParamsFile()
File: /indra/llmessage/lltransfertargetfile.h
---
indra/llmessage/lltransfertargetfile.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h
index 18b9b52062..92fb8f807c 100644
--- a/indra/llmessage/lltransfertargetfile.h
+++ b/indra/llmessage/lltransfertargetfile.h
@@ -40,7 +40,12 @@ typedef void (*LLTTFCompleteCallback)(const LLTSCode status, void *user_data);
class LLTransferTargetParamsFile : public LLTransferTargetParams
{
public:
- LLTransferTargetParamsFile() : LLTransferTargetParams(LLTTT_FILE) {}
+ LLTransferTargetParamsFile()
+ : LLTransferTargetParams(LLTTT_FILE),
+
+ mCompleteCallback(NULL),
+ mUserData(NULL)
+ {}
void setFilename(const std::string& filename) { mFilename = filename; }
void setCallback(LLTTFCompleteCallback cb, void *user_data) { mCompleteCallback = cb; mUserData = user_data; }
--
cgit v1.2.3
From 2879692aa2696af80a1f12daaf88b886412dacb5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:25:04 +0000
Subject: CID-277
Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp
---
indra/llmessage/llpacketbuffer.cpp | 2 ++
1 file changed, 2 insertions(+)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index 027d35cf89..60ced66318 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -44,6 +44,8 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32
{
if (size > NET_BUFFER_SIZE)
{
+ mSize = 0;
+ mData[0] = 0;
llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
}
else // we previously relied on llerrs being fatal to not get here...
--
cgit v1.2.3
From 08b93d95ef9d21e39d633ada19a6cbad23c25b91 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:26:42 +0000
Subject: CID-277
Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp
a fix I like better.
---
indra/llmessage/llpacketbuffer.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index 60ced66318..441e8ddd27 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -42,13 +42,14 @@
LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 size) : mHost(host)
{
+ mSize = 0;
+ mData[0] = '!';
+
if (size > NET_BUFFER_SIZE)
{
- mSize = 0;
- mData[0] = 0;
llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
}
- else // we previously relied on llerrs being fatal to not get here...
+ else
{
if (datap != NULL)
{
--
cgit v1.2.3