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
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
--- orig/Object_KeyC.cpp 2005-04-08 10:17:40.978604800 +0200
+++ Object_KeyC.cpp 2005-04-08 10:17:41.879900800 +0200
@@ -37,6 +37,10 @@
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
#endif /* __BORLANDC__ */
+#include "ace/ACE.h"
+#include "ace/Numeric_Limits.h"
+#include "ace/Truncate.h"
+#include "ace/OS_NS_string.h"
+#include "ace/os_include/os_ctype.h"
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:69
@@ -88,2 +95,2 @@
TAO::ObjectKey::~ObjectKey (void)
{}
+// Hand crafted.
+
+void
+TAO::ObjectKey::encode_sequence_to_string (char * &str,
+ const TAO::unbounded_value_sequence<CORBA::Octet> &seq)
+{
+ // We must allocate a buffer which is (gag) 3 times the length
+ // of the sequence, which is the length required in the worst-case
+ // scenario of all non-printable characters.
+ //
+ // There are two strategies here...we could allocate all that space here,
+ // fill it up, then copy-allocate new space of just the right length.
+ // OR, we could just return this space. The classic time-space tradeoff,
+ // and for now we'll let time win out, which means that we only do the
+ // allocation once.
+ unsigned int const len = 3 * seq.length (); /* space for zero termination not needed */;
+ str = CORBA::string_alloc (len);
+
+ char *cp = str;
+
+ for (unsigned int i = 0;
+ cp < (str + len) && i < seq.length();
+ ++i)
+ {
+ unsigned char bt = seq[i];
+ if (is_legal (bt))
+ {
+ *cp++ = static_cast<char> (bt);
+ continue;
+ }
+
+ *cp++ = '%';
+ *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
+ *cp++ = ACE::nibble2hex (bt & 0x0f);
+ }
+ // Zero terminate
+ *cp = '\0';
+}
+
+CORBA::Boolean
+TAO::ObjectKey::is_legal (unsigned char c)
+{
+ if (isalnum(c))
+ {
+ return true;
+ }
+ else
+ {
+ return ( c == ';' || c == '/' ||c == ':' || c == '?' ||
+ c == '@' || c == '&' ||c == '=' || c == '+' ||
+ c == '$' || c == ',' ||c == '_' || c == '.' ||
+ c == '!' || c == '~' ||c == '*' || c == '\'' ||
+ c == '-' || c == '(' || c == ')' );
+ }
+}
+
+void
+TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq,
+ const char *str)
+{
+ if (str == 0)
+ {
+ seq.length (0);
+ return;
+ }
+
+ size_t const str_len = ACE_OS::strlen (str);
+
+ // Ensure sequence length value does not exceed maximum value for
+ // sequence index type (CORBA::ULong). This is mostly an issue for
+ // 64-bit MS Windows builds.
+ CORBA::ULong const len =
+ ACE_Utils::truncate_cast<CORBA::ULong> (str_len);
+
+ char const * const eos = str + len;
+ char const * cp = str;
+
+ // Set the length of the sequence to be as long as
+ // we'll possibly need...we'll reset it to the actual
+ // length later.
+ seq.length (len);
+
+ CORBA::ULong i = 0;
+ for (;
+ cp < eos && i < len;
+ ++i)
+ {
+ if (*cp == '%' || *cp == '\\')
+ {
+ // This is an escaped non-printable,
+ // so we decode the hex values into
+ // the sequence's octet
+ seq[i] = static_cast<CORBA::Octet> (ACE::hex2byte (cp[1]) << 4);
+ seq[i] |= static_cast<CORBA::Octet> (ACE::hex2byte (cp[2]));
+ cp += 3;
+ }
+ else
+ // Copy it in
+ seq[i] = *cp++;
+ }
+
+ // Set the length appropriately
+ seq.length (i);
+}
+
+/*static*/ CORBA::Boolean
+TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
+ TAO_InputCDR &strm)
+{
+ CORBA::ULong _tao_seq_len;
+
+ if (strm >> _tao_seq_len)
+ {
+ // Add a check to the length of the sequence
+ // to make sure it does not exceed the length
+ // of the stream. (See bug 58.)
+ if (_tao_seq_len > strm.length ())
+ {
+ return 0;
+ }
+
+ // Set the length of the sequence.
+ key.length (_tao_seq_len);
+
+ // If length is 0 we return true.
+ if (0 >= _tao_seq_len)
+ {
+ return 1;
+ }
+
+ // Retrieve all the elements.
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+ if (ACE_BIT_DISABLED (strm.start ()->flags (),
+ ACE_Message_Block::DONT_DELETE))
+ {
+ key.replace (_tao_seq_len, strm.start ());
+ key.mb ()->wr_ptr (key.mb()->rd_ptr () + _tao_seq_len);
+ strm.skip_bytes (_tao_seq_len);
+ return 1;
+ }
+ return strm.read_octet_array (key.get_buffer (),
+ _tao_seq_len);
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+ return strm.read_octet_array (key.get_buffer (), key.length ());
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+
+ }
+ return 0;
+}
+
#endif /* end #if !defined */
// TAO_IDL - Generated from
--- orig/Object_KeyC.h 2005-04-08 10:17:40.978604800 +0200
+++ Object_KeyC.h 2005-04-08 10:17:41.879900800 +0200
@@ -117,4 +117,23 @@
)
: TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
+
+ // Hand crafted.
+
+ static void encode_sequence_to_string (
+ char * &str,
+ const TAO::unbounded_value_sequence<CORBA::Octet> &seq
+ );
+ static void decode_string_to_sequence (
+ TAO::unbounded_value_sequence<CORBA::Octet> &seq,
+ const char *str
+ );
+ static CORBA::Boolean is_legal (unsigned char c);
+
+ /// A special method that gives no regard to how the ORB has
+ /// configured the resource factory. This will be used only
+ /// during Profile decoding and should be safe. This is a solution
+ /// for the bug report [BUG 1616]
+ static CORBA::Boolean demarshal_key (ObjectKey &key,
+ TAO_InputCDR &cdr);
};
#endif /* end #if !defined */
Index: Object_KeyC.cpp
===================================================================
--- Object_KeyC.cpp (revision 79001)
+++ Object_KeyC.cpp (working copy)
@@ -130,8 +130,8 @@
}
*cp++ = '%';
- *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
- *cp++ = ACE::nibble2hex (bt & 0x0f);
+ *cp++ = static_cast<char> (ACE::nibble2hex ((bt >> 4) & 0x0f));
+ *cp++ = static_cast<char> (ACE::nibble2hex (bt & 0x0f));
}
// Zero terminate
*cp = '\0';
|
