i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AutoDeleter: fix AutoDeleter size

Browse Source 
C++ don't allow zero size class fields. If field with empty class field
is used, it's size will be 1 byte.

Create DeleteFunc instance as local variable at each use instead.

Fixes #16638.

Change-Id: Ifb76c45ea02e9fed014751542ee5f16f41e11d15
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3458
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
X512
2020-12-10 11:39:49 +00:00
committed by Adrien Destugues
parent ab57ee42cb
commit 76ab85671d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/AutoDeleter.h
+4 -3
View File
@@ -39,13 +39,15 @@ public:
inline ~AutoDeleter() inline ~AutoDeleter()
{ {
fDelete(fObject); DeleteFunc destructor;
destructor(fObject);
} }
inline void SetTo(C *object) inline void SetTo(C *object)
{ {
if (object != fObject) { if (object != fObject) {
fDelete(fObject); DeleteFunc destructor;
destructor(fObject);
fObject = object; fObject = object;
} }
} }
@@ -79,7 +81,6 @@ public:
protected: protected:
C *fObject; C *fObject;
DeleteFunc fDelete;
private: private:
AutoDeleter(const AutoDeleter&); AutoDeleter(const AutoDeleter&);