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
176
177
178
179
180
181
182
|
--- a/session.cpp
+++ b/session.cpp
@@ -131,7 +131,7 @@
throw CursorException("Cursor is not opened");
}
fillBuffer(sizeof(oid_t));
- oid_t currOid = *(oid_t*)&sockBuf[bufPos];
+ oid_t currOid = *(oid_t*)(sockBuf + bufPos);
bufPos += sizeof(oid_t);
if (currObj != NULL) {
delete[] currObj;
@@ -139,7 +139,7 @@
}
if (currOid != 0) {
fillBuffer(sizeof(int));
- size_t size = *(int*)&sockBuf[bufPos];
+ size_t size = *(int*)(sockBuf + bufPos);
if (size <= SOCKET_BUFFER_SIZE) {
fillBuffer(size);
if (record != NULL) {
--- a/database.cpp
+++ b/database.cpp
@@ -739,40 +739,55 @@
return;
case dbvmInvokeMethodBool:
- execute(expr->ref.base, iattr, sattr);
- expr->ref.field->method->invoke(sattr.base, &sattr.bvalue);
- sattr.bvalue = *(bool*)&sattr.bvalue;
- iattr.free(sattr);
- return;
+ {
+ bool val;
+ execute(expr->ref.base, iattr, sattr);
+ expr->ref.field->method->invoke(sattr.base, &val);
+ sattr.bvalue = val;
+ iattr.free(sattr);
+ return;
+ }
case dbvmInvokeMethodInt1:
- execute(expr->ref.base, iattr, sattr);
- expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
- sattr.ivalue = *(int1*)&sattr.ivalue;
- iattr.free(sattr);
- return;
+ {
+ int1 val;
+ execute(expr->ref.base, iattr, sattr);
+ expr->ref.field->method->invoke(sattr.base, &val);
+ sattr.ivalue = val;
+ iattr.free(sattr);
+ return;
+ }
case dbvmInvokeMethodInt2:
- execute(expr->ref.base, iattr, sattr);
- expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
- sattr.ivalue = *(int2*)&sattr.ivalue;
- iattr.free(sattr);
- return;
+ {
+ int2 val;
+ execute(expr->ref.base, iattr, sattr);
+ expr->ref.field->method->invoke(sattr.base, &val);
+ sattr.ivalue = val;
+ iattr.free(sattr);
+ return;
+ }
case dbvmInvokeMethodInt4:
- execute(expr->ref.base, iattr, sattr);
- expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
- sattr.ivalue = *(int4*)&sattr.ivalue;
- iattr.free(sattr);
- return;
+ {
+ int4 val;
+ execute(expr->ref.base, iattr, sattr);
+ expr->ref.field->method->invoke(sattr.base, &val);
+ sattr.ivalue = val;
+ iattr.free(sattr);
+ return;
+ }
case dbvmInvokeMethodInt8:
execute(expr->ref.base, iattr, sattr);
expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
iattr.free(sattr);
return;
case dbvmInvokeMethodReal4:
- execute(expr->ref.base, iattr, sattr);
- expr->ref.field->method->invoke(sattr.base, &sattr.fvalue);
- sattr.fvalue = *(real4*)&sattr.fvalue;
- iattr.free(sattr);
- return;
+ {
+ real4 val;
+ execute(expr->ref.base, iattr, sattr);
+ expr->ref.field->method->invoke(sattr.base, &val);
+ sattr.fvalue = val;
+ iattr.free(sattr);
+ return;
+ }
case dbvmInvokeMethodReal8:
execute(expr->ref.base, iattr, sattr);
expr->ref.field->method->invoke(sattr.base, &sattr.fvalue);
@@ -792,28 +807,43 @@
return;
case dbvmInvokeSelfMethodBool:
- expr->ref.field->method->invoke(iattr.record, &sattr.bvalue);
- sattr.bvalue = *(bool*)&sattr.bvalue;
- return;
+ {
+ bool val;
+ expr->ref.field->method->invoke(iattr.record, &val);
+ sattr.bvalue = val;
+ return;
+ }
case dbvmInvokeSelfMethodInt1:
- expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
- sattr.ivalue = *(int1*)&sattr.ivalue;
- return;
+ {
+ int1 val;
+ expr->ref.field->method->invoke(iattr.record, &val);
+ sattr.ivalue = val;
+ return;
+ }
case dbvmInvokeSelfMethodInt2:
- expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
- sattr.ivalue = *(int2*)&sattr.ivalue;
- return;
+ {
+ int2 val;
+ expr->ref.field->method->invoke(iattr.record, &val);
+ sattr.ivalue = val;
+ return;
+ }
case dbvmInvokeSelfMethodInt4:
- expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
- sattr.ivalue = *(int4*)&sattr.ivalue;
- return;
+ {
+ int4 val;
+ expr->ref.field->method->invoke(iattr.record, &val);
+ sattr.ivalue = val;
+ return;
+ }
case dbvmInvokeSelfMethodInt8:
expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
return;
case dbvmInvokeSelfMethodReal4:
- expr->ref.field->method->invoke(iattr.record, &sattr.fvalue);
- sattr.fvalue = *(real4*)&sattr.fvalue;
- return;
+ {
+ real4 val;
+ expr->ref.field->method->invoke(iattr.record, &val);
+ sattr.fvalue = *(real4*)&sattr.fvalue;
+ return;
+ }
case dbvmInvokeSelfMethodReal8:
expr->ref.field->method->invoke(iattr.record, &sattr.fvalue);
return;
--- a/server.cpp
+++ b/server.cpp
@@ -2097,7 +2097,7 @@
bufUsed = 0;
}
oid_t oid = cursor.getOid();
- *(oid_t*)&buf[bufUsed] = oid;
+ *(oid_t*)(buf + bufUsed) = oid;
bufUsed += sizeof(oid_t);
dbRecord* record = db->getRow(tie, oid);
size_t size = record->size;
@@ -2129,7 +2129,7 @@
bufUsed = 0;
}
}
- *(oid_t*)&buf[bufUsed] = 0;
+ *(oid_t*)(buf + bufUsed) = 0;
return session->sock->write(buf, bufUsed + sizeof(oid_t));
}
|
GitWeb