vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #12238 from brendandixon/win-cli/fixes

Browse source 
Corrected int16 overflow and buffer sizes
This commit is contained in:
Tibor Vass 2015-04-10 13:36:23 -04:00
commit 34332b8151
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
term/winconsole/console_windows.go
View file

@ -410,25 +410,25 @@ func getNumberOfChars(fromCoord COORD, toCoord COORD, screenSize COORD) uint32 {
var buffer []CHAR_INFO var buffer []CHAR_INFO
func clearDisplayRect(handle uintptr, fillChar rune, attributes WORD, fromCoord COORD, toCoord COORD, windowSize COORD) (uint32, error) { func clearDisplayRect(handle uintptr, attributes WORD, fromCoord COORD, toCoord COORD) (uint32, error) {
var writeRegion SMALL_RECT var writeRegion SMALL_RECT
writeRegion.Top = fromCoord.Y
writeRegion.Left = fromCoord.X writeRegion.Left = fromCoord.X
writeRegion.Top = fromCoord.Y
writeRegion.Right = toCoord.X writeRegion.Right = toCoord.X
writeRegion.Bottom = toCoord.Y writeRegion.Bottom = toCoord.Y
// allocate and initialize buffer // allocate and initialize buffer
width := toCoord.X - fromCoord.X + 1 width := toCoord.X - fromCoord.X + 1
height := toCoord.Y - fromCoord.Y + 1 height := toCoord.Y - fromCoord.Y + 1
size := width * height size := uint32(width) * uint32(height)
if size > 0 { if size > 0 {
for i := 0; i < int(size); i++ { buffer := make([]CHAR_INFO, size)
buffer[i].UnicodeChar = WCHAR(fillChar) for i := range buffer {
buffer[i].Attributes = attributes buffer[i] = CHAR_INFO{WCHAR(' '), attributes}
} }
// Write to buffer // Write to buffer
r, err := writeConsoleOutput(handle, buffer[:size], windowSize, COORD{X: 0, Y: 0}, &writeRegion) r, err := writeConsoleOutput(handle, buffer, COORD{X: width, Y: height}, COORD{X: 0, Y: 0}, &writeRegion)
if !r { if !r {
if err != nil { if err != nil {
return 0, err return 0, err
@ -439,18 +439,18 @@ func clearDisplayRect(handle uintptr, fillChar rune, attributes WORD, fromCoord
return uint32(size), nil return uint32(size), nil
} }
func clearDisplayRange(handle uintptr, fillChar rune, attributes WORD, fromCoord COORD, toCoord COORD, windowSize COORD) (uint32, error) { func clearDisplayRange(handle uintptr, attributes WORD, fromCoord COORD, toCoord COORD) (uint32, error) {
nw := uint32(0) nw := uint32(0)
// start and end on same line // start and end on same line
if fromCoord.Y == toCoord.Y { if fromCoord.Y == toCoord.Y {
return clearDisplayRect(handle, fillChar, attributes, fromCoord, toCoord, windowSize) return clearDisplayRect(handle, attributes, fromCoord, toCoord)
} }
// TODO(azlinux): if full screen, optimize // TODO(azlinux): if full screen, optimize
// spans more than one line // spans more than one line
if fromCoord.Y < toCoord.Y { if fromCoord.Y < toCoord.Y {
// from start position till end of line for first line // from start position till end of line for first line
n, err := clearDisplayRect(handle, fillChar, attributes, fromCoord, COORD{X: windowSize.X - 1, Y: fromCoord.Y}, windowSize) n, err := clearDisplayRect(handle, attributes, fromCoord, COORD{X: toCoord.X, Y: fromCoord.Y})
if err != nil { if err != nil {
return nw, err return nw, err
} }
@ -458,14 +458,14 @@ func clearDisplayRange(handle uintptr, fillChar rune, attributes WORD, fromCoord
// lines between // lines between
linesBetween := toCoord.Y - fromCoord.Y - 1 linesBetween := toCoord.Y - fromCoord.Y - 1
if linesBetween > 0 { if linesBetween > 0 {
n, err = clearDisplayRect(handle, fillChar, attributes, COORD{X: 0, Y: fromCoord.Y + 1}, COORD{X: windowSize.X - 1, Y: toCoord.Y - 1}, windowSize) n, err = clearDisplayRect(handle, attributes, COORD{X: 0, Y: fromCoord.Y + 1}, COORD{X: toCoord.X, Y: toCoord.Y - 1})
if err != nil { if err != nil {
return nw, err return nw, err
} }
nw += n nw += n
} }
// lines at end // lines at end
n, err = clearDisplayRect(handle, fillChar, attributes, COORD{X: 0, Y: toCoord.Y}, toCoord, windowSize) n, err = clearDisplayRect(handle, attributes, COORD{X: 0, Y: toCoord.Y}, toCoord)
if err != nil { if err != nil {
return nw, err return nw, err
} }
@ -715,9 +715,9 @@ func (term *WindowsTerminal) HandleOutputCommand(handle uintptr, command []byte)
switch value { switch value {
case 0: case 0:
start = screenBufferInfo.CursorPosition start = screenBufferInfo.CursorPosition
// end of the screen // end of the buffer
end.X = screenBufferInfo.MaximumWindowSize.X - 1 end.X = screenBufferInfo.Size.X - 1
end.Y = screenBufferInfo.MaximumWindowSize.Y - 1 end.Y = screenBufferInfo.Size.Y - 1
// cursor // cursor
cursor = screenBufferInfo.CursorPosition cursor = screenBufferInfo.CursorPosition
case 1: case 1:
@ -733,20 +733,21 @@ func (term *WindowsTerminal) HandleOutputCommand(handle uintptr, command []byte)
// start of the screen // start of the screen
start.X = 0 start.X = 0
start.Y = 0 start.Y = 0
// end of the screen // end of the buffer
end.X = screenBufferInfo.MaximumWindowSize.X - 1 end.X = screenBufferInfo.Size.X - 1
end.Y = screenBufferInfo.MaximumWindowSize.Y - 1 end.Y = screenBufferInfo.Size.Y - 1
// cursor // cursor
cursor.X = 0 cursor.X = 0
cursor.Y = 0 cursor.Y = 0
} }
if _, err := clearDisplayRange(uintptr(handle), ' ', term.screenBufferInfo.Attributes, start, end, screenBufferInfo.MaximumWindowSize); err != nil { if _, err := clearDisplayRange(uintptr(handle), term.screenBufferInfo.Attributes, start, end); err != nil {
return n, err return n, err
} }
// remember the the cursor position is 1 based // remember the the cursor position is 1 based
if err := setConsoleCursorPosition(handle, false, int16(cursor.X), int16(cursor.Y)); err != nil { if err := setConsoleCursorPosition(handle, false, int16(cursor.X), int16(cursor.Y)); err != nil {
return n, err return n, err
} }
case "K": case "K":
// [K // [K
// Clears all characters from the cursor position to the end of the line (including the character at the cursor position). // Clears all characters from the cursor position to the end of the line (including the character at the cursor position).
@ -766,7 +767,7 @@ func (term *WindowsTerminal) HandleOutputCommand(handle uintptr, command []byte)
// start is where cursor is // start is where cursor is
start = screenBufferInfo.CursorPosition start = screenBufferInfo.CursorPosition
// end of line // end of line
end.X = screenBufferInfo.MaximumWindowSize.X - 1 end.X = screenBufferInfo.Size.X - 1
end.Y = screenBufferInfo.CursorPosition.Y end.Y = screenBufferInfo.CursorPosition.Y
// cursor remains the same // cursor remains the same
cursor = screenBufferInfo.CursorPosition cursor = screenBufferInfo.CursorPosition
@ -782,15 +783,15 @@ func (term *WindowsTerminal) HandleOutputCommand(handle uintptr, command []byte)
case 2: case 2:
// start of the line // start of the line
start.X = 0 start.X = 0
start.Y = screenBufferInfo.MaximumWindowSize.Y - 1 start.Y = screenBufferInfo.CursorPosition.Y - 1
// end of the line // end of the line
end.X = screenBufferInfo.MaximumWindowSize.X - 1 end.X = screenBufferInfo.Size.X - 1
end.Y = screenBufferInfo.MaximumWindowSize.Y - 1 end.Y = screenBufferInfo.CursorPosition.Y - 1
// cursor // cursor
cursor.X = 0 cursor.X = 0
cursor.Y = screenBufferInfo.MaximumWindowSize.Y - 1 cursor.Y = screenBufferInfo.CursorPosition.Y - 1
} }
if _, err := clearDisplayRange(uintptr(handle), ' ', term.screenBufferInfo.Attributes, start, end, screenBufferInfo.MaximumWindowSize); err != nil { if _, err := clearDisplayRange(uintptr(handle), term.screenBufferInfo.Attributes, start, end); err != nil {
return n, err return n, err
} }
// remember the the cursor position is 1 based // remember the the cursor position is 1 based