Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
5798ac6f
Commit
5798ac6f
authored
15 years ago
by
Bryan O'Sullivan
Browse files
Options
Downloads
Plain Diff
Merge
parents
bc4444cd
77bf10c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/llsdserialize_xml.cpp
+10
-2
10 additions, 2 deletions
indra/llcommon/llsdserialize_xml.cpp
indra/llcommon/llstringtable.h
+6
-4
6 additions, 4 deletions
indra/llcommon/llstringtable.h
with
16 additions
and
6 deletions
indra/llcommon/llsdserialize_xml.cpp
+
10
−
2
View file @
5798ac6f
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
#include
<deque>
#include
<deque>
#include
"apr_base64.h"
#include
"apr_base64.h"
#include
<boost/regex.hpp>
extern
"C"
extern
"C"
{
{
...
@@ -777,10 +778,17 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
...
@@ -777,10 +778,17 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
case
ELEMENT_BINARY
:
case
ELEMENT_BINARY
:
{
{
S32
len
=
apr_base64_decode_len
(
mCurrentContent
.
c_str
());
// Regex is expensive, but only fix for whitespace in base64,
// created by python and other non-linden systems - DEV-39358
// Fortunately we have very little binary passing now,
// so performance impact shold be negligible. + poppy 2009-09-04
boost
::
regex
r
;
r
.
assign
(
"
\\
s"
);
std
::
string
stripped
=
boost
::
regex_replace
(
mCurrentContent
,
r
,
""
);
S32
len
=
apr_base64_decode_len
(
stripped
.
c_str
());
std
::
vector
<
U8
>
data
;
std
::
vector
<
U8
>
data
;
data
.
resize
(
len
);
data
.
resize
(
len
);
len
=
apr_base64_decode_binary
(
&
data
[
0
],
mCurrentContent
.
c_str
());
len
=
apr_base64_decode_binary
(
&
data
[
0
],
stripped
.
c_str
());
data
.
resize
(
len
);
data
.
resize
(
len
);
value
=
data
;
value
=
data
;
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llstringtable.h
+
6
−
4
View file @
5798ac6f
...
@@ -48,10 +48,12 @@
...
@@ -48,10 +48,12 @@
//# define STRING_TABLE_HASH_MAP 1
//# define STRING_TABLE_HASH_MAP 1
#endif
#endif
#if LL_WINDOWS
#if STRING_TABLE_HASH_MAP
#include
<hash_map>
# if LL_WINDOWS
#else
# include <hash_map>
#include
<ext/hash_map>
# else
# include <ext/hash_map>
# endif
#endif
#endif
const
U32
MAX_STRINGS_LENGTH
=
256
;
const
U32
MAX_STRINGS_LENGTH
=
256
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment