Skip to content
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

Fixed [Issue #12] [Issue #16] #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed [Issue #12] [Issue #16] #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77be817
[Issue #16] Updated process colon to solve StringIndexOutOfBoundsExce…
Jul 3, 2017
9f26721
[Issue #16] Updated process colon to solve StringIndexOutOfBoundsExce…
Jul 3, 2017
d405160
[Issue #12] Fixed StringIndexOutOfBoundsException when given 'http://…
Jul 3, 2017
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
16 changes: 11 additions & 5 deletions url-detector/src/main/java/com/linkedin/urls/detection/UrlDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ private void readDefault() {
while (!_reader.eof()) {
//read the next char to process.
char curr = _reader.read();

switch (curr) {
case ' ':
//space was found, check if it's a valid single level domain.
Expand Down Expand Up @@ -277,10 +276,16 @@ private void readDefault() {
private int processColon(int length) {
if (_hasScheme) {
//read it as username/password if it has scheme
if (!readUserPass(length) && _buffer.length() > 0) {
if (!readUserPass(length)) {
//unread the ":" so that the domain reader can process it
_reader.goBack();
_buffer.delete(_buffer.length() - 1, _buffer.length());

// Check buffer length before clearing it; set length to 0 if buffer is empty
if (_buffer.length() > 0) {
_buffer.delete(_buffer.length() - 1, _buffer.length());
} else {
length = 0;
}

int backtrackOnFail = _reader.getPosition() - _buffer.length() + length;
if (!readDomainName(_buffer.substring(length))) {
Expand All @@ -289,6 +294,8 @@ private int processColon(int length) {
readEnd(ReadEndState.InvalidUrl);
}
length = 0;
} else {
length = 0;
}
} else if (readScheme() && _buffer.length() > 0) {
_hasScheme = true;
Expand Down Expand Up @@ -470,10 +477,9 @@ private boolean readScheme() {
* @return True if a valid username and password was found.
*/
private boolean readUserPass(int beginningOfUsername) {

//The start of where we are.
int start = _buffer.length();

//keep looping until "done"
boolean done = false;

Expand Down