libfreerdp-gdi: fix segfault in fast_index.

diff --git a/libfreerdp-core/orders.c b/libfreerdp-core/orders.c
index 079c8f1..6b99f30 100644 (file)
--- a/libfreerdp-core/orders.c
+++ b/libfreerdp-core/orders.c
@@ -443,8 +443,8 @@ INLINE uint16 update_read_glyph_fragments(STREAM* s, GLYPH_FRAGMENT** fragments,
        array_mark = NULL;
        stream_end = s->p + size;
        stream_get_mark(s, stream_start);
-       offsets = (uint8**) xmalloc(size / 2);
-       lengths = (uint16*) xmalloc(size / 2);
+       offsets = (uint8**) xmalloc(sizeof(uint8*) * size / 2);
+       lengths = (uint16*) xmalloc(sizeof(uint16) * size / 2);
        operations = (uint8*) xmalloc(size / 2);
 
        while (s->p < stream_end)

diff --git a/libfreerdp-gdi/gdi.c b/libfreerdp-gdi/gdi.c
index 39c121a..22f0e6b 100644 (file)
--- a/libfreerdp-gdi/gdi.c
+++ b/libfreerdp-gdi/gdi.c
@@ -724,6 +724,9 @@ void gdi_fast_index(rdpUpdate* update, FAST_INDEX_ORDER* fast_index)
                        bmp = bmps[j];
                        glyph = glyphs[j];
 
+                       if (bmp == NULL || glyph == NULL)
+                               continue;
+
                        gdi_BitBlt(gdi->drawing->hdc, glyph->x + x, glyph->y + y, bmp->bitmap->width,
                                        bmp->bitmap->height, bmp->hdc, 0, 0, GDI_DSPDxax);