Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 11:25:30 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #411 from johnjaylward/JSONPointerTrailingSlash

Browse Source 
Fix for invalid processing of trailing / for JSON Pointer
This commit is contained in:
Sean Leary 2018-03-27 07:44:48 -05:00 committed by GitHub
commit bfb300835f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
JSONPointer.java
View File

@ -158,9 +158,28 @@ public class JSONPointer {
throw new IllegalArgumentException("a JSON pointer should start with '/' or '#/'"); throw new IllegalArgumentException("a JSON pointer should start with '/' or '#/'");
} }
this.refTokens = new ArrayList<String>(); this.refTokens = new ArrayList<String>();
for (String token : refs.split("/")) { int slashIdx = -1;
this.refTokens.add(unescape(token)); int prevSlashIdx = 0;
} do {
prevSlashIdx = slashIdx + 1;
slashIdx = refs.indexOf('/', prevSlashIdx);
if(prevSlashIdx == slashIdx || prevSlashIdx == refs.length()) {
// found 2 slashes in a row ( obj//next )
// or single slash at the end of a string ( obj/test/ )
this.refTokens.add("");
} else if (slashIdx >= 0) {
final String token = refs.substring(prevSlashIdx, slashIdx);
this.refTokens.add(unescape(token));
} else {
// last item after separator, or no separator at all.
final String token = refs.substring(prevSlashIdx);
this.refTokens.add(unescape(token));
}
} while (slashIdx >= 0);
// using split does not take into account consecutive separators or "ending nulls"
//for (String token : refs.split("/")) {
// this.refTokens.add(unescape(token));
//}
} }
public JSONPointer(List<String> refTokens) { public JSONPointer(List<String> refTokens) {