To avoid memory corruption through string manipulation.

OpenXRay · Dec 8, 2017 · 0394afc · 0394afc
1 parent 87b3d00
commit 0394afc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Externals/openal/OpenAL-Windows/Router/alc.cpp b/Externals/openal/OpenAL-Windows/Router/alc.cpp
@@ -570,7 +570,7 @@ ALvoid CleanDeviceSpecifierList()
 	// create new list
 	while (strlen(list) > 0) 
 	{
-		strcpy_s		(newListPtr, MAX_PATH, list);
+		strcpy_s		(newListPtr, MAX_PATH - (newListPtr - newList), list);
 		advancePtr		= TRUE;
 		if (strstr(newListPtr, T2A("DirectSound3D")) != NULL) 
 		{

diff --git a/src/xrEngine/line_edit_control.cpp b/src/xrEngine/line_edit_control.cpp
@@ -765,7 +765,7 @@ void remove_spaces(pstr str)
         while (b < str_size && str[b] != ' ')
             ++b;
 
-        strncpy_s(new_str + i, str_size + 1, str + a, b - a);
+        strncpy_s(new_str + i, str_size - i + 1, str + a, b - a);
         i += (b - a);
 
         if (i < str_size)