Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Upgrade to rustc 1.0.0-nightly (fed12499e 2015-03-03) (built 2015-03-04) #69

Merged
merged 3 commits into from
Mar 4, 2015
Merged

Upgrade to rustc 1.0.0-nightly (fed12499e 2015-03-03) (built 2015-03-04) #69

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f184947
Fix integer overflow detection.
SimonSapin Mar 4, 2015
dcd9ad3
Fix 'arithmetic operation overflowed' panic in json::Parser::parse_u64
SimonSapin Mar 4, 2015
a7d8612
Fix 'arithmetic operation overflowed' panic in json::Parser::decode_h…
SimonSapin Mar 4, 2015
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
19 changes: 12 additions & 7 deletions src/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,6 @@ impl<T: Iterator<Item = char>> Parser<T> {

fn parse_u64(&mut self) -> Result<u64, ParserError> {
let mut accum = 0;
let last_accum = 0; // necessary to detect overflow.

match self.ch_or_null() {
'0' => {
Expand All @@ -1497,11 +1496,16 @@ impl<T: Iterator<Item = char>> Parser<T> {
while !self.eof() {
match self.ch_or_null() {
c @ '0' ... '9' => {
accum *= 10;
accum += (c as u64) - ('0' as u64);

// Detect overflow by comparing to the last value.
if accum <= last_accum { return self.error(InvalidNumber); }
macro_rules! try_or_invalid {
($e: expr) => {
match $e {
Some(v) => v,
None => return self.error(InvalidNumber)
}
}
}
accum = try_or_invalid!(accum.checked_mul(10));
accum = try_or_invalid!(accum.checked_add((c as u64) - ('0' as u64)));

self.bump();
}
Expand Down Expand Up @@ -1581,7 +1585,7 @@ impl<T: Iterator<Item = char>> Parser<T> {

fn decode_hex_escape(&mut self) -> Result<u16, ParserError> {
let mut i = 0;
let mut n = 016;
let mut n = 0;
while i < 4 && !self.eof() {
self.bump();
n = match self.ch_or_null() {
Expand Down Expand Up @@ -2870,6 +2874,7 @@ mod tests {
assert_eq!(Json::from_str("1e+"), Err(SyntaxError(InvalidNumber, 1, 4)));

assert_eq!(Json::from_str("18446744073709551616"), Err(SyntaxError(InvalidNumber, 1, 20)));
assert_eq!(Json::from_str("18446744073709551617"), Err(SyntaxError(InvalidNumber, 1, 20)));
assert_eq!(Json::from_str("-9223372036854775809"), Err(SyntaxError(InvalidNumber, 1, 21)));

assert_eq!(Json::from_str("3"), Ok(U64(3)));
Expand Down