c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add check in RefObject::decr(); Fix decr() in removeAt see https://github.com/Microsoft/pxt/issues/3093 (#544)

Browse Source
This commit is contained in:
Michał Moskal 2017-10-01 22:39:25 +01:00 committed by Peli de Halleux
parent faae856e88
commit 9382535d29
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/core/pxt.cpp
View File

@ -394,10 +394,7 @@ namespace pxt {
uint32_t RefCollection::removeAt(int i) uint32_t RefCollection::removeAt(int i)
{ {
if (isRef()) // no decr() - we return the result
{
decr(head.get(i));
}
return head.remove(i); return head.remove(i);
} }
@ -464,7 +461,8 @@ namespace pxt {
{ {
int idx = indexOf(x, 0); int idx = indexOf(x, 0);
if (idx >= 0) { if (idx >= 0) {
removeAt(idx); uint32_t elt = removeAt(idx);
if (isRef()) decr(elt);
return 1; return 1;
} }
return 0; return 0;

1
libs/core/pxt.h
View File

@ -160,6 +160,7 @@ namespace pxt {
inline void unref() inline void unref()
{ {
//printf("DECR "); this->print(); //printf("DECR "); this->print();
check(refcnt > 0, ERR_REF_DELETED);
refcnt -= 2; refcnt -= 2;
if (refcnt == 0) { if (refcnt == 0) {
destroy(); destroy();