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 empty tokens caused by the location of separator in sdssplitlen() #114

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

Fixed empty tokens caused by the location of separator in sdssplitlen() #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67fb8df
fixed the empty tokens problem caused by the location the separater
XiongKezhi Nov 19, 2019
ae91345
reset comment
XiongKezhi Nov 19, 2019
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: 10 additions & 6 deletions sds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,17 +839,21 @@ sds *sdssplitlen(const char *s, ssize_t len, const char *sep, int seplen, int *c
}
/* search the separator */
if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
tokens[elements] = sdsnewlen(s+start,j-start);
if (tokens[elements] == NULL) goto cleanup;
elements++;
if (j != 0) { /* make sure the separator is not at the beginning */
tokens[elements] = sdsnewlen(s+start,j-start);
if (tokens[elements] == NULL) goto cleanup;
elements++;
}
start = j+seplen;
j = j+seplen-1; /* skip the separator */
}
}
/* Add the final element. We are sure there is room in the tokens array. */
tokens[elements] = sdsnewlen(s+start,len-start);
if (tokens[elements] == NULL) goto cleanup;
elements++;
if (len-start != 0) { /* make sure the string is not ended with the separator */
tokens[elements] = sdsnewlen(s+start,len-start);
if (tokens[elements] == NULL) goto cleanup;
elements++;
}
*count = elements;
return tokens;

Expand Down