X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=3d7e10e1fc50e571c23c2915a3eaa2222288af0e;hb=1f49d9c7d5b90d7055078f8b3364a5d3c0284499;hp=b36aee19ee0d44853c7cf5e0a5851d4adfbb9a7b;hpb=27b329267cb4709ee2c72aa0bd88379373d8df69;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index b36aee1..3d7e10e 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -647,7 +647,6 @@ struct ewmh_hint {
 };
 
 /* function prototypes */
-xcb_char2b_t *char2b(const char *);
 int	 conf_load(char *, int);
 void	 constrain_window(struct ws_win *, struct swm_region *, int);
 void	 do_sync(void);
@@ -672,26 +671,6 @@ void	 update_window(struct ws_win *);
 char	*get_atom_name(xcb_atom_t);
 #endif
 
-/* function definitions */
-xcb_char2b_t *
-char2b(const char *str)
-{
-	xcb_char2b_t	*s;
-	size_t		i, len;
-
-	len = strlen(str);
-	s = malloc(len * sizeof(xcb_char2b_t));
-	if (!s)
-		return (NULL);
-
-	for (i = 0; i < len; i++) {
-		s[i].byte1 = '\0';
-		s[i].byte2 = str[i];
-	}
-
-	return (s);
-}
-
 int
 parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
 {
@@ -841,6 +820,8 @@ teardown_ewmh(void)
 		pc = xcb_get_property(conn, 0, screens[i].root, sup_check,
 		    XCB_ATOM_WINDOW, 0, 1);
 		pr = xcb_get_property_reply(conn, pc, NULL);
+		if (!pr)
+			continue;
 		if (pr->format == sup_check) {
 			id = *((xcb_window_t *)xcb_get_property_value(pr));
 
@@ -2220,6 +2201,8 @@ fake_keypress(struct ws_win *win, xcb_keysym_t keysym, uint16_t modifiers)
 	event.response_type = XCB_KEY_RELEASE;
 	xcb_send_event(conn, 1, win->id,
 	    XCB_EVENT_MASK_KEY_RELEASE, (const char *)&event);
+
+	free(keycode);
 }
 
 void
@@ -2320,8 +2303,10 @@ find_window(xcb_window_t id)
 		return (NULL);
 
 	/* if we were looking for the parent return that window instead */
-	if (r->parent == 0 || r->root == r->parent)
+	if (r->parent == 0 || r->root == r->parent) {
+		free(r);
 		return (NULL);
+	}
 
 	/* look for parent */
 	for (i = 0; i < num_screens; i++)
@@ -3751,12 +3736,10 @@ get_win_name(xcb_window_t win)
 	if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
 		if (r.name_len > 0) {
 			name = malloc(r.name_len + 1);
-			if (!name) {
-				xcb_icccm_get_text_property_reply_wipe(&r);
-				return (NULL);
+			if (name) {
+				memcpy(name, r.name, r.name_len);
+				name[r.name_len] = '\0';
 			}
-			memcpy(name, r.name, r.name_len);
-			name[r.name_len] = '\0';
 		}
 		xcb_icccm_get_text_property_reply_wipe(&r);
 	}
@@ -5529,7 +5512,7 @@ updatenumlockmask(void)
 {
 	unsigned int				i, j;
 	xcb_get_modifier_mapping_reply_t	*modmap_r;
-	xcb_keycode_t				*modmap, kc;
+	xcb_keycode_t				*modmap, kc, *keycode;
 
 	DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
 	numlockmask = 0;
@@ -5543,10 +5526,11 @@ updatenumlockmask(void)
 			for (j = 0; j < modmap_r->keycodes_per_modifier; j++) {
 				kc = modmap[i * modmap_r->keycodes_per_modifier
 				    + j];
-
-				if (kc == *((xcb_keycode_t *)xcb_key_symbols_get_keycode(syms,
-				    XK_Num_Lock)))
+				keycode = xcb_key_symbols_get_keycode(syms,
+						XK_Num_Lock);
+				if (kc == *keycode)  
 					numlockmask = (1 << i);
+				free(keycode);
 			}
 		}
 		free(modmap_r);
@@ -5581,6 +5565,7 @@ grabkeys(void)
 					    kp->mod | modifiers[j],
 					    *code, XCB_GRAB_MODE_ASYNC,
 					    XCB_GRAB_MODE_ASYNC);
+				free(code);
 		}
 	}
 }
@@ -6443,6 +6428,8 @@ get_ws_idx(xcb_window_t id)
 		xcb_get_property(conn, 0, id, a_swm_ws,
 		    XCB_ATOM_STRING, 0, SWM_PROPLEN),
 		NULL);
+	if (!gpr)
+		return (-1);
 	if (gpr->type) {
 		proplen = xcb_get_property_value_length(gpr);
 		if (proplen > 0) {
@@ -6464,6 +6451,7 @@ get_ws_idx(xcb_window_t id)
 			DNPRINTF(SWM_D_PROP, "get_ws_idx: window: #%s: %s",
 			    errstr, prop);
 		}
+		free(prop);
 	}
 
 	return ws_idx;
@@ -7115,7 +7103,7 @@ maprequest(xcb_map_request_event_t *e)
 char *
 get_atom_name(xcb_atom_t atom)
 {
-	char				*name;
+	char				*name = NULL;
 	size_t				len;
 	xcb_get_atom_name_reply_t	*r;
 
@@ -7129,14 +7117,12 @@ get_atom_name(xcb_atom_t atom)
 			if (name) {
 				memcpy(name, xcb_get_atom_name_name(r), len);
 				name[len] = '\0';
-
-				return name;
 			}
 		}
 		free(r);
 	}
 
-	return NULL;
+	return (name);
 }
 #endif