diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-10-17 20:33:25 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-10-17 20:33:25 -0700 |
| commit | 4ddda1554f4de12bda15314a723bcb49d2f5dc11 (patch) | |
| tree | 69b3fab505388fd1c898f8bc83e144e9b3687533 /xorg | |
| parent | e8c61af8384f33d3d9ef53983f35d6a6badc6cc3 (diff) | |
| download | xrdp-proprietary-4ddda1554f4de12bda15314a723bcb49d2f5dc11.tar.gz xrdp-proprietary-4ddda1554f4de12bda15314a723bcb49d2f5dc11.zip | |
Xorg: fix crash in randr
Diffstat (limited to 'xorg')
| -rw-r--r-- | xorg/server/module/rdpRandR.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg/server/module/rdpRandR.c b/xorg/server/module/rdpRandR.c index 37577645..220774e3 100644 --- a/xorg/server/module/rdpRandR.c +++ b/xorg/server/module/rdpRandR.c @@ -119,8 +119,9 @@ rdpRRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, pScreen->mmWidth = mmWidth; pScreen->mmHeight = mmHeight; screenPixmap = pScreen->GetScreenPixmap(pScreen); - g_free(dev->pfbMemory); - dev->pfbMemory = (char *) g_malloc(dev->sizeInBytes, 1); + g_free(dev->pfbMemory_alloc); + dev->pfbMemory_alloc = (char *) g_malloc(dev->sizeInBytes + 16, 1); + dev->pfbMemory = (char *) RDPALIGN(dev->pfbMemory_alloc, 16); if (screenPixmap != 0) { pScreen->ModifyPixmapHeader(screenPixmap, width, height, |