[Scummvm-git-logs] scummvm master -> 6b7be09e8fa5329d9f3b849ca356891322fc6479

[sev-]

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

Summary:
3416ca4d1e BAGEL: Use safer string copying. CID 1544868
464f67382a BAGEL: Use safer string copying. CID 1544830
b282231a8f BAGEL: Use safer string copying. CID 1544818
52a791dd69 BAGEL: Fix printf argument. CID 1544847
6b7be09e8f BAGEL: Use correct delete operator. CID 1544845, 1544853


Commit: 3416ca4d1eea9dc5d13e649715483be3370178c2
    https://github.com/scummvm/scummvm/commit/3416ca4d1eea9dc5d13e649715483be3370178c2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-10T11:28:41+02:00

Commit Message:
BAGEL: Use safer string copying. CID 1544868

Changed paths:
    engines/bagel/boflib/gui/dialog.cpp


diff --git a/engines/bagel/boflib/gui/dialog.cpp b/engines/bagel/boflib/gui/dialog.cpp
index 60da2493055..65503d944db 100644
--- a/engines/bagel/boflib/gui/dialog.cpp
+++ b/engines/bagel/boflib/gui/dialog.cpp
@@ -87,7 +87,7 @@ ErrorCode CBofDialog::create(const char *pszName, int x, int y, int nWidth, int
 	_nID = nControlID;
 
 	// Remember the name of this window
-	strncpy(_szTitle, pszName, MAX_TITLE);
+	Common::strlcpy(_szTitle, pszName, MAX_TITLE);
 
 	// Calculate effective bounds
 	Common::Rect stRect(x, y, x + nWidth, y + nHeight);


Commit: 464f67382aba5b8c17102f2ffccea1be1db4cf45
    https://github.com/scummvm/scummvm/commit/464f67382aba5b8c17102f2ffccea1be1db4cf45
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-10T11:29:01+02:00

Commit Message:
BAGEL: Use safer string copying. CID 1544830

Changed paths:
    engines/bagel/baglib/storage_dev_win.cpp


diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp
index d178d21fcfe..e3f341f9058 100644
--- a/engines/bagel/baglib/storage_dev_win.cpp
+++ b/engines/bagel/baglib/storage_dev_win.cpp
@@ -1898,7 +1898,7 @@ bool CBagStorageDevManager::moveObject(const CBofString &sDstName, const CBofStr
 	// Find the storage device
 	if (pDstSDev->activateLocalObject(sObjName) != ERR_NONE)
 		return false;
-	
+
 	if (pSrcSDev->deactivateLocalObject(sObjName) != ERR_NONE) {
 		pDstSDev->deactivateLocalObject(sObjName);
 		return false;
@@ -1995,7 +1995,7 @@ void CBagStorageDevManager::saveObjList(StObj *pObjList, int nNumEntries) {
 
 				if (!pObj->getRefName().isEmpty()) {
 					assert(strlen(pObj->getRefName()) < MAX_OBJ_NAME);
-					strncpy((pObjList + k)->_szName, pObj->getRefName(), MAX_OBJ_NAME);
+					Common::strlcpy((pObjList + k)->_szName, pObj->getRefName(), MAX_OBJ_NAME);
 
 					// We MUST have put something in here
 					assert((pObjList + k)->_szName[0] != '\0');


Commit: b282231a8fbd10733db62d5ec2a912ce807fa474
    https://github.com/scummvm/scummvm/commit/b282231a8fbd10733db62d5ec2a912ce807fa474
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-10T11:30:33+02:00

Commit Message:
BAGEL: Use safer string copying. CID 1544818

Changed paths:
    engines/bagel/boflib/gui/window.cpp


diff --git a/engines/bagel/boflib/gui/window.cpp b/engines/bagel/boflib/gui/window.cpp
index 67bb4f540c1..593e6ef4233 100644
--- a/engines/bagel/boflib/gui/window.cpp
+++ b/engines/bagel/boflib/gui/window.cpp
@@ -135,7 +135,7 @@ ErrorCode CBofWindow::create(const char *pszName, int x, int y, int nWidth, int
 	_nID = nControlID;
 
 	// Remember the name of this window
-	strncpy(_szTitle, pszName, MAX_TITLE);
+	Common::strlcpy(_szTitle, pszName, MAX_TITLE);
 
 	// Retain screen coordinates for this window
 	_cWindowRect.setRect(x, y, x + nWidth - 1, y + nHeight - 1);


Commit: 52a791dd69dd3bb71b27a3cbf822a408c16c3191
    https://github.com/scummvm/scummvm/commit/52a791dd69dd3bb71b27a3cbf822a408c16c3191
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-10T11:34:36+02:00

Commit Message:
BAGEL: Fix printf argument. CID 1544847

Changed paths:
    engines/bagel/boflib/dat_file.cpp


diff --git a/engines/bagel/boflib/dat_file.cpp b/engines/bagel/boflib/dat_file.cpp
index be9106209e0..f9f5378c154 100644
--- a/engines/bagel/boflib/dat_file.cpp
+++ b/engines/bagel/boflib/dat_file.cpp
@@ -380,7 +380,7 @@ ErrorCode CBofDataFile::readRecord(int32 lRecNum, void *pBuf) {
 				}
 
 			} else {
-				logError(buildString("Error reading record %ld in file '%s'", lRecNum, _szFileName));
+				logError(buildString("Error reading record %d in file '%s'", lRecNum, _szFileName));
 				_errCode = ERR_FREAD;
 			}
 		}


Commit: 6b7be09e8fa5329d9f3b849ca356891322fc6479
    https://github.com/scummvm/scummvm/commit/6b7be09e8fa5329d9f3b849ca356891322fc6479
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-10T11:37:18+02:00

Commit Message:
BAGEL: Use correct delete operator. CID 1544845, 1544853

Changed paths:
    engines/bagel/spacebar/filter.cpp


diff --git a/engines/bagel/spacebar/filter.cpp b/engines/bagel/spacebar/filter.cpp
index 4ddc9c0feef..6391ec33984 100644
--- a/engines/bagel/spacebar/filter.cpp
+++ b/engines/bagel/spacebar/filter.cpp
@@ -125,7 +125,7 @@ void vilInitFilters(CBofBitmap *pBmp) {
 		CBofRect rct(0, 0, (nfile.getLength() + 1) * 7, 20);
 		paintText(pTipBmp, &rct, buff, VILDROIDTIPSTEXTSIZE, TEXT_BOLD, RGB(107, 0, 255), JUSTIFY_LEFT, FORMAT_DEFAULT);
 		nfile.close();
-		delete buff;
+		delete[] buff;
 
 		// Graffiti bitmap.
 		//
@@ -397,7 +397,7 @@ static bool VildroidFilter(CBofBitmap *pBmp, CBofRect *pRect) {
 				}
 				nfile.close();
 				CMainWindow::chipdisp = true;
-				delete buff;
+				delete[] buff;
 				break;
 			}
 			case 2: {
@@ -440,7 +440,7 @@ static bool VildroidFilter(CBofBitmap *pBmp, CBofRect *pRect) {
 				}
 				nfile.close();
 				CMainWindow::chipdisp = true;
-				delete buff;
+				delete[] buff;
 				break;
 			}
 			case 3: {