AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Util: Fix check for illegal chars in storeProps()

Browse Source 
ref: http://zzz.i2p/topics/3576
This commit is contained in:
zzz
2023-02-03 07:28:42 -05:00
parent 37beb53245
commit 3d71a5404b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,8 +110,8 @@ public class DataHelper {
}
}
private static final Pattern ILLEGAL_KEY = Pattern.compile("[#=\r\n;]");
private static final Pattern ILLEGAL_VALUE = Pattern.compile("[#\r\n]");
private static final Pattern ILLEGAL_KEY = Pattern.compile("[#=\\r\\n;]");
private static final Pattern ILLEGAL_VALUE = Pattern.compile("[#\\r\\n]");
/**
* The default formatting for date/time, current locale, local time zone
@@ -535,13 +535,13 @@ public class DataHelper {
for (Map.Entry<Object, Object> entry : props.entrySet()) {
String name = (String) entry.getKey();
String val = (String) entry.getValue();
if (ILLEGAL_KEY.matcher(name).matches()) {
if (ILLEGAL_KEY.matcher(name).find()) {
if (iae == null)
iae = new IllegalArgumentException("Invalid character (one of \"#;=\\r\\n\") in key: \"" +
name + "\" = \"" + val + '\"');
continue;
}
if (ILLEGAL_VALUE.matcher(val).matches()) {
if (ILLEGAL_VALUE.matcher(val).find()) {
if (iae == null)
iae = new IllegalArgumentException("Invalid character (one of \"#\\r\\n\") in value: \"" +
name + "\" = \"" + val + '\"');