# HG changeset patch
# User nenolod
# Date 1170873313 28800
# Node ID 1fb44c12a8123f2f1c5e8a1edf1f9056cd3b37a9
# Parent  354389b85dce0b148f55a6cf4a69b6b5588a1dde
[svn] - avoid NULL dereference. closes mandriva #28603.

diff -r 354389b85dce -r 1fb44c12a812 ChangeLog
--- a/ChangeLog	Wed Feb 07 03:52:25 2007 -0800
+++ b/ChangeLog	Wed Feb 07 10:35:13 2007 -0800
@@ -1,3 +1,10 @@
+2007-02-07 11:52:25 +0000  Giacomo Lozito <james@develia.org>
+  revision [1314]
+  - aosd, further work on ghosd source: do not use a override_redirect=true window and give the WM information about initial pos/size of osd (prevents flickering with normal windows); now the osd won't be displayed in multiple workspaces, only in the one where it's initially triggered
+  trunk/src/aosd/ghosd.c |   38 +++++++++++++++++++++++++++++++++++++-
+  1 file changed, 37 insertions(+), 1 deletion(-)
+
+
 2007-02-07 09:10:37 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1312]
   - press F5 on not yet played stream no longer hangs.
diff -r 354389b85dce -r 1fb44c12a812 src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Wed Feb 07 03:52:25 2007 -0800
+++ b/src/vorbis/vorbis.c	Wed Feb 07 10:35:13 2007 -0800
@@ -37,7 +37,7 @@
 
 #define DEBUG
 
-#define REMOVE_NONEXISTANT_TAG(x)   if (!*x) { x = NULL; }
+#define REMOVE_NONEXISTANT_TAG(x)   if (x != NULL && !*x) { x = NULL; }
 
 #include <glib.h>
 #include <gtk/gtk.h>