AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tainting bits.

Browse Source
This commit is contained in:
Michael Bayne
2009-03-05 02:18:31 +00:00
parent b677ba4aec
commit 5c89ab4564
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/getdown/launcher/AbortPanel.java
+2 -2
View File
@@ -101,8 +101,8 @@ public class AbortPanel extends JFrame
{ {
// if this string is tainted, we don't translate it, instead we // if this string is tainted, we don't translate it, instead we
// simply remove the taint character and return it to the caller // simply remove the taint character and return it to the caller
if (key.startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(key)) {
return key.substring(1); return MessageUtil.untaint(key);
} }
try { try {
return _msgs.getString(key); return _msgs.getString(key);
src/java/com/threerings/getdown/launcher/ProxyPanel.java
+2 -2
View File
@@ -131,8 +131,8 @@ public class ProxyPanel extends JPanel
{ {
// if this string is tainted, we don't translate it, instead we // if this string is tainted, we don't translate it, instead we
// simply remove the taint character and return it to the caller // simply remove the taint character and return it to the caller
if (key.startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(key)) {
return key.substring(1); return MessageUtil.untaint(key);
} }
try { try {
return _msgs.getString(key); return _msgs.getString(key);
src/java/com/threerings/getdown/launcher/StatusPanel.java
+4 -4
View File
@@ -226,8 +226,8 @@ public class StatusPanel extends JComponent
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
// if the argument is tainted, do no further translation // if the argument is tainted, do no further translation
// (it might contain |s or other fun stuff) // (it might contain |s or other fun stuff)
if (args[i].startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(args[i])) {
args[i] = MessageUtil.unescape(args[i].substring(1)); args[i] = MessageUtil.unescape(MessageUtil.untaint(args[i]));
} else { } else {
args[i] = xlate(MessageUtil.unescape(args[i])); args[i] = xlate(MessageUtil.unescape(args[i]));
} }
@@ -258,8 +258,8 @@ public class StatusPanel extends JComponent
// if this string is tainted, we don't translate it, instead we // if this string is tainted, we don't translate it, instead we
// simply remove the taint character and return it to the caller // simply remove the taint character and return it to the caller
if (key.startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(key)) {
return key.substring(1); return MessageUtil.untaint(key);
} }
try { try {
return _msgs.getString(key); return _msgs.getString(key);