From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 1 Jun 2009 06:04:16 +0000 (+0200)
Subject: Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
X-Git-Tag: v1.6.4-rc0~63^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=492f70913e11de19bc4cb197b1fe195c645b89c9;p=git.git

Work around a regression in Windows 7, causing erase_in_line() to crash sometimes

The function FillConsoleOutputCharacterA() was pretty content in XP to take a NULL
pointer if we did not want to store the number of written columns.  In Windows 7,
it crashes, but only when called from within Git Bash, not from within cmd.exe.
Go figure.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/compat/winansi.c b/compat/winansi.c
index 44dc293ad..9217c24b4 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -80,6 +80,7 @@ static void set_console_attr(void)
 static void erase_in_line(void)
 {
 	CONSOLE_SCREEN_BUFFER_INFO sbi;
+	DWORD dummy; /* Needed for Windows 7 (or Vista) regression */
 
 	if (!console)
 		return;
@@ -87,7 +88,7 @@ static void erase_in_line(void)
 	GetConsoleScreenBufferInfo(console, &sbi);
 	FillConsoleOutputCharacterA(console, ' ',
 		sbi.dwSize.X - sbi.dwCursorPosition.X, sbi.dwCursorPosition,
-		NULL);
+		&dummy);
 }