MADS: Rex - Avoid potential not null terminated buffers after the use…

… of strncpy
scummvm · Sep 28, 2014 · 62b9891 · 62b9891
1 parent 1fe9038
commit 62b9891
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
@@ -434,7 +434,7 @@ char TextView::_resourceName[100];
 
 void TextView::execute(MADSEngine *vm, const Common::String &resName) {
 	assert(resName.size() < 100);
-	strncpy(_resourceName, resName.c_str(), sizeof(_resourceName));
+	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
 	vm->_dialogs->_pendingDialog = DIALOG_TEXTVIEW;
 }
 
@@ -496,7 +496,7 @@ void TextView::processLines() {
 				processCommand();
 
 				// Copy rest of line (if any) to start of buffer
-				strncpy(_currentLine, cEnd + 1, sizeof(_currentLine));
+				Common::strlcpy(_currentLine, cEnd + 1, sizeof(_currentLine));
 
 				cStart = strchr(_currentLine, '[');
 			}
@@ -788,7 +788,7 @@ char AnimationView::_resourceName[100];
 
 void AnimationView::execute(MADSEngine *vm, const Common::String &resName) {
 	assert(resName.size() < 100);
-	strncpy(_resourceName, resName.c_str(), sizeof(_resourceName));
+	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
 	vm->_dialogs->_pendingDialog = DIALOG_ANIMVIEW;
 }