Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BGradient: fix assignment operator, add copy constructor

Browse Source 
The BGradient class is a bit strange as it can store any gradient on its
own, butonly the subclasses allow to set some of the fields.

In the asignment operator, the non-base data (which is in an union) was
not copied over.

More importantly, the missing copy constructor led to the default
implementation being used, and BList (used for the color stops) was
being copied using its default copy constructor, resulting in the two
BGradient (original and copy) poinitng to the same stops data. Heap
corruption resulted whenever one of them was deleted.

Having a working copy ocnstructor fixes this. The alternative is making
the copy constructor private or protected to make sure gradients are not
copied, since normally you'd copy only the subclasses, preserving the
C++ type. However there is nothing enforcing that, and manipulating a
BGradient copied from a subclass works just fine.

Change-Id: I28e733eb8a2970b76ae623eabb75ef8435f508af
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3144
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Adrien Destugues 2020-08-11 17:43:25 +02:00 committed by waddlesplash
parent 3f7f989680
commit 6d9c0146a5
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/os/interface/Gradient.h
View File

@ -49,6 +49,7 @@ public:
public:
BGradient();
BGradient(const BGradient& other);
BGradient(BMessage* archive);
virtual ~BGradient();

30
src/kits/interface/Gradient.cpp
View File

@ -100,6 +100,14 @@ BGradient::BGradient()
}
BGradient::BGradient(const BGradient& other)
: BArchivable(),
fColorStops(std::max((int32)4, other.CountColorStops()))
{
*this = other;
}
// constructor
BGradient::BGradient(BMessage* archive)
: BArchivable(archive),
@ -250,8 +258,30 @@ BGradient::Archive(BMessage* into, bool deep) const
BGradient&
BGradient::operator=(const BGradient& other)
{
if (&other == this)
return *this;
SetColorStops(other);
fType = other.fType;
switch (fType) {
case TYPE_LINEAR:
fData.linear = other.fData.linear;
break;
case TYPE_RADIAL:
fData.radial = other.fData.radial;
break;
case TYPE_RADIAL_FOCUS:
fData.radial_focus = other.fData.radial_focus;
break;
case TYPE_DIAMOND:
fData.diamond = other.fData.diamond;
break;
case TYPE_CONIC:
fData.conic = other.fData.conic;
break;
case TYPE_NONE:
break;
}
return *this;
}