From 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 15 Aug 2017 10:37:59 -0400 Subject: 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 Reviewed-by: Tom Sepez --- fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'fxbarcode/qrcode') 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* result, void SplitString(const CFX_ByteString& content, std::vector* 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(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(content[index]); + if (((c >= 0xA1 && c <= 0xAA) || (c >= 0xB0 && c <= 0xFA))) + break; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ bool high = !!IsDBCSLeadByte(content[index]); #else -- cgit v1.2.3