author | rohinis |
Tue, 29 Nov 2011 17:32:55 +0000 | |
branch | s11express-2010-11 |
changeset 22234 | c23e64da3e06 |
parent 15365 | fcef8812542c |
permissions | -rw-r--r-- |
15365
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
1 |
/jds/bin/diff -uprN bug-buddy-2.25.91.old/src/bug-buddy.c bug-buddy-2.25.91/src/bug-buddy.c |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
2 |
--- bug-buddy-2.25.91.old/src/bug-buddy.c 2009-03-11 11:13:44.516038000 +0000 |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
3 |
+++ bug-buddy-2.25.91/src/bug-buddy.c 2009-03-11 11:26:00.127656000 +0000 |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
4 |
@@ -1717,13 +1717,18 @@ fill_system_info (GtkBuilder *ui) |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
5 |
modules = NULL; |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
6 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
7 |
if (uname (&uts_buf) == 0) { |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
8 |
- g_string_append_printf (system_info, "System: %s %s %s %s\n", uts_buf.sysname, uts_buf.release, uts_buf.version, uts_buf.machine); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
9 |
+ g_string_append_printf (system_info, "System: %s %s %s %s\n", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
10 |
+ (uts_buf.sysname ? uts_buf.sysname : " "), |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
11 |
+ (uts_buf.release ? uts_buf.release : " "), |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
12 |
+ (uts_buf.version ? uts_buf.version : " "), |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
13 |
+ (uts_buf.machine ? uts_buf.machine : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
14 |
} |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
15 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
16 |
/* X server checks */ |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
17 |
- g_string_append_printf (system_info, "X Vendor: %s\n", ServerVendor (gdk_display)); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
18 |
- g_string_append_printf (system_info, "X Vendor Release: %d\n", VendorRelease (gdk_display)); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
19 |
- |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
20 |
+ g_string_append_printf (system_info, "X Vendor: %s\n", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
21 |
+ (ServerVendor(gdk_display) != NULL ? ServerVendor(gdk_display) : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
22 |
+ g_string_append_printf (system_info, "X Vendor Release: %d\n", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
23 |
+ (VendorRelease(gdk_display) != NULL ? VendorRelease(gdk_display) : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
24 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
25 |
/* Selinux checks */ |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
26 |
has_selinux = FALSE; |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
27 |
@@ -1747,10 +1752,12 @@ fill_system_info (GtkBuilder *ui) |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
28 |
a11y = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
29 |
g_string_append_printf (system_info, "Accessibility: %s\n", a11y?"Enabled":"Disabled"); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
30 |
str = gconf_client_get_string (gconf_client, GTK_THEME_KEY, NULL); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
31 |
- g_string_append_printf (system_info, "GTK+ Theme: %s\n", str); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
32 |
+ g_string_append_printf (system_info, "GTK+ Theme: %s\n", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
33 |
+ (str ? str : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
34 |
g_free (str); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
35 |
str = gconf_client_get_string (gconf_client, ICON_THEME_KEY, NULL); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
36 |
- g_string_append_printf (system_info, "Icon Theme: %s\n", str); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
37 |
+ g_string_append_printf (system_info, "Icon Theme: %s\n", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
38 |
+ (str ? str : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
39 |
g_free (str); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
40 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
41 |
/* add the GTK+ loaded modules. to do that, we look both in GConf and |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
42 |
@@ -1783,7 +1790,8 @@ fill_system_info (GtkBuilder *ui) |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
43 |
name = gconf_get_key_name_from_path (gconf_entry_get_key (entry)); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
44 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
45 |
if (!g_strstr_len (modules->str, modules->len, name)) { |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
46 |
- g_string_append_printf (modules, "%s, ", name); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
47 |
+ g_string_append_printf (modules, "%s, ", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
48 |
+ (name ? name : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
49 |
} |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
50 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
51 |
g_free (name); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
52 |
@@ -1809,7 +1817,8 @@ fill_system_info (GtkBuilder *ui) |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
53 |
|
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
54 |
for (i = 0; splitted[i]; i++) { |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
55 |
if (!g_strstr_len (modules->str, modules->len, splitted[i])) { |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
56 |
- g_string_append_printf (modules, "%s, ", splitted[i]); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
57 |
+ g_string_append_printf (modules, "%s, ", |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
58 |
+ (splitted[i] ? splitted[i] : " ")); |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
59 |
} |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
60 |
} |
fcef8812542c
* base-specs/bug-buddy.spec : Add patch -04-printf-null-crash.diff
mattman
parents:
diff
changeset
|
61 |