Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21264/src
Modified Files:
confirmation.c display_coverart.c main.c
Log Message:
* main.c, display_coverart.c: fixed possible access to
uninitialized pointer
* confirmation.c (cleanup): don't access free'd pointer.
Index: confirmation.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/confirmation.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- confirmation.c 9 Jun 2006 00:58:41 -0000 1.28
+++ confirmation.c 22 Feb 2007 15:05:53 -0000 1.29
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-14 19:17:48 jcs>
+/* Time-stamp: <2007-02-23 00:04:30 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -77,12 +77,13 @@
prefs_set_int("size_conf.x", defx);
prefs_set_int("size_conf.y", defy);
}
+
gtk_widget_destroy (cd->window);
+ g_free (cd->option1_key);
+ g_free (cd->option2_key);
+ g_free (cd->confirm_again_key);
+
g_hash_table_remove (id_hash, id);
-
- g_free(cd->option1_key);
- g_free(cd->option2_key);
- g_free(cd->confirm_again_key);
}
}
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display_coverart.c 21 Feb 2007 22:25:55 -0000 1.3
+++ display_coverart.c 22 Feb 2007 15:05:53 -0000 1.4
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-20 22:11:42 jcs>
+/* Time-stamp: <2007-02-23 00:04:30 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -583,13 +583,13 @@
}
g_free (progname);
- if (!g_file_test (DEFAULT_FILE, G_FILE_TEST_EXISTS))
+ if (DEFAULT_FILE && !g_file_test (DEFAULT_FILE, G_FILE_TEST_EXISTS))
{
g_free (DEFAULT_FILE);
DEFAULT_FILE = NULL;
}
- if (!g_file_test (HIGHLIGHT_FILE, G_FILE_TEST_EXISTS))
+ if (HIGHLIGHT_FILE && !g_file_test (HIGHLIGHT_FILE, G_FILE_TEST_EXISTS))
{
g_free (HIGHLIGHT_FILE);
HIGHLIGHT_FILE = NULL;
@@ -598,12 +598,16 @@
}
if (!DEFAULT_FILE)
+ {
DEFAULT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "pixmaps",
"default-cover.png", NULL);
-
- if (!HIGHLIGHT_FILE)
+ }
+ if (!HIGHLIGHT_FILE)
+ {
HIGHLIGHT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "pixmaps",
"cdshine.png", NULL);
+ }
}
+
/**
* on_cover_up_button_clicked:
*
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- main.c 20 Feb 2007 14:11:24 -0000 1.59
+++ main.c 22 Feb 2007 15:05:53 -0000 1.60
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-24 20:49:39 jcs>
+/* Time-stamp: <2007-02-23 00:05:25 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -42,7 +42,7 @@
#include "file.h"
/* path to gtkpod.glade */
-gchar *xml_file;
+gchar *xml_file = NULL;
int
main (int argc, char *argv[])
@@ -103,7 +103,7 @@
}
}
g_free (progname);
- if (!g_file_test (xml_file, G_FILE_TEST_EXISTS))
+ if (xml_file && !g_file_test (xml_file, G_FILE_TEST_EXISTS))
{
g_free (xml_file);
xml_file = NULL;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
