summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-16 09:54:15 +0200
committerbunnei <bunneidev@gmail.com>2021-05-21 06:41:51 +0200
commit342170fcd364b584c381f53b405c89ae3ca5e3e8 (patch)
tree8ea42686a67477539d627adc4332245e2682715a
parenthle: kernel: Implement CloneCurrentObject and improve session management. (diff)
downloadyuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar.gz
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar.bz2
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar.lz
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar.xz
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.tar.zst
yuzu-342170fcd364b584c381f53b405c89ae3ca5e3e8.zip
-rw-r--r--src/common/tree.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/common/tree.h b/src/common/tree.h
index 9d2d0df4e..18faa4a48 100644
--- a/src/common/tree.h
+++ b/src/common/tree.h
@@ -43,6 +43,8 @@
* The maximum height of a red-black tree is 2lg (n+1).
*/
+#include "common/assert.h"
+
namespace Common {
template <typename T>
class RBHead {
@@ -325,6 +327,10 @@ void RB_REMOVE_COLOR(RBHead<Node>* head, Node* parent, Node* elm) {
while ((elm == nullptr || RB_IS_BLACK(elm)) && elm != head->Root() && parent != nullptr) {
if (RB_LEFT(parent) == elm) {
tmp = RB_RIGHT(parent);
+ if (!tmp) {
+ ASSERT_MSG(false, "tmp is invalid!");
+ break;
+ }
if (RB_IS_RED(tmp)) {
RB_SET_BLACKRED(tmp, parent);
RB_ROTATE_LEFT(head, parent, tmp);
@@ -366,6 +372,11 @@ void RB_REMOVE_COLOR(RBHead<Node>* head, Node* parent, Node* elm) {
tmp = RB_LEFT(parent);
}
+ if (!tmp) {
+ ASSERT_MSG(false, "tmp is invalid!");
+ break;
+ }
+
if ((RB_LEFT(tmp) == nullptr || RB_IS_BLACK(RB_LEFT(tmp))) &&
(RB_RIGHT(tmp) == nullptr || RB_IS_BLACK(RB_RIGHT(tmp)))) {
RB_SET_COLOR(tmp, EntryColor::Red);