conhost: Improve bound checking in fill_output.

Inspired by Pengpeng Dong's patch. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

conhost: Improve bound checking in fill_output.
f3b8ccb2 · Jacek Caban · Alexandre Julliard · ebe3fe53 · f3b8ccb2
Commit f3b8ccb2 authored Sep 24, 2020 by Jacek Caban Committed by Alexandre Julliard Sep 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

conhost.c programs/conhost/conhost.c +2 -2

No files found.
--- a/programs/conhost/conhost.c
+++ b/programs/conhost/conhost.c
@@ -2168,9 +2168,9 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c

    TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode );

-    dest = screen_buffer->data + params->y * screen_buffer->width + params->x;
-
    if (params->y >= screen_buffer->height) return STATUS_SUCCESS;
+    dest = screen_buffer->data + min( params->y * screen_buffer->width + params->x,
+                                      screen_buffer->height * screen_buffer->width );

    if (params->wrap)
        end = screen_buffer->data + screen_buffer->height * screen_buffer->width;