Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp
diff --git a/third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp b/third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp
index 48e837a966afd7c077c8c53ac50b59832337e88e..a4e73428c0179b2552606809d011a415cf383ade 100644
--- a/third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp
+++ b/third_party/WebKit/Source/core/xml/parser/SharedBufferReader.cpp
@@ -49,18 +49,18 @@ SharedBufferReader::~SharedBufferReader()
{
}
-int SharedBufferReader::readData(char* outputBuffer, unsigned askedToRead)
+int SharedBufferReader::readData(char* outputBuffer, int askedToRead)
{
if (!m_buffer || m_currentOffset > m_buffer->size())
return 0;
- unsigned bytesCopied = 0;
- unsigned bytesLeft = m_buffer->size() - m_currentOffset;
- unsigned lenToCopy = std::min(askedToRead, bytesLeft);
+ size_t bytesCopied = 0;
+ size_t bytesLeft = m_buffer->size() - m_currentOffset;
+ size_t lenToCopy = std::min(safeCast<size_t>(askedToRead), bytesLeft);
while (bytesCopied < lenToCopy) {
const char* data;
- unsigned segmentSize = m_buffer->getSomeData(data, m_currentOffset);
+ size_t segmentSize = m_buffer->getSomeData(data, m_currentOffset);
if (!segmentSize)
break;
@@ -70,7 +70,7 @@ int SharedBufferReader::readData(char* outputBuffer, unsigned askedToRead)
m_currentOffset += segmentSize;
}
- return bytesCopied;
+ return safeCast<int>(bytesCopied);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698