Merge pull request #16685 from unknownbrackets/replace-crash

Replacement: Verify out stride
hrydgard · Dec 31, 2022 · 71deec1 · 71deec1
2 parents fd5a27f + 152c82e
commit 71deec1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp
@@ -35,6 +35,7 @@
 #include "Common/Data/Text/I18n.h"
 #include "Common/Data/Text/Parsers.h"
 #include "Common/File/FileUtil.h"
+#include "Common/LogReporting.h"
 #include "Common/StringUtils.h"
 #include "Common/Thread/ParallelLoop.h"
 #include "Common/Thread/Waitable.h"
@@ -1278,6 +1279,10 @@ bool ReplacedTexture::Load(int level, void *out, int rowPitch) {
 
 	if (data.empty())
 		return false;
+	if (rowPitch < info.w * 4) {
+		ERROR_LOG_REPORT(G3D, "Replacement rowPitch=%d, but w=%d (level=%d)", rowPitch, info.w * 4, level);
+		return false;
+	}
 	_assert_msg_(data.size() == info.w * info.h * 4, "Data has wrong size");
 
 	if (rowPitch == info.w * 4) {