opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 02:16:34 +08:00
Code Issues Releases Wiki Activity

fix(wechat_qrcode): Init nBytes after the count value is determined (#3480)

Browse Source 
* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
This commit is contained in:
Nano
2023-04-26 15:09:52 +08:00
committed by GitHub
parent 960b3f685f
commit ccc277247a
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp
View File

@@ -65,7 +65,8 @@ void DecodedBitStreamParser::append(std::string& result, string const& in,
void DecodedBitStreamParser::append(std::string& result, const char* bufIn, size_t nIn, void DecodedBitStreamParser::append(std::string& result, const char* bufIn, size_t nIn,
ErrorHandler& err_handler) { ErrorHandler& err_handler) {
if (err_handler.ErrCode()) return; // avoid null pointer exception
if (err_handler.ErrCode() || bufIn == nullptr) return;
#ifndef NO_ICONV_INSIDE #ifndef NO_ICONV_INSIDE
if (nIn == 0) { if (nIn == 0) {
return; return;
@@ -190,16 +191,20 @@ void DecodedBitStreamParser::decodeByteSegment(Ref<BitSource> bits_, string& res
CharacterSetECI* currentCharacterSetECI, CharacterSetECI* currentCharacterSetECI,
ArrayRef<ArrayRef<char> >& byteSegments, ArrayRef<ArrayRef<char> >& byteSegments,
ErrorHandler& err_handler) { ErrorHandler& err_handler) {
int nBytes = count;
BitSource& bits(*bits_); BitSource& bits(*bits_);
// Don't crash trying to read more bits than we have available. // Don't crash trying to read more bits than we have available.
int available = bits.available(); int available = bits.available();
// try to repair count data if count data is invalid // try to repair count data if count data is invalid
if (count * 8 > available) { if (count * 8 > available) {
count = (available + 7 / 8); count = (available + 7) / 8;
} }
size_t nBytes = count;
ArrayRef<char> bytes_(nBytes);
// issue https://github.com/opencv/opencv_contrib/issues/3478
if (bytes_->empty())
return;
ArrayRef<char> bytes_(count);
char* readBytes = &(*bytes_)[0]; char* readBytes = &(*bytes_)[0];
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
// readBytes[i] = (char) bits.readBits(8); // readBytes[i] = (char) bits.readBits(8);

11
modules/wechat_qrcode/test/test_qrcode.cpp
View File

@@ -455,5 +455,16 @@ TEST_P(Objdetect_QRCode_Easy_Multi, regression) {
std::string qrcode_model_path[] = {"", "dnn/wechat_2021-01"}; std::string qrcode_model_path[] = {"", "dnn/wechat_2021-01"};
INSTANTIATE_TEST_CASE_P(/**/, Objdetect_QRCode_Easy_Multi, testing::ValuesIn(qrcode_model_path)); INSTANTIATE_TEST_CASE_P(/**/, Objdetect_QRCode_Easy_Multi, testing::ValuesIn(qrcode_model_path));
TEST(Objdetect_QRCode_bug, issue_3478) {
auto detector = wechat_qrcode::WeChatQRCode();
std::string image_path = findDataFile("qrcode/issue_3478.png");
Mat src = imread(image_path, IMREAD_GRAYSCALE);
ASSERT_FALSE(src.empty()) << "Can't read image: " << image_path;
std::vector<std::string> outs = detector.detectAndDecode(src);
ASSERT_EQ(1, (int) outs.size());
ASSERT_EQ(16, (int) outs[0].size());
ASSERT_EQ("KFCVW50 ", outs[0]);
}
} // namespace } // namespace
} // namespace opencv_test } // namespace opencv_test