Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caeddc72 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix [2542425] memory leak during video recording 

Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.

Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
parent afa2eac1

libs/utils/VectorImpl.cpp

+4 −1
Original line number Diff line number Diff line
@@ -173,9 +173,10 @@ status_t VectorImpl::sort(VectorImpl::compar_r_t cmp, void* state) 
                    if (!array) return NO_MEMORY;

                    temp = malloc(mItemSize);

                    if (!temp) return NO_MEMORY;

                    _do_construct(temp, 1);

                    item = reinterpret_cast<char*>(array) + mItemSize*(i);

                    curr = reinterpret_cast<char*>(array) + mItemSize*(i-1);

                } else {

                    _do_destroy(temp, 1);

                }



                _do_copy(temp, item, 1);
@@ -183,12 +184,14 @@ status_t VectorImpl::sort(VectorImpl::compar_r_t cmp, void* state) 
                ssize_t j = i-1;

                void* next = reinterpret_cast<char*>(array) + mItemSize*(i);                    

                do {

                    _do_destroy(next, 1);

                    _do_copy(next, curr, 1);

                    next = curr;

                    --j;

                    curr = reinterpret_cast<char*>(array) + mItemSize*(j);                    

                } while (j>=0 && (cmp(curr, temp, state) > 0));



                _do_destroy(next, 1);

                _do_copy(next, temp, 1);

            }

            i++;