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

Berry fix upstream connect with undefined variable (#21156)

This commit is contained in:
s-hadinger 2024-04-12 15:34:24 +02:00 committed by GitHub
parent 5e5a7756c4
commit 8736544a81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/berry/src/be_parser.c
View File

@ -1093,7 +1093,7 @@ static void sub_expr(bparser *parser, bexpdesc *e, int prio)
}
init_exp(&e2, ETVOID, 0);
sub_expr(parser, &e2, binary_op_prio(op)); /* parse right side */
if ((e2.type == ETVOID) && (op == OptConnect)) {
if ((op == OptConnect) && (e2.type == ETVOID) && (e2.v.s == NULL)) { /* 'e2.v.s == NULL' checks that it's not an undefined variable */
init_exp(&e2, ETINT, M_IMAX);
} else {
check_var(parser, &e2); /* check if valid */

2
lib/libesp32/berry_matter/src/embedded/Matter_Message.be
View File

@ -379,7 +379,7 @@ class Matter_Frame
n.add(self.flags, 1)
n.add(self.message_counter, 4)
if self.source_node_id
n .. source_node_id
n .. self.source_node_id
else
if session.peer_node_id
n .. session.peer_node_id

101
lib/libesp32/berry_matter/src/solidify/solidified_Matter_Message.h
View File

@ -1068,7 +1068,7 @@ be_local_closure(Matter_Frame_decrypt, /* name */
}),
be_str_weak(decrypt),
&be_const_str_solidified,
( &(const binstruction[116]) { /* code */
( &(const binstruction[117]) { /* code */
0xA4060000, // 0000 IMPORT R1 K0
0x88080101, // 0001 GETMBR R2 R0 K1
0x880C0102, // 0002 GETMBR R3 R0 K2
@ -1136,55 +1136,56 @@ be_local_closure(Matter_Frame_decrypt, /* name */
0x542E0003, // 0040 LDINT R11 4
0x7C200600, // 0041 CALL R8 3
0x88200118, // 0042 GETMBR R8 R0 K24
0x78220001, // 0043 JMPF R8 #0046
0x40200F0B, // 0044 CONNECT R8 R7 K11
0x70020006, // 0045 JMP #004D
0x88200519, // 0046 GETMBR R8 R2 K25
0x78220001, // 0047 JMPF R8 #004A
0x88200519, // 0048 GETMBR R8 R2 K25
0x40200E08, // 0049 CONNECT R8 R7 R8
0x8C200F1A, // 004A GETMET R8 R7 K26
0x542A000C, // 004B LDINT R10 13
0x7C200400, // 004C CALL R8 2
0x8820031B, // 004D GETMBR R8 R1 K27
0x8C20111C, // 004E GETMET R8 R8 K28
0x5C280C00, // 004F MOVE R10 R6
0x5C2C0E00, // 0050 MOVE R11 R7
0x58300011, // 0051 LDCONST R12 K17
0x6034000C, // 0052 GETGBL R13 G12
0x5C380E00, // 0053 MOVE R14 R7
0x7C340200, // 0054 CALL R13 1
0x5C380600, // 0055 MOVE R14 R3
0x583C0011, // 0056 LDCONST R15 K17
0x5C400800, // 0057 MOVE R16 R4
0x5C440600, // 0058 MOVE R17 R3
0x5C480800, // 0059 MOVE R18 R4
0x604C000C, // 005A GETGBL R19 G12
0x5C500600, // 005B MOVE R20 R3
0x7C4C0200, // 005C CALL R19 1
0x044C2604, // 005D SUB R19 R19 R4
0x044C2605, // 005E SUB R19 R19 R5
0x5C500600, // 005F MOVE R20 R3
0x6054000C, // 0060 GETGBL R21 G12
0x5C580600, // 0061 MOVE R22 R3
0x7C540200, // 0062 CALL R21 1
0x04542A05, // 0063 SUB R21 R21 R5
0x5C580A00, // 0064 MOVE R22 R5
0x7C201C00, // 0065 CALL R8 14
0x78220006, // 0066 JMPF R8 #006E
0x8C24071A, // 0067 GETMET R9 R3 K26
0x602C000C, // 0068 GETGBL R11 G12
0x5C300600, // 0069 MOVE R12 R3
0x7C2C0200, // 006A CALL R11 1
0x042C1605, // 006B SUB R11 R11 R5
0x7C240400, // 006C CALL R9 2
0x70020004, // 006D JMP #0073
0xB8260C00, // 006E GETNGBL R9 K6
0x8C241307, // 006F GETMET R9 R9 K7
0x582C001D, // 0070 LDCONST R11 K29
0x58300012, // 0071 LDCONST R12 K18
0x7C240600, // 0072 CALL R9 3
0x80041000, // 0073 RET 1 R8
0x78220002, // 0043 JMPF R8 #0047
0x88200118, // 0044 GETMBR R8 R0 K24
0x40200E08, // 0045 CONNECT R8 R7 R8
0x70020006, // 0046 JMP #004E
0x88200519, // 0047 GETMBR R8 R2 K25
0x78220001, // 0048 JMPF R8 #004B
0x88200519, // 0049 GETMBR R8 R2 K25
0x40200E08, // 004A CONNECT R8 R7 R8
0x8C200F1A, // 004B GETMET R8 R7 K26
0x542A000C, // 004C LDINT R10 13
0x7C200400, // 004D CALL R8 2
0x8820031B, // 004E GETMBR R8 R1 K27
0x8C20111C, // 004F GETMET R8 R8 K28
0x5C280C00, // 0050 MOVE R10 R6
0x5C2C0E00, // 0051 MOVE R11 R7
0x58300011, // 0052 LDCONST R12 K17
0x6034000C, // 0053 GETGBL R13 G12
0x5C380E00, // 0054 MOVE R14 R7
0x7C340200, // 0055 CALL R13 1
0x5C380600, // 0056 MOVE R14 R3
0x583C0011, // 0057 LDCONST R15 K17
0x5C400800, // 0058 MOVE R16 R4
0x5C440600, // 0059 MOVE R17 R3
0x5C480800, // 005A MOVE R18 R4
0x604C000C, // 005B GETGBL R19 G12
0x5C500600, // 005C MOVE R20 R3
0x7C4C0200, // 005D CALL R19 1
0x044C2604, // 005E SUB R19 R19 R4
0x044C2605, // 005F SUB R19 R19 R5
0x5C500600, // 0060 MOVE R20 R3
0x6054000C, // 0061 GETGBL R21 G12
0x5C580600, // 0062 MOVE R22 R3
0x7C540200, // 0063 CALL R21 1
0x04542A05, // 0064 SUB R21 R21 R5
0x5C580A00, // 0065 MOVE R22 R5
0x7C201C00, // 0066 CALL R8 14
0x78220006, // 0067 JMPF R8 #006F
0x8C24071A, // 0068 GETMET R9 R3 K26
0x602C000C, // 0069 GETGBL R11 G12
0x5C300600, // 006A MOVE R12 R3
0x7C2C0200, // 006B CALL R11 1
0x042C1605, // 006C SUB R11 R11 R5
0x7C240400, // 006D CALL R9 2
0x70020004, // 006E JMP #0074
0xB8260C00, // 006F GETNGBL R9 K6
0x8C241307, // 0070 GETMET R9 R9 K7
0x582C001D, // 0071 LDCONST R11 K29
0x58300012, // 0072 LDCONST R12 K18
0x7C240600, // 0073 CALL R9 3
0x80041000, // 0074 RET 1 R8
})
)
);