[Scummvm-git-logs] scummvm master -> b9f436ea86e4703b43d2a9f58efff154fb151d8f

[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:
b9f436ea86 CHEWY: Turn _tafName into a Common::String (fix coverity 1475961)


Commit: b9f436ea86e4703b43d2a9f58efff154fb151d8f
    https://github.com/scummvm/scummvm/commit/b9f436ea86e4703b43d2a9f58efff154fb151d8f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2022-03-09T23:01:41+01:00

Commit Message:
CHEWY: Turn _tafName into a Common::String (fix coverity 1475961)

Changed paths:
    engines/chewy/detail.cpp
    engines/chewy/detail.h


diff --git a/engines/chewy/detail.cpp b/engines/chewy/detail.cpp
index 50d55c42001..bbc83e39f34 100644
--- a/engines/chewy/detail.cpp
+++ b/engines/chewy/detail.cpp
@@ -152,7 +152,7 @@ Detail::Detail() {
 	_aniFreezeflag = false;
 	_fullTaf = false;
 	_rdi.dptr = nullptr;
-	_tafName[0] = 0;
+	_tafName = "";
 	for (int16 i = 0; i < (MAXDETAILS * MAX_SOUNDS); i++) {
 		_rdi.sample[i] = nullptr;
 		_rdi.tvp_index[i] = -1;
@@ -192,7 +192,7 @@ void Detail::load_rdi(const char *fname_, int16 room_nr) {
 }
 
 void Detail::load_rdi_taf(const char *fname_, int16 load_flag) {
-	if (strcmp(_tafName, fname_)) {
+	if (_tafName.compareToIgnoreCase(fname_)) {
 		if (_rdi.dptr) {
 			if (_fullTaf) {
 				free(_rdi.dptr);
@@ -202,7 +202,7 @@ void Detail::load_rdi_taf(const char *fname_, int16 load_flag) {
 				del_taf_tbl(_rdi.dptr);
 			}
 		}
-		strcpy(_tafName, fname_);
+		_tafName = Common::String(fname_);
 		if (!load_flag) {
 			_rdi.dptr = init_taf_tbl(fname_);
 			load_taf_tbl(_rdi.dptr);
@@ -210,10 +210,8 @@ void Detail::load_rdi_taf(const char *fname_, int16 load_flag) {
 			_rdi.dptr = _G(mem)->taf_adr(fname_);
 			_fullTaf = true;
 		}
-	} else {
-		if (!_fullTaf)
-			load_taf_tbl(_rdi.dptr);
-	}
+	} else if (!_fullTaf)
+		load_taf_tbl(_rdi.dptr);
 }
 
 void Detail::del_dptr() {
@@ -223,7 +221,7 @@ void Detail::del_dptr() {
 		else {
 			del_taf_tbl(_rdi.dptr);
 			_rdi.dptr = nullptr;
-			_tafName[0] = 0;
+			_tafName = "";
 		}
 		_rdi.dptr = nullptr;
 	}
diff --git a/engines/chewy/detail.h b/engines/chewy/detail.h
index 23d4940679f..11809e90b32 100644
--- a/engines/chewy/detail.h
+++ b/engines/chewy/detail.h
@@ -264,7 +264,7 @@ private:
 	int16 _globalDelay = 0;
 	bool _aniFreezeflag = false;
 	bool _fullTaf = false;
-	char _tafName[80];
+	Common::String _tafName;
 	byte *_tafLoadBuffer = nullptr;
 	int16 _directTafAni = 0;
 };