Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix invalid null delegate usage attempts in media clusters #20901

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Fix invalid null delegate usage attempts in media clusters #20901

merged 1 commit into from
Jul 19, 2022

Conversation

woody-apple
Copy link
Contributor

Problem

@andreilitvin pointed out that in media cluster code quote: "Delegate null check was not valid: even if null check failed, delegate use was still attempted."

Change overview

see above

Issue(s) fixed:

20683

Testing

Run ./scripts/run_in_build_env.sh \ "./scripts/tests/run_test_suite.py \ --chip-tool ./out/debug/standalone/chip-tool \ run \ --iterations 1 \ --all-clusters-app ./out/debug/standalone/chip-all-clusters-app \ --tv-app ./out/debug/standalone/chip-tv-app \ "

@lazarkov @web-flow
Fix invalid null delegate usage attempts in media clusters (#20853)
0e26acb 
* Update cluster logic

* Update tv.zap

* Restyle fix applied

* Fix audio output feature map

* Update newtwork commissioning feature flag to 4

* Update failure logic
@github-actions
Copy link

github-actions bot commented Jul 19, 2022 •
edited
Loading

PR #20901: Size comparison from 69bfcc7 to 0e26acb

Increases (4 builds for cc13x2_26x2, cyw30739, esp32, nrfconnect)
platform target config section 69bfcc7 0e26acb change % change
cc13x2_26x2 lock-mtd LP_CC2652R7 (read/write) 183216 183224 8 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 585258 585266 8 0.0
.app_xip_area 464812 464820 8 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021766 4 0.0
.flash.text 1021762 1021766 4 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 812632 812636 4 0.0
Decreases (7 builds for cc13x2_26x2, linux, nrfconnect, telink)
platform target config section 69bfcc7 0e26acb change % change
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 634047 634015 -32 -0.0
.text 556172 556140 -32 -0.0
lock-mtd LP_CC2652R7 (read only) 653887 653879 -8 -0.0
.text 552208 552200 -8 -0.0
linux all-clusters-minimal-app debug (read only) 2820313 2820265 -48 -0.0
.text 2379618 2379570 -48 -0.0
tv-app debug (read only) 3108369 3108289 -80 -0.0
.text 2670962 2670882 -80 -0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156707 1156675 -32 -0.0
text 801944 801920 -24 -0.0
telink light-switch-app tlsr9518adk80d text 566812 566810 -2 -0.0
lighting-app tlsr9518adk80d text 583348 583346 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 69bfcc7 0e26acb change % change
bl602 lighting-app bl602 (read/write) 1383730 1383730 0 0.0
.bss 116978 116978 0 0.0
.data 4480 4480 0 0.0
.text 1053776 1053776 0 0.0
bl602+rpc (read/write) 1429170 1429170 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1085460 1085460 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668399 668399 0 0.0
(read/write) 182840 182840 0 0.0
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579764 579764 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634047 634015 -32 -0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 556172 556140 -32 -0.0
lock-ftd LP_CC2652R7 (read only) 671595 671595 0 0.0
(read/write) 169820 169820 0 0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76451 76451 0 0.0
.text 594664 594664 0 0.0
lock-mtd LP_CC2652R7 (read only) 653887 653879 -8 -0.0
(read/write) 183216 183224 8 0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101199 101199 0 0.0
.text 552208 552200 -8 -0.0
pump-app LP_CC2652R7 (read only) 680587 680587 0 0.0
(read/write) 161676 161676 0 0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 591292 591292 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666379 666379 0 0.0
(read/write) 176004 176004 0 0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 581224 581224 0 0.0
shell LP_CC2652R7 (read only) 660890 660890 0 0.0
(read/write) 185852 185852 0 0.0
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 85098 85098 0 0.0
.text 575476 575476 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581926 581926 0 0.0
.app_xip_area 460632 460632 0 0.0
.bss 64232 64232 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 587842 587842 0 0.0
.app_xip_area 461820 461820 0 0.0
.bss 68960 68960 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 585258 585266 8 0.0
.app_xip_area 464812 464820 8 0.0
.bss 63440 63440 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1084792 1084792 0 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 949680 949680 0 0.0
BRD4161A+rpc (read/write) 1139132 1139132 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 987124 987124 0 0.0
BRD4161A+rs911x (read/write) 950160 950160 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 807324 807324 0 0.0
lock-app BRD4161A+wf200 (read/write) 1128004 1128004 0 0.0
.bss 144136 144136 0 0.0
.data 2056 2056 0 0.0
.text 981792 981792 0 0.0
window-app BRD4161A (read/write) 1078284 1078284 0 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 941672 941672 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021762 1021766 4 0.0
(read/write) 1486026 1486026 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215912 215912 0 0.0
.flash.text 1021762 1021766 4 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075507 1075507 0 0.0
(read/write) 488064 488064 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246324 246324 0 0.0
.flash.text 1070123 1070123 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660700 660700 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 583368 583368 0 0.0
lock k32w061+release (read/write) 687684 687684 0 0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 609876 609876 0 0.0
linux all-clusters-app debug (read only) 2973705 2973705 0 0.0
(read/write) 155016 155016 0 0.0
.bss 61664 61664 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 85048 85048 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 264733 264733 0 0.0
.text 2531282 2531282 0 0.0
all-clusters-minimal-app debug (read only) 2820313 2820265 -48 -0.0
(read/write) 146688 146688 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 265661 265661 0 0.0
.text 2379618 2379570 -48 -0.0
bridge-app debug+rpc (read only) 2320585 2320585 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198272 198272 0 0.0
.text 1960578 1960578 0 0.0
chip-tool debug (read only) 10294617 10294617 0 0.0
(read/write) 629504 629504 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 595152 595152 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 514933 514933 0 0.0
.text 8331556 8331556 0 0.0
chip-tool-ipv6only arm64 (read only) 10035068 10035068 0 0.0
(read/write) 694577 694577 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 630768 630768 0 0.0
.dynamic 528 528 0 0.0
.got 13624 13624 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 479052 479052 0 0.0
.text 7976052 7976052 0 0.0
lighting-app debug+rpc (read only) 2558345 2558345 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 214024 214024 0 0.0
.text 2174354 2174354 0 0.0
lock-app debug (read only) 2523161 2523161 0 0.0
(read/write) 124512 124512 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 229064 229064 0 0.0
.text 2128930 2128930 0 0.0
ota-provider-app debug (read only) 2326769 2326769 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203864 203864 0 0.0
.text 1960130 1960130 0 0.0
ota-requestor-app debug (read only) 2444345 2444345 0 0.0
(read/write) 125248 125248 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67304 67304 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207584 207584 0 0.0
.text 2065586 2065586 0 0.0
shell debug (read only) 2560609 2560609 0 0.0
(read/write) 141104 141104 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 228114 228114 0 0.0
.text 2175394 2175394 0 0.0
thermostat-no-ble arm64 (read only) 2600548 2600548 0 0.0
(read/write) 158257 158257 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83216 83216 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165748 165748 0 0.0
.text 2195056 2195056 0 0.0
tv-app debug (read only) 3108369 3108289 -80 -0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249504 249504 0 0.0
.text 2670962 2670882 -80 -0.0
tv-casting-app debug (read only) 5350641 5350641 0 0.0
(read/write) 156848 156848 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 97928 97928 0 0.0
.dynamic 608 608 0 0.0
.got 4744 4744 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 331689 331689 0 0.0
.text 4753602 4753602 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2449192 2449192 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411836 1411836 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176643 1176643 0 0.0
bss 142900 142900 0 0.0
rodata 142204 142204 0 0.0
text 812632 812636 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156707 1156675 -32 -0.0
bss 142136 142136 0 0.0
rodata 133748 133748 0 0.0
text 801944 801920 -24 -0.0
p6 all-clusters-app default (read only) 882136 882136 0 0.0
(read/write) 1685036 1685036 0 0.0
.bss 148560 148560 0 0.0
.data 2648 2648 0 0.0
.text 1525440 1525440 0 0.0
all-clusters-minimal-app default (read only) 882856 882856 0 0.0
(read/write) 1629180 1629180 0 0.0
.bss 147840 147840 0 0.0
.data 2648 2648 0 0.0
.text 1470304 1470304 0 0.0
light-app default (read only) 891160 891160 0 0.0
(read/write) 1549220 1549220 0 0.0
.bss 139744 139744 0 0.0
.data 2440 2440 0 0.0
.text 1398648 1398648 0 0.0
lock-app default (read only) 891288 891288 0 0.0
(read/write) 1576220 1576220 0 0.0
.bss 139600 139600 0 0.0
.data 2456 2456 0 0.0
.text 1425776 1425776 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798700 798700 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 566812 566810 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 818740 818740 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 583348 583346 -2 -0.0

@woody-apple woody-apple merged commit 8a8cccb into sve Jul 19, 2022
@woody-apple woody-apple deleted the cherry-pick-452b19325b0d8276e4155d0a6642cf9ecf7e9193 branch July 19, 2022 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
app examples sve cherry pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@woody-apple @lazarkov