patch: fix some UBs

dima424658 · May 17, 2024 · ac67f2d · ac67f2d
1 parent 43a86f9
commit ac67f2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/libsrc/cpptools/hashset.h b/libsrc/cpptools/hashset.h
@@ -470,7 +470,7 @@ inline BOOL cHashSetBase::IsEmpty() const
 
 inline tHashSetHandle cHashSetBase::FindIndex(tHashSetKey a) const
 {
-    tHashSetHandle h;
+    tHashSetHandle h = {};
     h.Index = Hash(a) % m_nPts;
 
     h.pPrev = 0;

diff --git a/libsrc/cpptools/splitpat.cpp b/libsrc/cpptools/splitpat.cpp
@@ -443,8 +443,7 @@ BOOL cPathSplitter::DoSplitTo(eComponent /* SplitToComponent */)
         }
     else
         {
-        char buffer[256];
-        sprintf(buffer, "Drive not found (%d && %d)", !!(pScan >= pcszTarget), !!(*pScan == ':'));
+        sprintf(buffer, "Drive not found (%d && %d)", !!(pScan >= pcszTarget), !!(pScan >= pcszTarget && *pScan == ':'));
         DebugStr(buffer);
         Drive.IfNotFoundAssumeZeroLenAt(pEndDrive);
         }

diff --git a/libsrc/namedres/pathutil.cpp b/libsrc/namedres/pathutil.cpp
@@ -18,7 +18,7 @@ void GetNormalizedPath(const char* pOldPath, char** ppNewPath)
 	}
 
 	auto nameLen = strlen(pOldPath);
-	auto lastChar = pOldPath[nameLen - 1];
+	auto lastChar = nameLen ? pOldPath[nameLen - 1] : '\0';
 	auto needSlash = false;
 
 	if (lastChar != '\\' && lastChar != '/')