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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
$NetBSD: patch-ab,v 1.4 2007/02/20 15:08:59 rillig Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=410002
Though shalt not use void pointers in arithmetics.
NB: Cleaning up the rest of the code is left to the upstream authors as
an exercise.
--- src/orb/orb-core/corba-any.c.orig Mon Jan 1 18:01:32 2007
+++ src/orb/orb-core/corba-any.c Tue Feb 20 07:51:28 2007
@@ -3,6 +3,13 @@
#include "orb-core-private.h"
#include <string.h>
+#define PTR_PLUS(ptr, offset) \
+ ((gpointer) (((guchar *)(ptr)) + (offset)))
+
+/** Adds the size of TYPE to the gpointer PTR. */
+#define ADDSIZE(ptr, type) \
+ ((gpointer) (((guchar *)(ptr)) + sizeof (type)))
+
#define SKIP_ALIAS(tc) \
while ((tc)->kind == CORBA_tk_alias) { (tc) = (tc)->subtypes [0]; }
@@ -162,12 +171,12 @@
int offset;
for (i = offset = 0; i < tc->sub_parts; i++) {
offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
- *val = val0 + offset;
+ *val = PTR_PLUS (val0, offset);
ORBit_marshal_value (buf, val, tc->subtypes[i]);
offset += ORBit_gather_alloc_info (tc->subtypes[i]);
}
offset = ALIGN_VALUE (offset, tc->c_align);
- *val = val0 + offset;
+ *val = PTR_PLUS (val0, offset);
break;
}
case CORBA_tk_union: {
@@ -183,14 +192,14 @@
for (i = 0; i < tc->sub_parts; i++)
sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i]));
- *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
- tc->c_align);
+ *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
+ tc->c_align));
body = *val;
ORBit_marshal_value (buf, &body, subtc);
/* FIXME:
* WATCHOUT: end of subtc may not be end of union
*/
- *val = *val + ALIGN_VALUE (sz, tc->c_align);
+ *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align));
break;
}
case CORBA_tk_wstring: {
@@ -536,13 +545,13 @@
gpointer val0 = *val;
for (i = offset = 0; i < tc->sub_parts; i++) {
offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
- *val = val0 + offset;
+ *val = PTR_PLUS (val0, offset);
if (ORBit_demarshal_value (tc->subtypes[i], val, buf, orb))
return TRUE;
offset += ORBit_gather_alloc_info (tc->subtypes[i]);
}
offset = ALIGN_VALUE (offset, tc->c_align);
- *val = val0 + offset;
+ *val = PTR_PLUS (val0, offset);
break;
}
case CORBA_tk_union: {
@@ -560,14 +569,14 @@
for (i = 0; i < tc->sub_parts; i++)
sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i]));
- *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
- tc->c_align);
+ *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
+ tc->c_align));
body = *val;
if (ORBit_demarshal_value (subtc, &body, buf, orb))
return TRUE;
/* WATCHOUT: end subtc body may not be end of union */
- *val = *val + ALIGN_VALUE (sz, tc->c_align);
+ *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align));
break;
}
case CORBA_tk_string:
@@ -860,14 +869,14 @@
for (i = offset = 0; i < tc->sub_parts; i++) {
offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
- *val = val0 + offset;
- *newval = ((guchar *)newval0 + offset);
+ *val = PTR_PLUS (val0, offset);
+ *newval = PTR_PLUS (newval0, offset);
ORBit_copy_value_core (val, newval, tc->subtypes[i]);
offset += ORBit_gather_alloc_info (tc->subtypes[i]);
}
offset = ALIGN_VALUE (offset, tc->c_align);
- *val = val0 + offset;
- *newval = newval0 + offset;
+ *val = PTR_PLUS (val0, offset);
+ *newval = PTR_PLUS (newval0, offset);
break;
}
case CORBA_tk_union: {
@@ -876,6 +885,7 @@
CORBA_TypeCode utc;
gint union_align = tc->c_align;
size_t union_size = ORBit_gather_alloc_info (tc);
+ size_t aligned_size;
pval1 = *val;
pval2 = *newval;
@@ -884,9 +894,10 @@
ORBit_copy_value_core (&pval1, &pval2, tc->discriminator);
- pval1 = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
+ aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
union_align);
- pval2 = newval0 + (pval1 - val0);
+ pval1 = PTR_PLUS (val0, aligned_size);
+ pval2 = PTR_PLUS (newval0, aligned_size);
ORBit_copy_value_core (&pval1, &pval2, utc);
@@ -1044,8 +1055,8 @@
for (i = offset = 0; i < tc->sub_parts; i++) {
offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align);
- *a = a0 + offset;
- *b = b0 + offset;
+ *a = PTR_PLUS (a0, offset);
+ *b = PTR_PLUS (b0, offset);
if (!ORBit_value_equivalent (a, b, tc->subtypes [i], ev))
return FALSE;
offset += ORBit_gather_alloc_info (tc->subtypes[i]);
@@ -1052,8 +1063,8 @@
}
offset = ALIGN_VALUE (offset, tc->c_align);
- *a = a0 + offset;
- *b = b0 + offset;
+ *a = PTR_PLUS (a0, offset);
+ *b = PTR_PLUS (b0, offset);
return TRUE;
}
@@ -1084,6 +1095,7 @@
gint union_align = tc->c_align;
size_t union_size = ORBit_gather_alloc_info (tc);
gpointer a_orig, b_orig;
+ size_t aligned_size;
a_orig = *a;
b_orig = *b;
@@ -1097,9 +1109,10 @@
if (!ORBit_value_equivalent (a, b, tc->discriminator, ev))
return FALSE;
- *a = a_orig + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
+ aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator),
union_align);
- *b = b_orig + (*a - a_orig);
+ *a = PTR_PLUS (a_orig, aligned_size);
+ *b = PTR_PLUS (b_orig, aligned_size);
if (!ORBit_value_equivalent (a, b, utc_a, ev))
return FALSE;
|
