Skip to content

Add bounds checks to standard JSON array iterator #11

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
SRO-SA wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add bounds checks to standard JSON array iterator #11

Show file tree
Hide file tree
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
110 changes: 97 additions & 13 deletions cujson/query/query_iterator_standard_json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,33 @@ void cuJSONIterator::freeJson(){
}

char cuJSONIterator::getChar(int idx){
if( inputJSON[structural[idx] - 1] == '\n' ) return ',';
if(idx < 0 || idx >= totalResultSize || structural == NULL || inputJSON == NULL){
return '\0';
}
else if (idx == totalResultSize - 1) return ']';
else if (idx == 0) return '[';
else return inputJSON[structural[idx] - 1];
}
int pos = structural[idx] - 1;
if(pos < 0 || pos >= fileSize){
return '\0';
}

else if(inputJSON[pos] == '\n'){
return ',';
}

else return inputJSON[pos];}

int cuJSONIterator::jumpOpeningForward(int idx){
return pair_pos[idx];
if(idx < 0 || idx >= totalResultSize || pair_pos == NULL){
return -1;
}

int pairNode = pair_pos[idx];
if(pairNode < 0 || pairNode >= totalResultSize){
return -1;
}

return pairNode;
}

int cuJSONIterator::jumpSpacesForward(int pos){
Expand Down Expand Up @@ -250,37 +269,102 @@ void cuJSONIterator::reset(){
}

int cuJSONIterator::gotoArrayIndex(int index){
if(index < 0){
return 0;
}

if(totalResultSize <= 0 || structural == NULL || pair_pos == NULL || inputJSON == NULL){
return 0;
}

if(node < 0 || node >= totalResultSize){
return 0;
}

int total = index + 1; // total number of index that we have to go forward to get the requested index [started from 0]
// +1 is for handling indexes [1,2,3,...], user will use [0,1,2,...]

char currentNodeChar = getChar(node);
int startNode = node;
int nextNode;

char currentNodeChar = getChar(startNode);
if(currentNodeChar == '\0'){
return 0;
}
// cout << "currNodeChar: " << currentNodeChar <<endl;
if(currentNodeChar == ',' || currentNodeChar == '\n' || currentNodeChar == ':') increamentIndex(1);
/*
* Do not call increamentIndex(1) before validation.
* It mutates iterator state even when the requested array index is invalid.
*/
if(currentNodeChar == ',' || currentNodeChar == '\n' || currentNodeChar == ':'){
if(startNode + 1 >= totalResultSize){
return 0;
}

startNode++;
currentNodeChar = getChar(startNode);
if(currentNodeChar == '\0'){
return 0;
}
}
// next node
int nextNode = node+1;
char nextNodeChar = getChar(nextNode);
nextNode = startNode + 1;
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}

char nextNodeChar = getChar(nextNode);
if(nextNodeChar == '\0'){
return 0;
}
// cout << "nextNodeChar: " << nextNodeChar <<endl;

// total != 1 because we consider '[' as node to first index in array
while( total != 1 && nextNodeChar != ']' && nextNode != totalResultSize - 1){
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}
// cout << "nxt->" << nextNodeChar <<endl;
if(nextNodeChar == '[' || nextNodeChar == '{'){
// cout << "nextNodeChar: " << nextNodeChar << endl;
nextNode = jumpOpeningForward(nextNode);
int pairNode = jumpOpeningForward(nextNode);
if(pairNode <= nextNode || pairNode >= totalResultSize){
return 0;
}

nextNode = pairNode;
}
if(nextNodeChar == ',' || nextNodeChar == '\n'){ // no need for \n
total--; // go one node forward

if(nextNodeChar == ',' || nextNodeChar == '\n'){
total--;
}

nextNode++;
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}

nextNodeChar = getChar(nextNode);
if(nextNodeChar == '\0'){
return 0;
}
}

// that means we achieve to requested index
if(total == 1){
// cout << "curr node in total == 1 --> " << getChar(nextNode) <<endl;
node = nextNode-1; // change the node pointer iterator to the nextNode pointer
int targetNode = nextNode - 1; // change the node pointer iterator to the nextNode pointer
if(targetNode < 0 || targetNode >= totalResultSize){
return 0;
}

/*
* Reject empty-array access, for example gotoArrayIndex(0) on [].
*/
if(nextNodeChar == ']' && targetNode == startNode){
return 0;
}

node = targetNode;

if(nextNodeChar == '{'){
nodeType = OBJECT;
Expand Down
108 changes: 97 additions & 11 deletions paper_reproduced/src/query/query_iterator_standard_json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,34 @@ void structural_iterator::freeJson(){
}

char structural_iterator::getChar(int idx){
if( inputJSON[structural[idx] - 1] == '\n' ) return ',';
if(idx < 0 || idx >= totalResultSize || structural == NULL || inputJSON == NULL){
return '\0';
}
else if (idx == totalResultSize - 1) return ']';
else if (idx == 0) return '[';
else return inputJSON[structural[idx] - 1];
}

int pos = structural[idx] - 1;
if(pos < 0 || pos >= fileSize){
return '\0';
}

else if(inputJSON[pos] == '\n'){
return ',';
}

else return inputJSON[pos];}

int structural_iterator::jumpOpeningForward(int idx){
return pair_pos[idx];
if(idx < 0 || idx >= totalResultSize || pair_pos == NULL){
return -1;
}

int pairNode = pair_pos[idx];
if(pairNode < 0 || pairNode >= totalResultSize){
return -1;
}

return pairNode;
}

int structural_iterator::jumpSpacesForward(int pos){
Expand Down Expand Up @@ -267,38 +287,104 @@ void structural_iterator::reset(){
}

int structural_iterator::gotoArrayIndex(int index){
if(index < 0){
return 0;
}

if(totalResultSize <= 0 || structural == NULL || pair_pos == NULL || inputJSON == NULL){
return 0;
}

if(node < 0 || node >= totalResultSize){
return 0;
}
int total = index + 1; // total number of index that we have to go forward to get the requested index [started from 0]
// +1 is for handling indexes [1,2,3,...], user will use [0,1,2,...]

char currentNodeChar = getChar(node);
int startNode = node;
int nextNode;

char currentNodeChar = getChar(startNode);
if(currentNodeChar == '\0'){
return 0;
}
// cout << "currNodeChar: " << currentNodeChar <<endl;
if(currentNodeChar == ',' || currentNodeChar == '\n' || currentNodeChar == ':') increamentIndex(1);
/*
* Do not call increamentIndex(1) before validation.
* It mutates iterator state even when the requested array index is invalid.
*/
if(currentNodeChar == ',' || currentNodeChar == '\n' || currentNodeChar == ':'){
if(startNode + 1 >= totalResultSize){
return 0;
}

startNode++;
currentNodeChar = getChar(startNode);
if(currentNodeChar == '\0'){
return 0;
}
}

// next node
int nextNode = node+1;
char nextNodeChar = getChar(nextNode);
nextNode = startNode + 1;
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}

char nextNodeChar = getChar(nextNode);
if(nextNodeChar == '\0'){
return 0;
}
// cout << "nextNodeChar: " << nextNodeChar <<endl;

// total != 1 because we consider '[' as node to first index in array
while( total != 1 && nextNodeChar != ']' && nextNode != totalResultSize - 1){
while( total != 1 && nextNodeChar != ']' && nextNode != totalResultSize - 1){
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}
// cout << "nxt->" << nextNodeChar <<endl;
if(nextNodeChar == '[' || nextNodeChar == '{'){
// cout << "nextNodeChar: " << nextNodeChar << endl;
nextNode = jumpOpeningForward(nextNode);
int pairNode = jumpOpeningForward(nextNode);
if(pairNode <= nextNode || pairNode >= totalResultSize){
return 0;
}

nextNode = pairNode;
}
if(nextNodeChar == ',' || nextNodeChar == '\n'){ // no need for \n
total--; // go one node forward
}

nextNode++;
if(nextNode < 0 || nextNode >= totalResultSize){
return 0;
}

nextNodeChar = getChar(nextNode);
if(nextNodeChar == '\0'){
return 0;
}
}

// that means we achieve to requested index
if(total == 1){
// cout << "curr node in total == 1 --> " << getChar(nextNode) <<endl;
node = nextNode-1; // change the node pointer iterator to the nextNode pointer
// change the node pointer iterator to the nextNode pointer
int targetNode = nextNode - 1;

if(targetNode < 0 || targetNode >= totalResultSize){
return 0;
}

/*
* Reject empty-array access, for example gotoArrayIndex(0) on [].
*/
if(nextNodeChar == ']' && targetNode == startNode){
return 0;
}

node = targetNode;
if(nextNodeChar == '{'){
nodeType = OBJECT;
}
Expand Down