[Scummvm-cvs-logs] scummvm master -> 0898bfd977668846f60195531d26a92ce9ac7f4e

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0898bfd977 TOON: Fix CID 1002425, 1002426, 1003214


Commit: 0898bfd977668846f60195531d26a92ce9ac7f4e
    https://github.com/scummvm/scummvm/commit/0898bfd977668846f60195531d26a92ce9ac7f4e
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T16:27:38-07:00

Commit Message:
TOON: Fix CID 1002425, 1002426, 1003214

Changed paths:
    engines/toon/script_func.cpp
    engines/toon/state.cpp
    engines/toon/tools.cpp



diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index 1fa4058..06580cd 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -1060,9 +1060,9 @@ int32 ScriptFunc::sys_Cmd_Set_Location_Data(EMCState *state) {
 	// initial setup of locations
 	int32 locationId = stackPos(0);
 	debugC(0, 0, "setlocationdata(%d) %s %x %s %s %d %d", locationId, GetText(1, state), stackPos(2), GetText(3, state), GetText(4, state), stackPos(5), stackPos(6));
-	strcpy(_vm->state()->_locations[locationId]._name, GetText(1, state));
-	strcpy(_vm->state()->_locations[locationId]._music, GetText(3, state));
-	strcpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state));
+	strncpy(_vm->state()->_locations[locationId]._name, GetText(1, state), 64);
+	strncpy(_vm->state()->_locations[locationId]._music, GetText(3, state), 64);
+	strncpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state), 64);
 	_vm->state()->_locations[locationId]._flags = stackPos(2);
 	_vm->state()->_locations[locationId]._visited = false;
 	_vm->state()->_locations[locationId]._numSceneAnimations = stackPos(5);
diff --git a/engines/toon/state.cpp b/engines/toon/state.cpp
index 8e4abbd..fffa8cf 100644
--- a/engines/toon/state.cpp
+++ b/engines/toon/state.cpp
@@ -115,6 +115,10 @@ State::State(void) {
 #endif
 
 	memset(_conversationState, 0, sizeof(Conversation) * 60);
+	
+	_conversationData = nullptr;
+	_currentConversationId = -1;
+	_exitConversation = true;
 }
 
 State::~State(void) {
diff --git a/engines/toon/tools.cpp b/engines/toon/tools.cpp
index added39..f5c77ac 100644
--- a/engines/toon/tools.cpp
+++ b/engines/toon/tools.cpp
@@ -136,6 +136,13 @@ uint32 decompressSPCN(byte *src, byte *dst, uint32 dstsize) {
 
 RncDecoder::RncDecoder() {
 	initCrc();
+
+	_bitBuffl = 0;
+	_bitBuffh = 0;
+	_bitCount = 0;
+	_srcPtr = nullptr;
+	_dstPtr = nullptr;
+	_inputByteLeft = 0;
 }
 
 RncDecoder::~RncDecoder() { }