AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Unbork Windows 64 bit build and guard against overlong UTF-8

Browse Source 
serializations.
Review URL: https://chromiumcodereview.appspot.com/9817005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11105 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
erik.corry@gmail.com 2012-03-21 14:04:24 +00:00
parent 25f84a48ce
commit 6cd62ed2a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api.cc
View File

@ -3721,7 +3721,7 @@ static int RecursivelySerializeToUtf8(i::String* string,
previous_character = character;
}
*last_character = previous_character;
return utf8_bytes + current - buffer;
return static_cast<int>(utf8_bytes + current - buffer);
}
case i::kSeqStringTag: {
const uint16_t* data =
@ -3734,7 +3734,7 @@ static int RecursivelySerializeToUtf8(i::String* string,
previous_character = character;
}
*last_character = previous_character;
return utf8_bytes + current - buffer;
return static_cast<int>(utf8_bytes + current - buffer);
}
case i::kSlicedStringTag: {
i::SlicedString* slice = i::SlicedString::cast(string);
@ -3818,7 +3818,7 @@ int String::WriteUtf8(char* buffer,
return len;
}
if (capacity == -1 || capacity >= string_length * 3) {
if (capacity == -1 || capacity / 3 >= string_length) {
int32_t previous = unibrow::Utf16::kNoPreviousCharacter;
const int kMaxRecursion = 100;
int utf8_bytes =