1
0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 08:26:10 +00:00

Prevent NPE parsing NULL queries in OAuth2 redirected URIs

This commit is contained in:
David A. Velasco 2017-08-29 10:53:28 +02:00 committed by davigonz
parent 2d35b00273
commit f3a2c05efa

View File

@ -45,26 +45,28 @@ public class OAuth2QueryParser {
public Map<String, String> parse(String query) { public Map<String, String> parse(String query) {
mOAuth2ParsedAuthorizationResponse.clear(); mOAuth2ParsedAuthorizationResponse.clear();
String[] pairs = query.split("&"); if (query != null) {
int i = 0; String[] pairs = query.split("&");
String key = ""; int i = 0;
String value; String key = "";
while (pairs.length > i) { String value;
int j = 0; while (pairs.length > i) {
String[] part = pairs[i].split("="); int j = 0;
while (part.length > j) { String[] part = pairs[i].split("=");
String p = part[j]; while (part.length > j) {
if (j == 0) { String p = part[j];
key = p; if (j == 0) {
} else if (j == 1) { key = p;
value = p; } else if (j == 1) {
mOAuth2ParsedAuthorizationResponse.put(key, value); value = p;
} mOAuth2ParsedAuthorizationResponse.put(key, value);
}
Log_OC.v(TAG, "[" + i + "," + j + "] = " + p); Log_OC.v(TAG, "[" + i + "," + j + "] = " + p);
j++; j++;
}
i++;
} }
i++;
} }
return mOAuth2ParsedAuthorizationResponse; return mOAuth2ParsedAuthorizationResponse;