diff options
author | Mihai Moldovan <ionic@ionic.de> | 2018-07-07 08:04:51 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-07-07 08:05:24 +0200 |
commit | 992673157077080f3d5637c7f666e43639181a91 (patch) | |
tree | 4fea0a4dd680f6e9db068ec89ec575c0e8cfb765 /nx-X11/programs/Xserver/mi | |
parent | 15f69488dc712ac93714d17d2c4e88e09de187df (diff) | |
download | nx-libs-992673157077080f3d5637c7f666e43639181a91.tar.gz nx-libs-992673157077080f3d5637c7f666e43639181a91.tar.bz2 nx-libs-992673157077080f3d5637c7f666e43639181a91.zip |
misc: fix more regressions and whitespace weirdness introduced in 913fcf1a74426725f14380dd5b34286a21c37ab7.
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r-- | nx-X11/programs/Xserver/mi/miexpose.c | 4 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/mi/mizerline.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c index a302bf578..9135d2e6e 100644 --- a/nx-X11/programs/Xserver/mi/miexpose.c +++ b/nx-X11/programs/Xserver/mi/miexpose.c @@ -766,13 +766,17 @@ int what; screenContext[i] = CreateGC((DrawablePtr)pWin, (BITS32) 0, (XID *)NULL, &status); if (!screenContext[i]) + { free(prect); return; + } numGCs++; if (!AddResource(FakeClientID(0), ResType, (void *)screenContext[i])) + { free(prect); return; + } } pGC = screenContext[i]; newValues[SUBWINDOW].val = IncludeInferiors; diff --git a/nx-X11/programs/Xserver/mi/mizerline.c b/nx-X11/programs/Xserver/mi/mizerline.c index c68e2c9a3..ee473f78d 100644 --- a/nx-X11/programs/Xserver/mi/mizerline.c +++ b/nx-X11/programs/Xserver/mi/mizerline.c @@ -158,9 +158,12 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit) pspanInit = (DDXPointPtr)malloc(list_len * sizeof(DDXPointRec)); pwidthInit = (int *)malloc(list_len * sizeof(int)); if (!pspanInit || !pwidthInit) + { free(pspanInit); free(pwidthInit); + return; + } Nspans = 0; new_span = TRUE; |