Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a bug where + before % is ignored"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-22 08:09:32 +00:00
committed by Gerrit Code Review
parent 1ad99fb064 9e50b98428
commit 11ad605e28
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/net/UrlQuerySanitizer.java
View File

@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
*
@@ -837,15 +839,11 @@ public class UrlQuerySanitizer {
* @param string the escaped string
* @return the unescaped string.
*/
private static final Pattern plusOrPercent = Pattern.compile("[+%]");
public String unescape(String string) {
// Early exit if no escaped characters.
int firstEscape = string.indexOf('%');
if ( firstEscape < 0) {
firstEscape = string.indexOf('+');
if (firstEscape < 0) {
return string;
}
}
final Matcher matcher = plusOrPercent.matcher(string);
if (!matcher.find()) return string;
final int firstEscape = matcher.start();
int length = string.length();
@@ -855,8 +853,7 @@ public class UrlQuerySanitizer {
char c = string.charAt(i);
if (c == '+') {
c = ' ';
}
else if ( c == '%' && i + 2 < length) {
} else if (c == '%' && i + 2 < length) {
char c1 = string.charAt(i + 1);
char c2 = string.charAt(i + 2);
if (isHexDigit(c1) && isHexDigit(c2)) {