mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Matter fix exception when calling remove_fabric (#20674)

This commit is contained in:
s-hadinger 2024-02-06 16:02:49 +01:00 committed by GitHub
parent 2dc46394dc
commit 22581b0f7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libesp32/berry_matter/src/embedded/Matter_Expirable.be
View File

@ -142,8 +142,10 @@ class Matter_Expirable_list : list
# remove - override
#
def remove(i)
if i >= 0 && i < size(self) self[i].before_remove() end
return super(self).remove(i)
if i != nil
if i >= 0 && i < size(self) self[i].before_remove() end
return super(self).remove(i)
end
end
#############################################################

38
lib/libesp32/berry_matter/src/solidify/solidified_Matter_Expirable.h
View File

@ -482,24 +482,28 @@ be_local_closure(Matter_Expirable_list_remove, /* name */
}),
be_str_weak(remove),
&be_const_str_solidified,
( &(const binstruction[17]) { /* code */
0x28080300, // 0000 GE R2 R1 K0
0x780A0007, // 0001 JMPF R2 #000A
0x6008000C, // 0002 GETGBL R2 G12
0x5C0C0000, // 0003 MOVE R3 R0
0x7C080200, // 0004 CALL R2 1
0x14080202, // 0005 LT R2 R1 R2
0x780A0002, // 0006 JMPF R2 #000A
0x94080001, // 0007 GETIDX R2 R0 R1
0x8C080501, // 0008 GETMET R2 R2 K1
0x7C080200, // 0009 CALL R2 1
0x60080003, // 000A GETGBL R2 G3
0x5C0C0000, // 000B MOVE R3 R0
( &(const binstruction[21]) { /* code */
0x4C080000, // 0000 LDNIL R2
0x20080202, // 0001 NE R2 R1 R2
0x780A0010, // 0002 JMPF R2 #0014
0x28080300, // 0003 GE R2 R1 K0
0x780A0007, // 0004 JMPF R2 #000D
0x6008000C, // 0005 GETGBL R2 G12
0x5C0C0000, // 0006 MOVE R3 R0
0x7C080200, // 0007 CALL R2 1
0x14080202, // 0008 LT R2 R1 R2
0x780A0002, // 0009 JMPF R2 #000D
0x94080001, // 000A GETIDX R2 R0 R1
0x8C080501, // 000B GETMET R2 R2 K1
0x7C080200, // 000C CALL R2 1
0x8C080502, // 000D GETMET R2 R2 K2
0x5C100200, // 000E MOVE R4 R1
0x7C080400, // 000F CALL R2 2
0x80040400, // 0010 RET 1 R2
0x60080003, // 000D GETGBL R2 G3
0x5C0C0000, // 000E MOVE R3 R0
0x7C080200, // 000F CALL R2 1
0x8C080502, // 0010 GETMET R2 R2 K2
0x5C100200, // 0011 MOVE R4 R1
0x7C080400, // 0012 CALL R2 2
0x80040400, // 0013 RET 1 R2
0x80000000, // 0014 RET 0
})
)
);