241810 2022-06-21 10:38:16 -0700 AX: Live AX objects can be destroyed while building a node change for them 2022-09-01 14:46:10 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1876998 0 tyler_w 2022-06-21 10:38:16 -0700 Live AX objects can be destroyed while building a node change for them 1876999 1 webkit-bug-importer 2022-06-21 10:38:25 -0700 <rdar://problem/95615156> 1877001 2 460376 tyler_w 2022-06-21 10:43:50 -0700 Created attachment 460376 Patch 1877005 3 460376 cfleizach 2022-06-21 10:56:53 -0700 Comment on attachment 460376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=460376&action=review > COMMIT_MESSAGE:7 > +the initialize of many properties can cause layout, which can cause the initialize > initialization 1877027 4 460381 tyler_w 2022-06-21 13:15:49 -0700 Created attachment 460381 Patch 1877214 5 ews-feeder 2022-06-21 21:11:44 -0700 Committed r295721 (251726@main): <https://commits.webkit.org/251726@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460381. 1895608 6 andresg_22 2022-09-01 14:46:10 -0700 See https://bugs.webkit.org/show_bug.cgi?id=244687 460376 2022-06-21 10:43:50 -0700 2022-06-21 13:15:47 -0700 Patch bug-241810-20220621104349.patch text/plain 10722 tyler_w RnJvbSA2MGIxMmY2MDQ4NzU1ZDBmMjA0NDJhZDNmODNjNWM0Zjg2MTJlM2E4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogVHVlLCAyMSBKdW4gMjAyMiAxMDozODo0NSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBM aXZlIEFYIG9iamVjdHMgY2FuIGJlIGRlc3Ryb3llZCB3aGlsZSBidWlsZGluZyBhIG5vZGUKIGNo YW5nZSBmb3IgdGhlbSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQx ODEwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCldoaWxlIGJ1aWxkaW5nIG5vZGUgY2hh bmdlcyBpbiBBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdCwKdGhlIGluaXRpYWxp emUgb2YgbWFueSBwcm9wZXJ0aWVzIGNhbiBjYXVzZSBsYXlvdXQsIHdoaWNoIGNhbiBjYXVzZSB0 aGUKYmFja2luZyBsaXZlIG9iamVjdCB0byBiZSBkZWxldGVkLiBUaGlzIGNhdXNlcyBhIGNyYXNo LgoKVGhpcyBwYXRjaCBmaXhlcyB0aGlzIGJ5IGhvbGRpbmcgYSBgUmVmYCB0byB0aGUgQWNjZXNz aWJpbGl0eU9iamVjdCwKZW5zdXJpbmcgaXQgc3RheXMgYWxpdmUgZm9yIGFzIGxvbmcgd2UgbmVl ZCBpdC4KCkkgd2Fzbid0IGFibGUgdG8gbWFrZSBhIGxheW91dCB0ZXN0IGZvciB0aGlzLCBhcyB0 aGUgY2lyY3Vtc3RhbmNlcyB0bwpyZXByb2R1Y2UgdGhlIGlzc3VlIGFyZSBjb21wbGV4LgoKKiBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmNwcDoKKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QpOgooV2Vi Q29yZTo6QVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKToKKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmpl Y3Q6OmluaXRpYWxpemVQcm9wZXJ0aWVzKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0Lmg6CiogU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgooV2ViQ29yZTo6QVhJc29s YXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JPYmplY3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmg6CiogU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW06CihXZWJD b3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplUGxhdGZvcm1Qcm9wZXJ0aWVzKToKLS0t CiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwICAgICAgICAgICAgfCAxNiAr KysrKysrKy0tLS0tLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaCAgICAg ICAgICAgICAgfCAgOCArKysrLS0tLQogLi4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHAgICAgICAgICAgICAgIHwgMTQgKysrKysrKy0tLS0tLS0KIC4uLi9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oICB8ICAyICstCiAuLi4vaXNvbGF0ZWR0cmVlL21h Yy9BWElzb2xhdGVkT2JqZWN0TWFjLm1tICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiA1IGZp bGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRP YmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5jcHAKaW5kZXggNmY0YjRmZDQ0NzY3Li40ZGZkN2M3NThlN2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC0zOCwxOCArMzgsMTggQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1BWElzb2xhdGVkT2JqZWN0OjpBWElzb2xhdGVkT2JqZWN0KEFYQ29yZU9i amVjdCYgYXhPYmplY3QsIEFYSXNvbGF0ZWRUcmVlKiB0cmVlKQorQVhJc29sYXRlZE9iamVjdDo6 QVhJc29sYXRlZE9iamVjdChSZWY8QVhDb3JlT2JqZWN0PiBheE9iamVjdCwgQVhJc29sYXRlZFRy ZWUqIHRyZWUpCiAgICAgOiBtX2NhY2hlZFRyZWUodHJlZSkKLSAgICAsIG1faWQoYXhPYmplY3Qu b2JqZWN0SUQoKSkKKyAgICAsIG1faWQoYXhPYmplY3QtPm9iamVjdElEKCkpCiB7CiAgICAgQVNT RVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4o YXhPYmplY3QpKTsKIAotICAgIGF1dG8qIGF4UGFyZW50ID0gYXhPYmplY3QucGFyZW50T2JqZWN0 VW5pZ25vcmVkKCk7CisgICAgYXV0byogYXhQYXJlbnQgPSBheE9iamVjdC0+cGFyZW50T2JqZWN0 VW5pZ25vcmVkKCk7CiAgICAgbV9wYXJlbnRJRCA9IGF4UGFyZW50ID8gYXhQYXJlbnQtPm9iamVj dElEKCkgOiBBWElEKCk7CiAKICAgICBpZiAobV9pZC5pc1ZhbGlkKCkpIHsKLSAgICAgICAgYXV0 byBpc1Jvb3QgPSAhYXhQYXJlbnQgJiYgYXhPYmplY3QuaXNTY3JvbGxWaWV3KCkgPyBJc1Jvb3Q6 OlllcyA6IElzUm9vdDo6Tm87CisgICAgICAgIGF1dG8gaXNSb290ID0gIWF4UGFyZW50ICYmIGF4 T2JqZWN0LT5pc1Njcm9sbFZpZXcoKSA/IElzUm9vdDo6WWVzIDogSXNSb290OjpObzsKICAgICAg ICAgaW5pdGlhbGl6ZVByb3BlcnRpZXMoYXhPYmplY3QsIGlzUm9vdCk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgLy8gU2hvdWxkIG5ldmVyIGhhcHBlbiB1bmRlciBub3JtYWwgY2lyY3Vtc3RhbmNl cy4KQEAgLTU3LDcgKzU3LDcgQEAgQVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdChB WENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElzb2xhdGVkVHJlZSogdHJlZSkKICAgICB9CiB9CiAK LVJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoQVhDb3JlT2Jq ZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRUcmVlKiB0cmVlKQorUmVmPEFYSXNvbGF0ZWRPYmplY3Q+ IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZShSZWY8QVhDb3JlT2JqZWN0PiBvYmplY3QsIEFYSXNv bGF0ZWRUcmVlKiB0cmVlKQogewogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEFYSXNvbGF0ZWRP YmplY3Qob2JqZWN0LCB0cmVlKSk7CiB9CkBAIC03MiwxMCArNzIsMTAgQEAgdm9pZCBBWElzb2xh dGVkT2JqZWN0Ojppbml0KCkKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBB WElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplUHJvcGVydGllcyhBWENvcmVPYmplY3QmIGNvcmVP YmplY3QsIElzUm9vdCBpc1Jvb3QpCit2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVQ cm9wZXJ0aWVzKFJlZjxBWENvcmVPYmplY3Q+IGNvcmVPYmplY3QsIElzUm9vdCBpc1Jvb3QpCiB7 CiAgICAgQVNTRVJUKGlzPEFjY2Vzc2liaWxpdHlPYmplY3Q+KGNvcmVPYmplY3QpKTsKLSAgICBh dXRvJiBvYmplY3QgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pihjb3JlT2JqZWN0KTsK KyAgICBhdXRvJiBvYmplY3QgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pihjb3JlT2Jq ZWN0LmdldCgpKTsKIAogICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpBUklBTGFuZG1h cmtSb2xlRGVzY3JpcHRpb24sIG9iamVjdC5hcmlhTGFuZG1hcmtSb2xlRGVzY3JpcHRpb24oKS5p c29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2li aWxpdHlEZXNjcmlwdGlvbiwgb2JqZWN0LmFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigpLmlzb2xh dGVkQ29weSgpKTsKQEAgLTQwMCw3ICs0MDAsNyBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6Omlu aXRpYWxpemVQcm9wZXJ0aWVzKEFYQ29yZU9iamVjdCYgY29yZU9iamVjdCwgSXNSb290IGlzUgog ICAgIGlmIChvYmplY3QuaXNXaWRnZXQoKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6OklzV2lkZ2V0LCB0cnVlKTsKIAotICAgIGluaXRpYWxpemVQbGF0Zm9ybVByb3BlcnRp ZXMob2JqZWN0LCBpc1Jvb3QpOworICAgIGluaXRpYWxpemVQbGF0Zm9ybVByb3BlcnRpZXMoY29y ZU9iamVjdCwgaXNSb290KTsKIH0KIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojph c3NvY2lhdGVkQVhPYmplY3QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDVh YmNlOGZmYTljNC4uOTUxM2RjOGM1OTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCkBAIC00 Nyw3ICs0Nyw3IEBAIGNsYXNzIEFYSXNvbGF0ZWRUcmVlOwogY2xhc3MgQVhJc29sYXRlZE9iamVj dCBmaW5hbCA6IHB1YmxpYyBBWENvcmVPYmplY3QgewogICAgIGZyaWVuZCBjbGFzcyBBWElzb2xh dGVkVHJlZTsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGNyZWF0 ZShBWENvcmVPYmplY3QmLCBBWElzb2xhdGVkVHJlZSopOworICAgIHN0YXRpYyBSZWY8QVhJc29s YXRlZE9iamVjdD4gY3JlYXRlKFJlZjxBWENvcmVPYmplY3Q+LCBBWElzb2xhdGVkVHJlZSopOwog ICAgIH5BWElzb2xhdGVkT2JqZWN0KCk7CiAKICAgICB2b2lkIHNldE9iamVjdElEKEFYSUQgaWQp IG92ZXJyaWRlIHsgbV9pZCA9IGlkOyB9CkBAIC02NiwxMyArNjYsMTMgQEAgcHJpdmF0ZToKICAg ICBBWElzb2xhdGVkVHJlZSogdHJlZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkVHJlZS5nZXQo KTsgfQogCiAgICAgQVhJc29sYXRlZE9iamVjdCgpID0gZGVmYXVsdDsKLSAgICBBWElzb2xhdGVk T2JqZWN0KEFYQ29yZU9iamVjdCYsIEFYSXNvbGF0ZWRUcmVlKik7CisgICAgQVhJc29sYXRlZE9i amVjdChSZWY8QVhDb3JlT2JqZWN0PiwgQVhJc29sYXRlZFRyZWUqKTsKICAgICBib29sIGlzQVhJ c29sYXRlZE9iamVjdEluc3RhbmNlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQog ICAgIEFYQ29yZU9iamVjdCogYXNzb2NpYXRlZEFYT2JqZWN0KCkgY29uc3Q7CiAKICAgICBlbnVt IGNsYXNzIElzUm9vdCA6IGJvb2wgeyBZZXMsIE5vIH07Ci0gICAgdm9pZCBpbml0aWFsaXplUHJv cGVydGllcyhBWENvcmVPYmplY3QmLCBJc1Jvb3QpOwotICAgIHZvaWQgaW5pdGlhbGl6ZVBsYXRm b3JtUHJvcGVydGllcyhjb25zdCBBWENvcmVPYmplY3QmLCBJc1Jvb3QpOworICAgIHZvaWQgaW5p dGlhbGl6ZVByb3BlcnRpZXMoUmVmPEFYQ29yZU9iamVjdD4sIElzUm9vdCk7CisgICAgdm9pZCBp bml0aWFsaXplUGxhdGZvcm1Qcm9wZXJ0aWVzKFJlZjxjb25zdCBBWENvcmVPYmplY3Q+LCBJc1Jv b3QpOwogCiAgICAgdm9pZCBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZSwgQVhQcm9wZXJ0eVZh bHVlVmFyaWFudCYmLCBib29sIHNob3VsZFJlbW92ZSA9IGZhbHNlKTsKICAgICB2b2lkIHNldE9i amVjdFByb3BlcnR5KEFYUHJvcGVydHlOYW1lLCBBWENvcmVPYmplY3QqKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRUcmVlLmNwcAppbmRleCAyMjY2MmU5MzE4ZWYuLmJkODNhOThmODA2MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmNwcApAQCAtMjA5LDE1ICsyMDksMTUgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6 Z2VuZXJhdGVTdWJ0cmVlKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgcXVldWVSZW1vdmFs c0FuZFVucmVzb2x2ZWRDaGFuZ2VzKHsgfSk7CiB9CiAKLXN0ZDo6b3B0aW9uYWw8QVhJc29sYXRl ZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFY Q29yZU9iamVjdCYgYXhPYmplY3QsIEF0dGFjaFdyYXBwZXIgYXR0YWNoV3JhcHBlcikKK3N0ZDo6 b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2Rl Q2hhbmdlRm9yT2JqZWN0KFJlZjxBWENvcmVPYmplY3Q+IGF4T2JqZWN0LCBBdHRhY2hXcmFwcGVy IGF0dGFjaFdyYXBwZXIpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIC8v IFdlIHNob3VsZCBuZXZlciBjcmVhdGUgYW4gaXNvbGF0ZWQgb2JqZWN0IGZyb20gYW4gaWdub3Jl ZCBvYmplY3QuCi0gICAgaWYgKGF4T2JqZWN0LmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkKKyAg ICBpZiAoYXhPYmplY3QtPmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkKICAgICAgICAgcmV0dXJu IHN0ZDo6bnVsbG9wdDsKIAotICAgIGlmICghYXhPYmplY3Qub2JqZWN0SUQoKS5pc1ZhbGlkKCkp IHsKKyAgICBpZiAoIWF4T2JqZWN0LT5vYmplY3RJRCgpLmlzVmFsaWQoKSkgewogICAgICAgICAv LyBFaXRoZXIgdGhlIGF4T2JqZWN0IGhhcyBhbiBpbnZhbGlkIElEIG9yIHNvbWV0aGluZyBlbHNl IHdlbnQgdGVycmlibHkgd3JvbmcuIERvbid0IGJvdGhlciBkb2luZyBhbnl0aGluZyBlbHNlLgog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9w dDsKQEAgLTIyNiwxNSArMjI2LDE1IEBAIHN0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6Ok5v ZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYCiAgICAgYXV0 byBvYmplY3QgPSBBWElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoYXhPYmplY3QsIHRoaXMpOwogICAg IE5vZGVDaGFuZ2Ugbm9kZUNoYW5nZSB7IG9iamVjdCwgbnVsbHB0ciB9OwogCi0gICAgQVNTRVJU KGF4T2JqZWN0LndyYXBwZXIoKSk7CisgICAgQVNTRVJUKGF4T2JqZWN0LT53cmFwcGVyKCkpOwog ICAgIGlmIChhdHRhY2hXcmFwcGVyID09IEF0dGFjaFdyYXBwZXI6Ok9uTWFpblRocmVhZCkKLSAg ICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3JhcHBlcigpKTsK KyAgICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3QtPndyYXBwZXIo KSk7CiAgICAgZWxzZSB7CiAgICAgICAgIC8vIFNldCB0aGUgd3JhcHBlciBpbiB0aGUgTm9kZUNo YW5nZSBzbyB0aGF0IGl0IGlzIHNldCBvbiB0aGUgQVggdGhyZWFkLgotICAgICAgICBub2RlQ2hh bmdlLndyYXBwZXIgPSBheE9iamVjdC53cmFwcGVyKCk7CisgICAgICAgIG5vZGVDaGFuZ2Uud3Jh cHBlciA9IGF4T2JqZWN0LT53cmFwcGVyKCk7CiAgICAgfQogCi0gICAgbV9ub2RlTWFwLnNldChh eE9iamVjdC5vYmplY3RJRCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IG5vZGVDaGFuZ2UuaXNvbGF0 ZWRPYmplY3QtPnBhcmVudCgpLCBheE9iamVjdC5jaGlsZHJlbklEcygpIH0pOworICAgIG1fbm9k ZU1hcC5zZXQoYXhPYmplY3QtPm9iamVjdElEKCksIFBhcmVudENoaWxkcmVuSURzIHsgbm9kZUNo YW5nZS5pc29sYXRlZE9iamVjdC0+cGFyZW50KCksIGF4T2JqZWN0LT5jaGlsZHJlbklEcygpIH0p OwogCiAgICAgaWYgKCFub2RlQ2hhbmdlLmlzb2xhdGVkT2JqZWN0LT5wYXJlbnQoKS5pc1ZhbGlk KCkpIHsKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmgKaW5kZXggMjQ5N2I1MmZiNzNjLi4yMjhlMGUwYmY5MjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuaApAQCAtMzg1LDcgKzM4NSw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIEhhc2hN YXA8UGFnZUlkZW50aWZpZXIsIFJlZjxBWElzb2xhdGVkVHJlZT4+JiB0cmVlUGFnZUNhY2hlKCkg V1RGX1JFUVVJUkVTX0xPQ0soc19jYWNoZUxvY2spOwogCiAgICAgZW51bSBjbGFzcyBBdHRhY2hX cmFwcGVyIDogYm9vbCB7IE9uTWFpblRocmVhZCwgT25BWFRocmVhZCB9OwotICAgIHN0ZDo6b3B0 aW9uYWw8Tm9kZUNoYW5nZT4gbm9kZUNoYW5nZUZvck9iamVjdChBWENvcmVPYmplY3QmLCBBdHRh Y2hXcmFwcGVyID0gQXR0YWNoV3JhcHBlcjo6T25NYWluVGhyZWFkKTsKKyAgICBzdGQ6Om9wdGlv bmFsPE5vZGVDaGFuZ2U+IG5vZGVDaGFuZ2VGb3JPYmplY3QoUmVmPEFYQ29yZU9iamVjdD4sIEF0 dGFjaFdyYXBwZXIgPSBBdHRhY2hXcmFwcGVyOjpPbk1haW5UaHJlYWQpOwogICAgIHZvaWQgY29s bGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZShBWENvcmVPYmplY3QmKTsKICAgICBib29sIGlzQ29s bGVjdGluZ05vZGVDaGFuZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9jb2xsZWN0aW5nTm9kZUNoYW5n ZXNBdFRyZWVMZXZlbCA+IDA7IH0KICAgICB2b2lkIHF1ZXVlQ2hhbmdlKGNvbnN0IE5vZGVDaGFu Z2UmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2NoYW5nZUxvZ0xvY2spOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmpl Y3RNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9tYWMv QVhJc29sYXRlZE9iamVjdE1hYy5tbQppbmRleCBlZDE5NDE1NTU4NzAuLmZkYzI2ZmUxMjNiNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFj L0FYSXNvbGF0ZWRPYmplY3RNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW0KQEAgLTMyLDE4ICszMiwx OCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5p dGlhbGl6ZVBsYXRmb3JtUHJvcGVydGllcyhjb25zdCBBWENvcmVPYmplY3QmIG9iamVjdCwgSXNS b290IGlzUm9vdCkKK3ZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZVBsYXRmb3JtUHJv cGVydGllcyhSZWY8Y29uc3QgQVhDb3JlT2JqZWN0PiBvYmplY3QsIElzUm9vdCBpc1Jvb3QpCiB7 Ci0gICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6Okhhc0FwcGxlUERGQW5ub3RhdGlvbkF0 dHJpYnV0ZSwgb2JqZWN0Lmhhc0FwcGxlUERGQW5ub3RhdGlvbkF0dHJpYnV0ZSgpKTsKLSAgICBz ZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6U3BlZWNoSGludCwgb2JqZWN0LnNwZWVjaEhpbnRB dHRyaWJ1dGVWYWx1ZSgpLmlzb2xhdGVkQ29weSgpKTsKLSAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6Q2FyZXRCcm93c2luZ0VuYWJsZWQsIG9iamVjdC5jYXJldEJyb3dzaW5nRW5hYmxl ZCgpKTsKKyAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SGFzQXBwbGVQREZBbm5vdGF0 aW9uQXR0cmlidXRlLCBvYmplY3QtPmhhc0FwcGxlUERGQW5ub3RhdGlvbkF0dHJpYnV0ZSgpKTsK KyAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6U3BlZWNoSGludCwgb2JqZWN0LT5zcGVl Y2hIaW50QXR0cmlidXRlVmFsdWUoKS5pc29sYXRlZENvcHkoKSk7CisgICAgc2V0UHJvcGVydHko QVhQcm9wZXJ0eU5hbWU6OkNhcmV0QnJvd3NpbmdFbmFibGVkLCBvYmplY3QtPmNhcmV0QnJvd3Np bmdFbmFibGVkKCkpOwogCiAgICAgaWYgKGlzUm9vdCA9PSBJc1Jvb3Q6OlllcykKLSAgICAgICAg c2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlByZXZlbnRLZXlib2FyZERPTUV2ZW50RGlzcGF0 Y2gsIG9iamVjdC5wcmV2ZW50S2V5Ym9hcmRET01FdmVudERpc3BhdGNoKCkpOworICAgICAgICBz ZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6UHJldmVudEtleWJvYXJkRE9NRXZlbnREaXNwYXRj aCwgb2JqZWN0LT5wcmV2ZW50S2V5Ym9hcmRET01FdmVudERpc3BhdGNoKCkpOwogCi0gICAgaWYg KG9iamVjdC5pc1Njcm9sbFZpZXcoKSkgewotICAgICAgICBtX3BsYXRmb3JtV2lkZ2V0ID0gb2Jq ZWN0LnBsYXRmb3JtV2lkZ2V0KCk7Ci0gICAgICAgIG1fcmVtb3RlUGFyZW50ID0gb2JqZWN0LnJl bW90ZVBhcmVudE9iamVjdCgpOworICAgIGlmIChvYmplY3QtPmlzU2Nyb2xsVmlldygpKSB7Cisg ICAgICAgIG1fcGxhdGZvcm1XaWRnZXQgPSBvYmplY3QtPnBsYXRmb3JtV2lkZ2V0KCk7CisgICAg ICAgIG1fcmVtb3RlUGFyZW50ID0gb2JqZWN0LT5yZW1vdGVQYXJlbnRPYmplY3QoKTsKICAgICB9 CiB9CiAK 460381 2022-06-21 13:15:49 -0700 2022-06-21 21:11:45 -0700 Patch bug-241810-20220621131549.patch text/plain 10755 tyler_w RnJvbSAxMWNjZTE3YzI2NTk2MWI2NDg0NjEwYjZkOWRmNjU2MGU3MWRjMWRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogVHVlLCAyMSBKdW4gMjAyMiAxMDozODo0NSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBM aXZlIEFYIG9iamVjdHMgY2FuIGJlIGRlc3Ryb3llZCB3aGlsZSBidWlsZGluZyBhIG5vZGUKIGNo YW5nZSBmb3IgdGhlbSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQx ODEwCgpSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaC4KCldoaWxlIGJ1aWxkaW5nIGEgbm9kZSBj aGFuZ2UgaW4gQVhJc29sYXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JPYmplY3QsCnRoZSBpbml0aWFs aXphdGlvbiBvZiBzZXZlcmFsIGRpZmZlcmVudCBgQVhQcm9wZXJ0eU5hbWVgcyBjYW4gY2F1c2Ug bGF5b3V0LAp3aGljaCBpbiB0dXJuIGNhbiBjYXVzZSB0aGUgYmFja2luZyBsaXZlIG9iamVjdCB0 byBiZSBkZWxldGVkLiBUaGlzCmNhdXNlcyBhIGNyYXNoLgoKVGhpcyBwYXRjaCBmaXhlcyB0aGlz IGJ5IGhvbGRpbmcgYSBgUmVmYCB0byB0aGUgQWNjZXNzaWJpbGl0eU9iamVjdCwKZW5zdXJpbmcg aXQgc3RheXMgYWxpdmUgZm9yIGFzIGxvbmcgd2UgbmVlZCBpdC4KCkkgd2Fzbid0IGFibGUgdG8g bWFrZSBhIGxheW91dCB0ZXN0IGZvciB0aGlzLCBhcyB0aGUgY2lyY3Vtc3RhbmNlcyB0bwpyZXBy b2R1Y2UgdGhlIGlzc3VlIGFyZSBjb21wbGV4LgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKFdlYkNvcmU6OkFYSXNvbGF0 ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QpOgooV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6 Y3JlYXRlKToKKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVQcm9wZXJ0aWVz KToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0Lmg6CiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuY3BwOgooV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JP YmplY3QpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmg6CiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv bWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW06CihXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojpp bml0aWFsaXplUGxhdGZvcm1Qcm9wZXJ0aWVzKToKLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRPYmplY3QuY3BwICAgICAgICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiAuLi4vaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaCAgICAgICAgICAgICAgfCAgOCArKysrLS0tLQog Li4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgICAgICAgICAgICAgIHwgMTQgKysr KysrKy0tLS0tLS0KIC4uLi9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5oICB8ICAyICstCiAuLi4vaXNvbGF0ZWR0cmVlL21hYy9BWElzb2xhdGVkT2JqZWN0TWFjLm1t ICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlv bnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXgg NmY0YjRmZDQ0NzY3Li40ZGZkN2M3NThlN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CkBAIC0zOCwxOCArMzgsMTggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1BWElzb2xhdGVk T2JqZWN0OjpBWElzb2xhdGVkT2JqZWN0KEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIEFYSXNvbGF0 ZWRUcmVlKiB0cmVlKQorQVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdChSZWY8QVhD b3JlT2JqZWN0PiBheE9iamVjdCwgQVhJc29sYXRlZFRyZWUqIHRyZWUpCiAgICAgOiBtX2NhY2hl ZFRyZWUodHJlZSkKLSAgICAsIG1faWQoYXhPYmplY3Qub2JqZWN0SUQoKSkKKyAgICAsIG1faWQo YXhPYmplY3QtPm9iamVjdElEKCkpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAg ICBBU1NFUlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4oYXhPYmplY3QpKTsKIAotICAgIGF1dG8q IGF4UGFyZW50ID0gYXhPYmplY3QucGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CisgICAgYXV0byog YXhQYXJlbnQgPSBheE9iamVjdC0+cGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CiAgICAgbV9wYXJl bnRJRCA9IGF4UGFyZW50ID8gYXhQYXJlbnQtPm9iamVjdElEKCkgOiBBWElEKCk7CiAKICAgICBp ZiAobV9pZC5pc1ZhbGlkKCkpIHsKLSAgICAgICAgYXV0byBpc1Jvb3QgPSAhYXhQYXJlbnQgJiYg YXhPYmplY3QuaXNTY3JvbGxWaWV3KCkgPyBJc1Jvb3Q6OlllcyA6IElzUm9vdDo6Tm87CisgICAg ICAgIGF1dG8gaXNSb290ID0gIWF4UGFyZW50ICYmIGF4T2JqZWN0LT5pc1Njcm9sbFZpZXcoKSA/ IElzUm9vdDo6WWVzIDogSXNSb290OjpObzsKICAgICAgICAgaW5pdGlhbGl6ZVByb3BlcnRpZXMo YXhPYmplY3QsIGlzUm9vdCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gU2hvdWxkIG5ldmVy IGhhcHBlbiB1bmRlciBub3JtYWwgY2lyY3Vtc3RhbmNlcy4KQEAgLTU3LDcgKzU3LDcgQEAgQVhJ c29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdChBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBB WElzb2xhdGVkVHJlZSogdHJlZSkKICAgICB9CiB9CiAKLVJlZjxBWElzb2xhdGVkT2JqZWN0PiBB WElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRU cmVlKiB0cmVlKQorUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0 ZShSZWY8QVhDb3JlT2JqZWN0PiBvYmplY3QsIEFYSXNvbGF0ZWRUcmVlKiB0cmVlKQogewogICAg IHJldHVybiBhZG9wdFJlZigqbmV3IEFYSXNvbGF0ZWRPYmplY3Qob2JqZWN0LCB0cmVlKSk7CiB9 CkBAIC03MiwxMCArNzIsMTAgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0KCkKICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFs aXplUHJvcGVydGllcyhBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIElzUm9vdCBpc1Jvb3QpCit2 b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVQcm9wZXJ0aWVzKFJlZjxBWENvcmVPYmpl Y3Q+IGNvcmVPYmplY3QsIElzUm9vdCBpc1Jvb3QpCiB7CiAgICAgQVNTRVJUKGlzPEFjY2Vzc2li aWxpdHlPYmplY3Q+KGNvcmVPYmplY3QpKTsKLSAgICBhdXRvJiBvYmplY3QgPSBkb3duY2FzdDxB Y2Nlc3NpYmlsaXR5T2JqZWN0Pihjb3JlT2JqZWN0KTsKKyAgICBhdXRvJiBvYmplY3QgPSBkb3du Y2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pihjb3JlT2JqZWN0LmdldCgpKTsKIAogICAgIHNldFBy b3BlcnR5KEFYUHJvcGVydHlOYW1lOjpBUklBTGFuZG1hcmtSb2xlRGVzY3JpcHRpb24sIG9iamVj dC5hcmlhTGFuZG1hcmtSb2xlRGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0 UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbiwgb2JqZWN0 LmFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigpLmlzb2xhdGVkQ29weSgpKTsKQEAgLTQwMCw3ICs0 MDAsNyBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVQcm9wZXJ0aWVzKEFYQ29y ZU9iamVjdCYgY29yZU9iamVjdCwgSXNSb290IGlzUgogICAgIGlmIChvYmplY3QuaXNXaWRnZXQo KSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzV2lkZ2V0LCB0cnVlKTsK IAotICAgIGluaXRpYWxpemVQbGF0Zm9ybVByb3BlcnRpZXMob2JqZWN0LCBpc1Jvb3QpOworICAg IGluaXRpYWxpemVQbGF0Zm9ybVByb3BlcnRpZXMoY29yZU9iamVjdCwgaXNSb290KTsKIH0KIAog QVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojphc3NvY2lhdGVkQVhPYmplY3QoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDVhYmNlOGZmYTljNC4uOTUxM2RjOGM1OTI2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCkBAIC00Nyw3ICs0Nyw3IEBAIGNsYXNzIEFYSXNv bGF0ZWRUcmVlOwogY2xhc3MgQVhJc29sYXRlZE9iamVjdCBmaW5hbCA6IHB1YmxpYyBBWENvcmVP YmplY3QgewogICAgIGZyaWVuZCBjbGFzcyBBWElzb2xhdGVkVHJlZTsKIHB1YmxpYzoKLSAgICBz dGF0aWMgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGNyZWF0ZShBWENvcmVPYmplY3QmLCBBWElzb2xh dGVkVHJlZSopOworICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZE9iamVjdD4gY3JlYXRlKFJlZjxB WENvcmVPYmplY3Q+LCBBWElzb2xhdGVkVHJlZSopOwogICAgIH5BWElzb2xhdGVkT2JqZWN0KCk7 CiAKICAgICB2b2lkIHNldE9iamVjdElEKEFYSUQgaWQpIG92ZXJyaWRlIHsgbV9pZCA9IGlkOyB9 CkBAIC02NiwxMyArNjYsMTMgQEAgcHJpdmF0ZToKICAgICBBWElzb2xhdGVkVHJlZSogdHJlZSgp IGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkVHJlZS5nZXQoKTsgfQogCiAgICAgQVhJc29sYXRlZE9i amVjdCgpID0gZGVmYXVsdDsKLSAgICBBWElzb2xhdGVkT2JqZWN0KEFYQ29yZU9iamVjdCYsIEFY SXNvbGF0ZWRUcmVlKik7CisgICAgQVhJc29sYXRlZE9iamVjdChSZWY8QVhDb3JlT2JqZWN0Piwg QVhJc29sYXRlZFRyZWUqKTsKICAgICBib29sIGlzQVhJc29sYXRlZE9iamVjdEluc3RhbmNlKCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIEFYQ29yZU9iamVjdCogYXNzb2Np YXRlZEFYT2JqZWN0KCkgY29uc3Q7CiAKICAgICBlbnVtIGNsYXNzIElzUm9vdCA6IGJvb2wgeyBZ ZXMsIE5vIH07Ci0gICAgdm9pZCBpbml0aWFsaXplUHJvcGVydGllcyhBWENvcmVPYmplY3QmLCBJ c1Jvb3QpOwotICAgIHZvaWQgaW5pdGlhbGl6ZVBsYXRmb3JtUHJvcGVydGllcyhjb25zdCBBWENv cmVPYmplY3QmLCBJc1Jvb3QpOworICAgIHZvaWQgaW5pdGlhbGl6ZVByb3BlcnRpZXMoUmVmPEFY Q29yZU9iamVjdD4sIElzUm9vdCk7CisgICAgdm9pZCBpbml0aWFsaXplUGxhdGZvcm1Qcm9wZXJ0 aWVzKFJlZjxjb25zdCBBWENvcmVPYmplY3Q+LCBJc1Jvb3QpOwogCiAgICAgdm9pZCBzZXRQcm9w ZXJ0eShBWFByb3BlcnR5TmFtZSwgQVhQcm9wZXJ0eVZhbHVlVmFyaWFudCYmLCBib29sIHNob3Vs ZFJlbW92ZSA9IGZhbHNlKTsKICAgICB2b2lkIHNldE9iamVjdFByb3BlcnR5KEFYUHJvcGVydHlO YW1lLCBBWENvcmVPYmplY3QqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAyMjY2MmU5 MzE4ZWYuLmJkODNhOThmODA2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAtMjA5LDE1 ICsyMDksMTUgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6Z2VuZXJhdGVTdWJ0cmVlKEFYQ29yZU9i amVjdCYgYXhPYmplY3QpCiAgICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRDaGFuZ2VzKHsg fSk7CiB9CiAKLXN0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNv bGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIEF0 dGFjaFdyYXBwZXIgYXR0YWNoV3JhcHBlcikKK3N0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6 Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KFJlZjxBWENv cmVPYmplY3Q+IGF4T2JqZWN0LCBBdHRhY2hXcmFwcGVyIGF0dGFjaFdyYXBwZXIpCiB7CiAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIC8vIFdlIHNob3VsZCBuZXZlciBjcmVhdGUg YW4gaXNvbGF0ZWQgb2JqZWN0IGZyb20gYW4gaWdub3JlZCBvYmplY3QuCi0gICAgaWYgKGF4T2Jq ZWN0LmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkKKyAgICBpZiAoYXhPYmplY3QtPmFjY2Vzc2li aWxpdHlJc0lnbm9yZWQoKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIGlm ICghYXhPYmplY3Qub2JqZWN0SUQoKS5pc1ZhbGlkKCkpIHsKKyAgICBpZiAoIWF4T2JqZWN0LT5v YmplY3RJRCgpLmlzVmFsaWQoKSkgewogICAgICAgICAvLyBFaXRoZXIgdGhlIGF4T2JqZWN0IGhh cyBhbiBpbnZhbGlkIElEIG9yIHNvbWV0aGluZyBlbHNlIHdlbnQgdGVycmlibHkgd3JvbmcuIERv bid0IGJvdGhlciBkb2luZyBhbnl0aGluZyBlbHNlLgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKQEAgLTIyNiwxNSArMjI2LDE1IEBA IHN0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVl Ojpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYCiAgICAgYXV0byBvYmplY3QgPSBBWElzb2xhdGVkT2Jq ZWN0OjpjcmVhdGUoYXhPYmplY3QsIHRoaXMpOwogICAgIE5vZGVDaGFuZ2Ugbm9kZUNoYW5nZSB7 IG9iamVjdCwgbnVsbHB0ciB9OwogCi0gICAgQVNTRVJUKGF4T2JqZWN0LndyYXBwZXIoKSk7Cisg ICAgQVNTRVJUKGF4T2JqZWN0LT53cmFwcGVyKCkpOwogICAgIGlmIChhdHRhY2hXcmFwcGVyID09 IEF0dGFjaFdyYXBwZXI6Ok9uTWFpblRocmVhZCkKLSAgICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0 Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3JhcHBlcigpKTsKKyAgICAgICAgb2JqZWN0LT5hdHRhY2hQ bGF0Zm9ybVdyYXBwZXIoYXhPYmplY3QtPndyYXBwZXIoKSk7CiAgICAgZWxzZSB7CiAgICAgICAg IC8vIFNldCB0aGUgd3JhcHBlciBpbiB0aGUgTm9kZUNoYW5nZSBzbyB0aGF0IGl0IGlzIHNldCBv biB0aGUgQVggdGhyZWFkLgotICAgICAgICBub2RlQ2hhbmdlLndyYXBwZXIgPSBheE9iamVjdC53 cmFwcGVyKCk7CisgICAgICAgIG5vZGVDaGFuZ2Uud3JhcHBlciA9IGF4T2JqZWN0LT53cmFwcGVy KCk7CiAgICAgfQogCi0gICAgbV9ub2RlTWFwLnNldChheE9iamVjdC5vYmplY3RJRCgpLCBQYXJl bnRDaGlsZHJlbklEcyB7IG5vZGVDaGFuZ2UuaXNvbGF0ZWRPYmplY3QtPnBhcmVudCgpLCBheE9i amVjdC5jaGlsZHJlbklEcygpIH0pOworICAgIG1fbm9kZU1hcC5zZXQoYXhPYmplY3QtPm9iamVj dElEKCksIFBhcmVudENoaWxkcmVuSURzIHsgbm9kZUNoYW5nZS5pc29sYXRlZE9iamVjdC0+cGFy ZW50KCksIGF4T2JqZWN0LT5jaGlsZHJlbklEcygpIH0pOwogCiAgICAgaWYgKCFub2RlQ2hhbmdl Lmlzb2xhdGVkT2JqZWN0LT5wYXJlbnQoKS5pc1ZhbGlkKCkpIHsKICAgICAgICAgTG9ja2VyIGxv Y2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggMjQ5N2I1 MmZiNzNjLi4yMjhlMGUwYmY5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMzg1LDcgKzM4 NSw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIEhhc2hNYXA8UGFnZUlkZW50aWZpZXIsIFJlZjxB WElzb2xhdGVkVHJlZT4+JiB0cmVlUGFnZUNhY2hlKCkgV1RGX1JFUVVJUkVTX0xPQ0soc19jYWNo ZUxvY2spOwogCiAgICAgZW51bSBjbGFzcyBBdHRhY2hXcmFwcGVyIDogYm9vbCB7IE9uTWFpblRo cmVhZCwgT25BWFRocmVhZCB9OwotICAgIHN0ZDo6b3B0aW9uYWw8Tm9kZUNoYW5nZT4gbm9kZUNo YW5nZUZvck9iamVjdChBWENvcmVPYmplY3QmLCBBdHRhY2hXcmFwcGVyID0gQXR0YWNoV3JhcHBl cjo6T25NYWluVGhyZWFkKTsKKyAgICBzdGQ6Om9wdGlvbmFsPE5vZGVDaGFuZ2U+IG5vZGVDaGFu Z2VGb3JPYmplY3QoUmVmPEFYQ29yZU9iamVjdD4sIEF0dGFjaFdyYXBwZXIgPSBBdHRhY2hXcmFw cGVyOjpPbk1haW5UaHJlYWQpOwogICAgIHZvaWQgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJl ZShBWENvcmVPYmplY3QmKTsKICAgICBib29sIGlzQ29sbGVjdGluZ05vZGVDaGFuZ2VzKCkgY29u c3QgeyByZXR1cm4gbV9jb2xsZWN0aW5nTm9kZUNoYW5nZXNBdFRyZWVMZXZlbCA+IDA7IH0KICAg ICB2b2lkIHF1ZXVlQ2hhbmdlKGNvbnN0IE5vZGVDaGFuZ2UmKSBXVEZfUkVRVUlSRVNfTE9DSyht X2NoYW5nZUxvZ0xvY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9tYWMvQVhJc29sYXRlZE9iamVjdE1hYy5tbQpp bmRleCBlZDE5NDE1NTU4NzAuLmZkYzI2ZmUxMjNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNv bGF0ZWRPYmplY3RNYWMubW0KQEAgLTMyLDE4ICszMiwxOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLXZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZVBsYXRmb3JtUHJvcGVydGll cyhjb25zdCBBWENvcmVPYmplY3QmIG9iamVjdCwgSXNSb290IGlzUm9vdCkKK3ZvaWQgQVhJc29s YXRlZE9iamVjdDo6aW5pdGlhbGl6ZVBsYXRmb3JtUHJvcGVydGllcyhSZWY8Y29uc3QgQVhDb3Jl T2JqZWN0PiBvYmplY3QsIElzUm9vdCBpc1Jvb3QpCiB7Ci0gICAgc2V0UHJvcGVydHkoQVhQcm9w ZXJ0eU5hbWU6Okhhc0FwcGxlUERGQW5ub3RhdGlvbkF0dHJpYnV0ZSwgb2JqZWN0Lmhhc0FwcGxl UERGQW5ub3RhdGlvbkF0dHJpYnV0ZSgpKTsKLSAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFt ZTo6U3BlZWNoSGludCwgb2JqZWN0LnNwZWVjaEhpbnRBdHRyaWJ1dGVWYWx1ZSgpLmlzb2xhdGVk Q29weSgpKTsKLSAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6Q2FyZXRCcm93c2luZ0Vu YWJsZWQsIG9iamVjdC5jYXJldEJyb3dzaW5nRW5hYmxlZCgpKTsKKyAgICBzZXRQcm9wZXJ0eShB WFByb3BlcnR5TmFtZTo6SGFzQXBwbGVQREZBbm5vdGF0aW9uQXR0cmlidXRlLCBvYmplY3QtPmhh c0FwcGxlUERGQW5ub3RhdGlvbkF0dHJpYnV0ZSgpKTsKKyAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6U3BlZWNoSGludCwgb2JqZWN0LT5zcGVlY2hIaW50QXR0cmlidXRlVmFsdWUoKS5p c29sYXRlZENvcHkoKSk7CisgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkNhcmV0QnJv d3NpbmdFbmFibGVkLCBvYmplY3QtPmNhcmV0QnJvd3NpbmdFbmFibGVkKCkpOwogCiAgICAgaWYg KGlzUm9vdCA9PSBJc1Jvb3Q6OlllcykKLSAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5h bWU6OlByZXZlbnRLZXlib2FyZERPTUV2ZW50RGlzcGF0Y2gsIG9iamVjdC5wcmV2ZW50S2V5Ym9h cmRET01FdmVudERpc3BhdGNoKCkpOworICAgICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFt ZTo6UHJldmVudEtleWJvYXJkRE9NRXZlbnREaXNwYXRjaCwgb2JqZWN0LT5wcmV2ZW50S2V5Ym9h cmRET01FdmVudERpc3BhdGNoKCkpOwogCi0gICAgaWYgKG9iamVjdC5pc1Njcm9sbFZpZXcoKSkg ewotICAgICAgICBtX3BsYXRmb3JtV2lkZ2V0ID0gb2JqZWN0LnBsYXRmb3JtV2lkZ2V0KCk7Ci0g ICAgICAgIG1fcmVtb3RlUGFyZW50ID0gb2JqZWN0LnJlbW90ZVBhcmVudE9iamVjdCgpOworICAg IGlmIChvYmplY3QtPmlzU2Nyb2xsVmlldygpKSB7CisgICAgICAgIG1fcGxhdGZvcm1XaWRnZXQg PSBvYmplY3QtPnBsYXRmb3JtV2lkZ2V0KCk7CisgICAgICAgIG1fcmVtb3RlUGFyZW50ID0gb2Jq ZWN0LT5yZW1vdGVQYXJlbnRPYmplY3QoKTsKICAgICB9CiB9CiAK