about summary refs log tree commit diff
path: root/third_party/git/compat/winansi.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/compat/winansi.c
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/compat/winansi.c')
-rw-r--r--third_party/git/compat/winansi.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/third_party/git/compat/winansi.c b/third_party/git/compat/winansi.c
index c27b20a79d91..cacd82c833a6 100644
--- a/third_party/git/compat/winansi.c
+++ b/third_party/git/compat/winansi.c
@@ -546,7 +546,7 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
 typedef struct _OBJECT_NAME_INFORMATION
 {
 	UNICODE_STRING Name;
-	WCHAR NameBuffer[FLEX_ARRAY];
+	WCHAR NameBuffer[0];
 } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
 
 #define ObjectNameInformation 1
@@ -662,20 +662,10 @@ void winansi_init(void)
  */
 HANDLE winansi_get_osfhandle(int fd)
 {
-	HANDLE ret;
-
 	if (fd == 1 && (fd_is_interactive[1] & FD_SWAPPED))
 		return hconsole1;
 	if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED))
 		return hconsole2;
 
-	ret = (HANDLE)_get_osfhandle(fd);
-
-	/*
-	 * There are obviously circumstances under which _get_osfhandle()
-	 * returns (HANDLE)-2. This is not documented anywhere, but that is so
-	 * clearly an invalid handle value that we can just work around this
-	 * and return the correct value for invalid handles.
-	 */
-	return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret;
+	return (HANDLE)_get_osfhandle(fd);
 }