|
 |
22b7be |
From a63ad78ed31e36dbdf3a9cd28071dcdbefce7d19 Mon Sep 17 00:00:00 2001
|
|
|
22b7be |
From: Bram Moolenaar <Bram@vim.org>
|
|
|
22b7be |
Date: Wed, 31 Aug 2022 12:01:54 +0100
|
|
|
22b7be |
Subject: [PATCH] patch 9.0.0339: no check if the return value of XChangeGC()
|
|
|
22b7be |
is NULL
|
|
|
22b7be |
|
|
|
22b7be |
Problem: No check if the return value of XChangeGC() is NULL.
|
|
|
22b7be |
Solution: Only use the return value when it is not NULL. (closes #11020)
|
|
|
22b7be |
---
|
|
|
22b7be |
src/gui_x11.c | 10 +++++++---
|
|
|
22b7be |
src/version.c | 2 ++
|
|
|
22b7be |
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
22b7be |
|
|
|
22b7be |
diff --git a/src/gui_x11.c b/src/gui_x11.c
|
|
|
22b7be |
index 6e3e903be..7293ac490 100644
|
|
|
22b7be |
--- a/src/gui_x11.c
|
|
|
22b7be |
+++ b/src/gui_x11.c
|
|
|
22b7be |
@@ -2231,10 +2231,14 @@ gui_x11_create_blank_mouse(void)
|
|
|
22b7be |
{
|
|
|
22b7be |
Pixmap blank_pixmap = XCreatePixmap(gui.dpy, gui.wid, 1, 1, 1);
|
|
|
22b7be |
GC gc = XCreateGC(gui.dpy, blank_pixmap, (unsigned long)0, (XGCValues*)0);
|
|
|
22b7be |
- XDrawPoint(gui.dpy, blank_pixmap, gc, 0, 0);
|
|
|
22b7be |
- XFreeGC(gui.dpy, gc);
|
|
|
22b7be |
+
|
|
|
22b7be |
+ if (gc != NULL)
|
|
|
22b7be |
+ {
|
|
|
22b7be |
+ XDrawPoint(gui.dpy, blank_pixmap, gc, 0, 0);
|
|
|
22b7be |
+ XFreeGC(gui.dpy, gc);
|
|
|
22b7be |
+ }
|
|
|
22b7be |
return XCreatePixmapCursor(gui.dpy, blank_pixmap, blank_pixmap,
|
|
|
22b7be |
- (XColor*)&gui.norm_pixel, (XColor*)&gui.norm_pixel, 0, 0);
|
|
|
22b7be |
+ (XColor*)&gui.norm_pixel, (XColor*)&gui.norm_pixel, 0, 0);
|
|
|
22b7be |
}
|
|
|
22b7be |
|
|
|
22b7be |
/*
|
|
|
22b7be |
--
|
|
|
22b7be |
2.39.1
|
|
|
22b7be |
|