ogg: Fix a heap buffer overflow.

[vlc] / modules / services_discovery / xcb_apps.c

diff --git a/modules/services_discovery/xcb_apps.c b/modules/services_discovery/xcb_apps.c
index 682e9fc7f1bd0f696b7afbd083f3fb9ec5c28da8..1db34f5f96257c9328150cae93f521b33462d4bd 100644 (file)
--- a/modules/services_discovery/xcb_apps.c
+++ b/modules/services_discovery/xcb_apps.c
@@ -5,20 +5,20 @@
 /*****************************************************************************
  * Copyright © 2009 Rémi Denis-Courmont
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- ****************************************************************************/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -52,7 +52,7 @@ vlc_module_begin ()
     set_capability ("services_discovery", 0)
     set_callbacks (Open, Close)
 
-    add_shortcut ("apps")
+    add_shortcut ("apps", "screen")
 
     VLC_SD_PROBE_SUBMODULE
 vlc_module_end ()
@@ -64,13 +64,13 @@ struct services_discovery_sys_t
     xcb_atom_t        net_client_list;
     xcb_atom_t        net_wm_name;
     xcb_window_t      root_window;
-    void             *nodes;
+    void             *apps;
 };
 
 static void *Run (void *);
-static void Update (services_discovery_t *);
-static void DelItem (void *);
-static void AddDesktopItem(services_discovery_t *);
+static void UpdateApps (services_discovery_t *);
+static void DelApp (void *);
+static void AddDesktop(services_discovery_t *);
 
 static int vlc_sd_probe_Open (vlc_object_t *obj)
 {
@@ -130,7 +130,7 @@ static int Open (vlc_object_t *obj)
     }
 
     /* Add a permanent item for the entire desktop */
-    AddDesktopItem (sd);
+    AddDesktop (sd);
 
     p_sys->root_window = scr->root;
     xcb_change_window_attributes (conn, scr->root, XCB_CW_EVENT_MASK,
@@ -161,8 +161,8 @@ static int Open (vlc_object_t *obj)
         free (r);
     }
 
-    p_sys->nodes = NULL;
-    Update (sd);
+    p_sys->apps = NULL;
+    UpdateApps (sd);
 
     if (vlc_clone (&p_sys->thread, Run, sd, VLC_THREAD_PRIORITY_LOW))
         goto error;
@@ -186,7 +186,7 @@ static void Close (vlc_object_t *obj)
     vlc_cancel (p_sys->thread);
     vlc_join (p_sys->thread, NULL);
     xcb_disconnect (p_sys->conn);
-    tdestroy (p_sys->nodes, DelItem);
+    tdestroy (p_sys->apps, DelApp);
     free (p_sys);
 }
 
@@ -214,7 +214,7 @@ static void *Run (void *data)
                  const xcb_property_notify_event_t *pn =
                      (xcb_property_notify_event_t *)ev;
                  if (pn->atom == p_sys->net_client_list)
-                     Update (sd);
+                     UpdateApps (sd);
             }
             free (ev);
         }
@@ -223,6 +223,7 @@ static void *Run (void *data)
     return NULL;
 }
 
+/*** Application windows ***/
 struct app
 {
     xcb_window_t          xid; /* must be first for cmpapp */
@@ -230,7 +231,7 @@ struct app
     services_discovery_t *owner;
 };
 
-static struct app *AddItem (services_discovery_t *sd, xcb_window_t xid)
+static struct app *AddApp (services_discovery_t *sd, xcb_window_t xid)
 {
     services_discovery_sys_t *p_sys = sd->p_sys;
     char *mrl, *name;
@@ -254,8 +255,7 @@ static struct app *AddItem (services_discovery_t *sd, xcb_window_t xid)
     else
         name = NULL;
 
-    input_item_t *item = input_item_NewWithType (VLC_OBJECT (sd), mrl,
-                                                 name ? name : mrl,
+    input_item_t *item = input_item_NewWithType (mrl, name ? name : mrl,
                                                  0, NULL, 0, -1,
                                                  ITEM_TYPE_CARD /* FIXME */);
     free (mrl);
@@ -276,7 +276,7 @@ static struct app *AddItem (services_discovery_t *sd, xcb_window_t xid)
     return app;
 }
 
-static void DelItem (void *data)
+static void DelApp (void *data)
 {
     struct app *app = data;
 
@@ -297,7 +297,7 @@ static int cmpapp (const void *a, const void *b)
     return 0;
 } 
 
-static void Update (services_discovery_t *sd)
+static void UpdateApps (services_discovery_t *sd)
 {
     services_discovery_sys_t *p_sys = sd->p_sys;
     xcb_connection_t *conn = p_sys->conn;
@@ -312,7 +312,7 @@ static void Update (services_discovery_t *sd)
 
     xcb_window_t *ent = xcb_get_property_value (r);
     int n = xcb_get_property_value_length (r) / 4;
-    void *newnodes = NULL, *oldnodes = p_sys->nodes;
+    void *newnodes = NULL, *oldnodes = p_sys->apps;
 
     for (int i = 0; i < n; i++)
     {
@@ -327,27 +327,28 @@ static void Update (services_discovery_t *sd)
         }
         else /* new entry */
         {
-            app = AddItem (sd, id);
+            app = AddApp (sd, id);
             if (app == NULL)
                 continue;
         }
 
         pa = tsearch (app, &newnodes, cmpapp);
         if (pa == NULL /* OOM */ || *pa != app /* buggy window manager */)
-            DelItem (app);
+            DelApp (app);
     }
     free (r);
 
     /* Remove old nodes */
-    tdestroy (oldnodes, DelItem);
-    p_sys->nodes = newnodes;
+    tdestroy (oldnodes, DelApp);
+    p_sys->apps = newnodes;
 }
 
-static void AddDesktopItem(services_discovery_t *sd)
+/*** Whole desktop ***/
+static void AddDesktop(services_discovery_t *sd)
 {
     input_item_t *item;
 
-    item = input_item_NewWithType (VLC_OBJECT (sd), "screen://", _("Desktop"),
+    item = input_item_NewWithType ("screen://", _("Desktop"),
                                    0, NULL, 0, -1, ITEM_TYPE_CARD);
     if (item == NULL)
         return;