Merge pull request #808 from datapathltd/datapath_asan_alloc_mismatch_fix

axxel · web-flow · commit cd11aa534b4b · 2024-07-18T17:23:36.000+02:00
Fix to ensure the custom deallocator for zint_symbol is used for std::shared_ptr's too
diff --git a/core/src/Barcode.cpp b/core/src/Barcode.cpp
@@ -16,6 +16,10 @@
 
 #ifdef ZXING_USE_ZINT
 #include <zint.h>
+void zint_symbol_deleter::operator()(zint_symbol* p) const noexcept
+{
+	ZBarcode_Delete(p);
+}
 #else
 struct zint_symbol {};
 #endif
@@ -150,7 +154,7 @@ ImageView Result::symbol() const
 	return {_symbol->row(0).begin(), _symbol->width(), _symbol->height(), ImageFormat::Lum};
 }
 
-void Result::zint(std::unique_ptr<zint_symbol>&& z)
+void Result::zint(unique_zint_symbol&& z)
 {
 	_zint = std::shared_ptr(std::move(z));
 }
diff --git a/core/src/Barcode.h b/core/src/Barcode.h
@@ -22,6 +22,12 @@ extern "C" struct zint_symbol;
 namespace ZXing {
 class BitMatrix;
 }
+
+struct zint_symbol_deleter
+{
+	void operator()(zint_symbol* p) const noexcept;
+};
+using unique_zint_symbol = std::unique_ptr<zint_symbol, zint_symbol_deleter>;
 #endif
 
 #include <string>
@@ -171,7 +177,7 @@ class Result
 #ifdef ZXING_EXPERIMENTAL_API
 	void symbol(BitMatrix&& bits);
 	ImageView symbol() const;
-	void zint(std::unique_ptr<zint_symbol>&& z);
+	void zint(unique_zint_symbol&& z);
 	zint_symbol* zint() const { return _zint.get(); }
 #endif
 
diff --git a/core/src/WriteBarcode.cpp b/core/src/WriteBarcode.cpp
@@ -17,11 +17,6 @@
 #ifdef ZXING_USE_ZINT
 
 #include <zint.h>
-template <>
-struct std::default_delete<zint_symbol>
-{
-	void operator()(zint_symbol* p) const noexcept { ZBarcode_Delete(p); }
-};
 
 #else
 
@@ -41,7 +36,7 @@ struct CreatorOptions::Data
 	// symbol size (qrcode, datamatrix, etc), map from I, 'WxH'
 	// structured_append (idx, cnt, ID)
 
-	mutable std::unique_ptr<zint_symbol> zint;
+	mutable unique_zint_symbol zint;
 
 #if __cplusplus <= 201703L || defined(__APPLE__)
 	Data(BarcodeFormat f) : format(f) {}

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`
`17`	`17`	`#ifdef ZXING_USE_ZINT`
`18`	`18`	`#include <zint.h>`
	`19`	`+void zint_symbol_deleter::operator()(zint_symbol* p) const noexcept`
	`20`	`+{`
	`21`	`+ ZBarcode_Delete(p);`
	`22`	`+}`
`19`	`23`	`#else`
`20`	`24`	`struct zint_symbol {};`
`21`	`25`	`#endif`
`@@ -150,7 +154,7 @@ ImageView Result::symbol() const`
`150`	`154`	`return {_symbol->row(0).begin(), _symbol->width(), _symbol->height(), ImageFormat::Lum};`
`151`	`155`	`}`
`152`	`156`
`153`		`-void Result::zint(std::unique_ptr<zint_symbol>&& z)`
	`157`	`+void Result::zint(unique_zint_symbol&& z)`
`154`	`158`	`{`
`155`	`159`	`_zint = std::shared_ptr(std::move(z));`
`156`	`160`	`}`