Merge pull request #11330 from unknownbrackets/mac-realpath

Use a larger buffer for realpath()
hrydgard · Aug 26, 2018 · 773dba1 · 773dba1
2 parents 4cb230d + 274b1ea
commit 773dba1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
@@ -24,6 +24,7 @@
 
 #include "ppsspp_config.h"
 
+#include <memory>
 #include "FileUtil.h"
 #include "StringUtils.h"
 
@@ -152,11 +153,12 @@ std::string ResolvePath(const std::string &path) {
 		output = output.substr(4);
 	delete [] buf;
 	return output;
+
 #else
-	char buf[PATH_MAX + 1];
+	std::unique_ptr<char[]> buf(new char[PATH_MAX + 32768]);
-	if (realpath(path.c_str(), buf) == nullptr)
+	if (realpath(path.c_str(), buf.get()) == nullptr)
 		return path;
-	return buf;
+	return buf.get();
 #endif
 }
 

diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp
@@ -48,7 +48,7 @@ bool NeedsTestDiscard() {
 		return true;
 	if (!gstate.isAlphaBlendEnabled())
 		return true;
-	if (gstate.getBlendFuncA() != GE_SRCBLEND_SRCALPHA && gstate.getBlendFuncA() != GE_DSTBLEND_DOUBLESRCALPHA)
+	if (gstate.getBlendFuncA() != GE_SRCBLEND_SRCALPHA && gstate.getBlendFuncA() != GE_SRCBLEND_DOUBLESRCALPHA)
 		return true;
 	// GE_DSTBLEND_DOUBLEINVSRCALPHA is actually inverse double src alpha, and doubling zero is still zero.
 	if (gstate.getBlendFuncB() != GE_DSTBLEND_INVSRCALPHA && gstate.getBlendFuncB() != GE_DSTBLEND_DOUBLEINVSRCALPHA) {