summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2012-07-24 23:47:18 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2012-07-24 23:47:18 +0900
commit9620bb0a6d399ba04f89f575f98eb53b3b252020 (patch)
tree49c8ee5b16c017cff9fa4aa688b7f938056f33a0 /src
parent2684db766d0d378d1193fa068fac0bc6d80ebe7f (diff)
Fix off by 1 error in JsonParser::parseUpdate() return value
Diffstat (limited to 'src')
-rw-r--r--src/JsonParser.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/JsonParser.cc b/src/JsonParser.cc
index 5f83ec7a..bae75286 100644
--- a/src/JsonParser.cc
+++ b/src/JsonParser.cc
@@ -107,7 +107,7 @@ ssize_t JsonParser::parseUpdate(const char* data, size_t size)
} else if(currentState_ == JSON_ERROR) {
return lastError_;
}
- for(i = 0; i < size; ++i) {
+ for(i = 0; i < size && currentState_ != JSON_FINISH; ++i) {
char c = data[i];
switch(currentState_) {
case JSON_ARRAY:
@@ -499,9 +499,6 @@ ssize_t JsonParser::parseUpdate(const char* data, size_t size)
break;
}
}
- if(currentState_ == JSON_FINISH) {
- break;
- }
}
return i;
}