I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Properties: Don't play games with \r and \n on load/save,

Browse Source 
it was causing fatal issues on DOS if your username started
      with r or n
This commit is contained in:
zzz
2010-01-21 14:19:38 +00:00
parent 09d3dc8e90
commit 5338dc5540
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/data/DataHelper.java
View File

@ -280,8 +280,13 @@ public class DataHelper {
String val = line.substring(split+1); //.trim() ?????????????? String val = line.substring(split+1); //.trim() ??????????????
// Unescape line breaks after loading. // Unescape line breaks after loading.
// Remember: "\" needs escaping both for regex and string. // Remember: "\" needs escaping both for regex and string.
val = val.replaceAll("\\\\r","\r");
val = val.replaceAll("\\\\n","\n"); // For some reason this was turning \r (one backslash) into CR,
// I think it needed one more \\ in the pattern?,
// which sucks if your username is randy on DOS,
// it was a horrible idea anyway
//val = val.replaceAll("\\\\r","\r");
//val = val.replaceAll("\\\\n","\n");
if ( (key.length() > 0) && (val.length() > 0) ) if ( (key.length() > 0) && (val.length() > 0) )
if (forceLowerCase) if (forceLowerCase)
props.setProperty(key.toLowerCase(), val); props.setProperty(key.toLowerCase(), val);

5
router/java/src/net/i2p/router/Router.java
View File

@ -1053,8 +1053,9 @@ public class Router {
String val = _config.getProperty(key); String val = _config.getProperty(key);
// Escape line breaks before saving. // Escape line breaks before saving.
// Remember: "\" needs escaping both for regex and string. // Remember: "\" needs escaping both for regex and string.
val = val.replaceAll("\\r","\\\\r"); // NOOO - see comments in DataHelper
val = val.replaceAll("\\n","\\\\n"); //val = val.replaceAll("\\r","\\\\r");
//val = val.replaceAll("\\n","\\\\n");
buf.append(key).append('=').append(val).append('\n'); buf.append(key).append('=').append(val).append('\n');
} }
} }