diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-15 10:37:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-15 15:03:10 +0000 |
| commit | 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 (patch) | |
| tree | 82cbafc46f574a05ae0c1d1d3d7f9ebde6cb932d /fxbarcode/qrcode/BC_QRCoderEncoder.cpp | |
| parent | 171cb27a720036c48ae3a6176084e880742af0a9 (diff) | |
| download | pdfium-8a1758bf11c2d741e0cddc761b1dd2cdf564db93.tar.xz | |
Remove GetAt from string classes
This method duplicates the behaviour of the const [] operator and
doesn't offer any additional safety. Folding them into one
implementation.
SetAt is retained, since implementing the non-const [] operator to
replace SetAt has potential performance concerns. Specifically many
non-obvious cases of reading an element using [] will cause a realloc
& copy.
BUG=pdfium:860
Change-Id: I3ef5e5e5a15376f040256b646eb0d90636e24b67
Reviewed-on: https://pdfium-review.googlesource.com/10870
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxbarcode/qrcode/BC_QRCoderEncoder.cpp')
| -rw-r--r-- | fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index cad70b81c5..f779ed4b95 100644 --- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -426,9 +426,10 @@ void MergeString(std::vector<ModeStringPair>* result, void SplitString(const CFX_ByteString& content, std::vector<ModeStringPair>* result) { int32_t index = 0; - while (index < content.GetLength() && - ((content[index] >= 0xA1 && content[index] <= 0xAA) || - (content[index] >= 0xB0 && content[index] <= 0xFA))) { + while (index < content.GetLength()) { + uint8_t c = static_cast<uint8_t>(content[index]); + if (!((c >= 0xA1 && c <= 0xAA) || (c >= 0xB0 && c <= 0xFA))) + break; index += 2; } if (index) @@ -438,9 +439,10 @@ void SplitString(const CFX_ByteString& content, int32_t flag = index; while (GetAlphaNumericCode(content[index]) == -1 && - index < content.GetLength() && - !((content[index] >= 0xA1 && content[index] <= 0xAA) || - (content[index] >= 0xB0 && content[index] <= 0xFA))) { + index < content.GetLength()) { + uint8_t c = static_cast<uint8_t>(content[index]); + if (((c >= 0xA1 && c <= 0xAA) || (c >= 0xB0 && c <= 0xFA))) + break; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ bool high = !!IsDBCSLeadByte(content[index]); #else |