summaryrefslogtreecommitdiffstats
path: root/vm/Native.c
diff options
context:
space:
mode:
authorBrian McKenna <puffnfresh@gmail.com>2009-07-19 20:49:26 +1000
committerAndy McFadden <fadden@android.com>2009-07-27 16:02:13 -0700
commitdfdaa8733814dd1a576aec0a0a735848384009df (patch)
treee5fa283c8710f70221261b48d2c5aaa5df94bbfa /vm/Native.c
parent71f15b5cdc9049f0c77b3118e914dc1e58e0c04f (diff)
downloadandroid_dalvik-dfdaa8733814dd1a576aec0a0a735848384009df.tar.gz
android_dalvik-dfdaa8733814dd1a576aec0a0a735848384009df.tar.bz2
android_dalvik-dfdaa8733814dd1a576aec0a0a735848384009df.zip
Fix mangling to translate dollar signs.
(Manually pulled from external change 10724.)
Diffstat (limited to 'vm/Native.c')
-rw-r--r--vm/Native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/Native.c b/vm/Native.c
index 71a83e28f..1892618d6 100644
--- a/vm/Native.c
+++ b/vm/Native.c
@@ -651,7 +651,7 @@ static char* mangleString(const char* str, int len)
for (i = 0; i < charLen; i++) {
u2 ch = utf16[i];
- if (ch > 127) {
+ if (ch == '$' || ch > 127) {
mangleLen += 6;
} else {
switch (ch) {
@@ -676,7 +676,7 @@ static char* mangleString(const char* str, int len)
for (i = 0, cp = mangle; i < charLen; i++) {
u2 ch = utf16[i];
- if (ch > 127) {
+ if (ch == '$' || ch > 127) {
sprintf(cp, "_0%04x", ch);
cp += 6;
} else {