From 9fe7acb20fe2c0d03dd24d7c42f77b2a6c86be9c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 22 Nov 2017 12:22:09 +0000
Subject: [PATCH] Fix some possible out of bounds access

* Reported by Coverity Scan
---
 renderdoc/driver/vulkan/vk_win32.cpp | 2 +-
 renderdoc/os/win32/win32_process.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp
index 26d2f250c..704fe10e7 100644
--- a/renderdoc/driver/vulkan/vk_win32.cpp
+++ b/renderdoc/driver/vulkan/vk_win32.cpp
@@ -214,7 +214,7 @@ bool ProcessImplicitLayersKey(HKEY key, const std::wstring &path,
 {
   bool thisRegistered = false;
 
-  wchar_t name[1024] = {};
+  wchar_t name[1025] = {};
   DWORD nameSize = 1024;
   DWORD idx = 0;
 
diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp
index 68cd33e78..787608e33 100644
--- a/renderdoc/os/win32/win32_process.cpp
+++ b/renderdoc/os/win32/win32_process.cpp
@@ -540,7 +540,7 @@ uint32_t Process::InjectIntoProcess(uint32_t pid, const rdcarray<EnvironmentModi
 
   wchar_t renderdocPathLower[MAX_PATH] = {0};
   memcpy(renderdocPathLower, renderdocPath, MAX_PATH * sizeof(wchar_t));
-  for(size_t i = 0; renderdocPathLower[i] && i < MAX_PATH; i++)
+  for(size_t i = 0; i < MAX_PATH && renderdocPathLower[i]; i++)
   {
     // lowercase
     if(renderdocPathLower[i] >= 'A' && renderdocPathLower[i] <= 'Z')