Merge pull request #635 from adobe/nethip/FixFileOpenCrash

swmitra · web-flow · commit 37d0870c0c82 · 2018-04-05T09:02:58.000+05:30
Fix for 13839: Crash on opening file with error "sharing violation".
diff --git a/appshell/appshell_extensions_win.cpp b/appshell/appshell_extensions_win.cpp
@@ -913,26 +913,6 @@ std::wstring StringToWString(const std::string& str)
     return converterX.from_bytes(str);
 }
 
-class ReadFileHandle {
-	HANDLE hFile;
-public:
-	ReadFileHandle(const std::wstring& filename) {
-		hFile = CreateFile(filename.c_str(), GENERIC_READ,
-			FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-		if (INVALID_HANDLE_VALUE == hFile)
-			throw "Could not initialize read handle";
-	}
-	~ReadFileHandle() {
-		if (hFile)
-			CloseHandle(hFile);
-	}
-	operator HANDLE() {
-		return hFile;
-	}
-};
-
-
-
 int32 ReadFile(ExtensionString filename, ExtensionString& encoding, std::string& contents, bool& preserveBOM)
 {
     if (encoding == L"utf8") {
@@ -946,10 +926,13 @@ int32 ReadFile(ExtensionString filename, ExtensionString& encoding, std::string&
     if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
         return ERR_CANT_READ;
 
-    ReadFileHandle readFileHandle(filename);
-    HANDLE hFile = readFileHandle;
+    HANDLE hFile = CreateFile(filename.c_str(), GENERIC_READ,
+        FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     int32 error = NO_ERROR;
 
+    if (INVALID_HANDLE_VALUE == hFile)
+        return ConvertWinErrorCode(GetLastError());
+
     DWORD dwFileSize = GetFileSize(hFile, NULL);
 
     if (dwFileSize == 0) {
@@ -1027,6 +1010,7 @@ int32 ReadFile(ExtensionString filename, ExtensionString& encoding, std::string&
             }
         }
     }
+    CloseHandle(hFile);
     return error;
 }
 
