summaryrefslogtreecommitdiff
path: root/core/fxcrt
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt')
-rw-r--r--core/fxcrt/cfx_blockbuffer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fxcrt/cfx_blockbuffer.cpp b/core/fxcrt/cfx_blockbuffer.cpp
index 7609fb9a25..aeef5653e8 100644
--- a/core/fxcrt/cfx_blockbuffer.cpp
+++ b/core/fxcrt/cfx_blockbuffer.cpp
@@ -11,7 +11,7 @@
namespace {
-const int kAllocStep = 1024 * 1024;
+const size_t kAllocStep = 1024 * 1024;
} // namespace
@@ -77,8 +77,7 @@ CFX_WideString CFX_BlockBuffer::GetTextData(size_t start, size_t length) const {
size_t maybeDataLength = m_BufferSize - 1 - m_StartPosition;
if (start > maybeDataLength)
return CFX_WideString();
- if (length > maybeDataLength)
- length = maybeDataLength;
+ length = std::min(length, maybeDataLength);
CFX_WideString wsTextData;
wchar_t* pBuf = wsTextData.GetBuffer(length);