Skip to content

post提交时，遇到url如http://ip/a/b/,没有?以及参数情况，会空指针 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hzieept wants to merge 1 commit into
base: master
Choose a base branch
from
Open

post提交时，遇到url如http://ip/a/b/,没有?以及参数情况，会空指针 #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 59 additions & 58 deletions core/src/main/java/com/bj58/argo/thirdparty/jetty/UrlEncoded.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,67 +190,68 @@ public static void decodeTo(String content, MultiMap<String> map, Charset charse
{
if (charset==null)
charset=ENCODING;

synchronized(map)
{
String key = null;
String value = null;
int mark=-1;
boolean encoded=false;
for (int i=0;i<content.length();i++)
if (content != null) {
synchronized(map)
{
char c = content.charAt(i);
switch (c)
String key = null;
String value = null;
int mark=-1;
boolean encoded=false;
for (int i=0;i<content.length();i++)
{
case '&':
int l=i-mark-1;
value = l==0?"":
(encoded?decodeString(content,mark+1,l,charset):content.substring(mark+1,i));
mark=i;
encoded=false;
if (key != null)
{
map.add(key,value);
}
else if (value!=null&&value.length()>0)
{
map.add(value,"");
}
key = null;
value=null;
if (maxKeys>0 && map.size()>maxKeys)
throw new IllegalStateException("Form too many keys");
break;
case '=':
if (key!=null)
char c = content.charAt(i);
switch (c)
{
case '&':
int l=i-mark-1;
value = l==0?"":
(encoded?decodeString(content,mark+1,l,charset):content.substring(mark+1,i));
mark=i;
encoded=false;
if (key != null)
{
map.add(key,value);
}
else if (value!=null&&value.length()>0)
{
map.add(value,"");
}
key = null;
value=null;
if (maxKeys>0 && map.size()>maxKeys)
throw new IllegalStateException("Form too many keys");
break;
key = encoded?decodeString(content,mark+1,i-mark-1,charset):content.substring(mark+1,i);
mark=i;
encoded=false;
break;
case '+':
encoded=true;
break;
case '%':
encoded=true;
break;
}
}

if (key != null)
{
int l=content.length()-mark-1;
value = l==0?"":(encoded?decodeString(content,mark+1,l,charset):content.substring(mark+1));
map.add(key,value);
}
else if (mark<content.length())
{
key = encoded
?decodeString(content,mark+1,content.length()-mark-1,charset)
:content.substring(mark+1);
if (key != null && key.length() > 0)
case '=':
if (key!=null)
break;
key = encoded?decodeString(content,mark+1,i-mark-1,charset):content.substring(mark+1,i);
mark=i;
encoded=false;
break;
case '+':
encoded=true;
break;
case '%':
encoded=true;
break;
}
}

if (key != null)
{
int l=content.length()-mark-1;
value = l==0?"":(encoded?decodeString(content,mark+1,l,charset):content.substring(mark+1));
map.add(key,value);
}
else if (mark<content.length())
{
map.add(key,"");
key = encoded
?decodeString(content,mark+1,content.length()-mark-1,charset)
:content.substring(mark+1);
if (key != null && key.length() > 0)
{
map.add(key,"");
}
}
}
}
Expand Down Expand Up @@ -1017,4 +1018,4 @@ public static byte convertHexDigit( byte c )
throw new IllegalArgumentException("!hex "+c);
return b;
}
}
}