1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
only in patch2:
unchanged:
--- pinentry-0.7.5.orig/gtk+-2/gtksecentry.h
+++ pinentry-0.7.5/gtk+-2/gtksecentry.h
@@ -173,6 +173,11 @@
gtk_secure_entry_get_layout_offsets(GtkSecureEntry * entry,
gint * x, gint * y);
+gpointer secentry_malloc(gsize size);
+gpointer secentry_malloc0(gsize size);
+gpointer secentry_realloc(gpointer mem, gsize size);
+void secentry_free(gpointer mem);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
only in patch2:
unchanged:
--- pinentry-0.7.5.orig/gtk+-2/gtksecentry.c
+++ pinentry-0.7.5/gtk+-2/gtksecentry.c
@@ -270,7 +270,7 @@
gpointer
-g_malloc(gulong size)
+secentry_malloc(gsize size)
{
gpointer p;
@@ -282,13 +282,13 @@
else
p = (gpointer) malloc(size);
if (!p)
- g_error("could not allocate %ld bytes", size);
+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
return p;
}
gpointer
-g_malloc0(gulong size)
+secentry_malloc0(gsize size)
{
gpointer p;
@@ -302,13 +302,13 @@
} else
p = (gpointer) calloc(size, 1);
if (!p)
- g_error("could not allocate %ld bytes", size);
+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
return p;
}
gpointer
-g_realloc(gpointer mem, gulong size)
+secentry_realloc(gpointer mem, gsize size)
{
gpointer p;
@@ -332,13 +332,13 @@
}
if (!p)
- g_error("could not reallocate %lu bytes", (gulong) size);
+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
return p;
}
void
-g_free(gpointer mem)
+secentry_free(gpointer mem)
{
if (mem) {
if (m_is_secure(mem))
only in patch2:
unchanged:
--- pinentry-0.7.5.orig/gtk+-2/pinentry-gtk-2.c
+++ pinentry-0.7.5/gtk+-2/pinentry-gtk-2.c
@@ -473,6 +473,17 @@
int
main (int argc, char *argv[])
{
+ static GMemVTable secure = {
+ secentry_malloc,
+ secentry_realloc,
+ secentry_free,
+ NULL,
+ NULL,
+ NULL
+ };
+
+ g_mem_set_vtable (&secure);
+
pinentry_init (PGMNAME);
#ifdef FALLBACK_CURSES
|
