From 9a839bc66114c37e86cd6056997317d552619ad6 Mon Sep 17 00:00:00 2001
From: Richard Grenville <pyxlcy@gmail.com>
Date: Sun, 23 Sep 2012 11:49:02 +0800
Subject: Misc: Fix two memory leaks

- Fix two small memory leaks. valgrind detects another memory leak
  possibly caused by XGetTextProperty(), probably a bug in libX11, I
  couldn't fix that one.

- Use predefined atoms in Xatom.h to replace a few XInternAtom() calls.
---
 compton.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/compton.c b/compton.c
index c6c6279dc..8945c7749 100644
--- a/compton.c
+++ b/compton.c
@@ -986,6 +986,7 @@ root_tile_f(Display *dpy) {
   pixmap = None;
 
   for (p = 0; background_props[p]; p++) {
+    prop = NULL;
     if (XGetWindowProperty(dpy, root,
           XInternAtom(dpy, background_props[p], False),
           0, 4, False, AnyPropertyType, &actual_type,
@@ -997,7 +998,8 @@ root_tile_f(Display *dpy) {
       XFree(prop);
       fill = False;
       break;
-    }
+    } else if (prop)
+      XFree(prop);
   }
 
   if (!pixmap) {
@@ -2178,6 +2180,9 @@ finish_destroy_win(Display *dpy, Window id) {
       free_picture(dpy, &w->frame_alpha_pict);
       free_picture(dpy, &w->shadow_pict);
       free_damage(dpy, &w->damage);
+      free(w->name);
+      free(w->class_instance);
+      free(w->class_general);
 
       free(w);
       break;
@@ -3005,10 +3010,10 @@ get_atoms(void) {
   extents_atom = XInternAtom(dpy, "_NET_FRAME_EXTENTS", False);
   opacity_atom = XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False);
   frame_extents_atom = XInternAtom(dpy, "_NET_FRAME_EXTENTS", False);
-  client_atom = XInternAtom(dpy, "WM_CLASS", False);
-  name_atom = XInternAtom(dpy, "WM_NAME", False);
+  client_atom = XA_WM_CLASS;
+  name_atom = XA_WM_NAME;
   name_ewmh_atom = XInternAtom(dpy, "_NET_WM_NAME", False);
-  class_atom = XInternAtom(dpy, "WM_CLASS", False);
+  class_atom = XA_WM_CLASS;
 
   win_type_atom = XInternAtom(dpy,
     "_NET_WM_WINDOW_TYPE", False);
-- 
cgit v1.2.1