236165 2022-02-04 16:24:26 -0800 Update MediaStreamTrack understanding of source type 2022-02-04 21:34:10 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1837639 0 eric.carlson 2022-02-04 16:24:26 -0800 Bug 235838 changed RealtimeMediaSource::type() to have more than 'audio' and 'video', but didn't update MediaStream/MediaStreamTrack accordingly. 1837640 1 webkit-bug-importer 2022-02-04 16:24:37 -0800 <rdar://problem/88513632> 1837647 2 450949 eric.carlson 2022-02-04 16:40:21 -0800 Created attachment 450949 Patch 1837648 3 450949 jer.noble 2022-02-04 16:42:43 -0800 Comment on attachment 450949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450949&action=review > Source/WebCore/ChangeLog:11 > + wasn't updated to account for the. Instead of checking a source's type, use the new "wasn't updated to account for the." I'm dying with anticipation! 1837660 4 450953 eric.carlson 2022-02-04 16:52:55 -0800 Created attachment 450953 Patch 1837667 5 450957 eric.carlson 2022-02-04 17:36:43 -0800 Created attachment 450957 Patch 1837678 6 450960 eric.carlson 2022-02-04 18:40:03 -0800 Created attachment 450960 Patch 1837704 7 ews-feeder 2022-02-04 21:34:07 -0800 Committed r289149 (246845@main): <https://commits.webkit.org/246845@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450960. 450949 2022-02-04 16:40:21 -0800 2022-02-04 17:06:50 -0800 Patch bug-236165-20220204164020.patch text/plain 14593 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ0OGY4NDljYzc4ZTk1 MTVkOWJmNTM0YzRlYzgwMTk2NjI3NzgwZi4uOWIyZmUzM2E4YzE2Mjk1NGJlMjYwNGIwMWRiMzll YzdmZDEwYTQzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAyLTA0ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBNZWRp YVN0cmVhbVRyYWNrIHVuZGVyc3RhbmRpbmcgb2Ygc291cmNlIHR5cGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjE2NQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODg1MTM2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBCZWZvcmUgYnVnIDIzNTgzOCwgUmVhbHRpbWVNZWRpYVNvdXJj ZTo6VHlwZSB3YXMgZWl0aGVyIEF1ZGlvIG9yIFZpZGVvLiBUaGF0IGJ1ZworICAgICAgICBhZGRl ZCBuZXcgdHlwZXMgZm9yIHNjcmVlbiwgd2luZG93LCBhbmQgc3lzdGVtIGF1ZGlvIGNhcHR1cmUs IGJ1dCBNZWRpYVN0cmVhbVRyYWNrCisgICAgICAgIHdhc24ndCB1cGRhdGVkIHRvIGFjY291bnQg Zm9yIHRoZS4gSW5zdGVhZCBvZiBjaGVja2luZyBhIHNvdXJjZSdzIHR5cGUsIHVzZSB0aGUgbmV3 CisgICAgICAgIGBoYXNBdWRpb2AgYW5kICdoYXNWaWRlb2AgbWV0aG9kcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh U3RyZWFtOjpnZXRBdWRpb1RyYWNrcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0 cmVhbTo6Z2V0VmlkZW9UcmFja3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJl YW06OmZpbHRlcmVkVHJhY2tzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt Ojp0cmFja1ZlY3RvckZvclR5cGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaDoKKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRy YWNrOjpNZWRpYVN0cmVhbVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJh Y2s6On5NZWRpYVN0cmVhbVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJh Y2s6OmtpbmQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6c2V0 Q29udGVudEhpbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6dHJhY2tF bmRlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjppc0NhcHR1cmluZ0F1 ZGlvIGNvbnN0KToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJh Y2suaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6Omhhc1ZpZGVvIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6Omhhc0F1ZGlvIGNvbnN0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5o OgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1lZGlhU291cmNlOjpzZXRUeXBlKTogCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5oOgorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvRGlzcGxheUNhcHR1cmVTb3VyY2VD b2NvYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzb3VyY2VUeXBlRm9yRGV2aWNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRpc3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OkRpc3BsYXlDYXB0dXJlU291 cmNlQ29jb2EpOiBTZXQgdGhlIGNvcnJlY3QKKyAgICAgICAgc291cmNlIHR5cGUuCisKIDIwMjIt MDItMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1l bnQgQWJvcnRTaWduYWwudGltZW91dCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwCmluZGV4IDFmZDdkZWEzN2Y5ZjhmNzBmMDc2ODdk YTVkMTgxN2JkMjZmOTYwM2IuLjVkZDhjNjZjZDg0Y2ZmOWUzYmY3YTYwYzg4YWI5NGE3NTIyNjYw YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFT dHJlYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFT dHJlYW0uY3BwCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBHb29n bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEy LCAyMDE1IEVyaWNzc29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChD KSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJp Z2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVz KS4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKQEAgLTE1OCwxMiArMTU4LDE2IEBAIE1lZGlhU3RyZWFtVHJh Y2sqIE1lZGlhU3RyZWFtOjpnZXRUcmFja0J5SWQoU3RyaW5nIGlkKQogCiBNZWRpYVN0cmVhbVRy YWNrVmVjdG9yIE1lZGlhU3RyZWFtOjpnZXRBdWRpb1RyYWNrcygpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIHRyYWNrVmVjdG9yRm9yVHlwZShSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbyk7 CisgICAgcmV0dXJuIGZpbHRlcmVkVHJhY2tzKFtdIChhdXRvJiB0cmFjaykgbXV0YWJsZSB7Cisg ICAgICAgIHJldHVybiB0cmFjay5oYXNBdWRpbygpOworICAgIH0pOwogfQogCiBNZWRpYVN0cmVh bVRyYWNrVmVjdG9yIE1lZGlhU3RyZWFtOjpnZXRWaWRlb1RyYWNrcygpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIHRyYWNrVmVjdG9yRm9yVHlwZShSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpWaWRl byk7CisgICAgcmV0dXJuIGZpbHRlcmVkVHJhY2tzKFtdIChhdXRvJiB0cmFjaykgbXV0YWJsZSB7 CisgICAgICAgIHJldHVybiB0cmFjay5oYXNWaWRlbygpOworICAgIH0pOwogfQogCiBNZWRpYVN0 cmVhbVRyYWNrVmVjdG9yIE1lZGlhU3RyZWFtOjpnZXRUcmFja3MoKSBjb25zdApAQCAtMzI4LDEx ICszMzIsMTEgQEAgdm9pZCBNZWRpYVN0cmVhbTo6dXBkYXRlQWN0aXZlU3RhdGUoKQogICAgIHNl dElzQWN0aXZlKGFjdGl2ZSk7CiB9CiAKLU1lZGlhU3RyZWFtVHJhY2tWZWN0b3IgTWVkaWFTdHJl YW06OnRyYWNrVmVjdG9yRm9yVHlwZShSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlIGZpbHRlclR5 cGUpIGNvbnN0CitNZWRpYVN0cmVhbVRyYWNrVmVjdG9yIE1lZGlhU3RyZWFtOjpmaWx0ZXJlZFRy YWNrcyhjb25zdCBGdW5jdGlvbjxib29sKGNvbnN0IE1lZGlhU3RyZWFtVHJhY2smKT4mIGZpbHRl cikgY29uc3QKIHsKICAgICBNZWRpYVN0cmVhbVRyYWNrVmVjdG9yIHRyYWNrczsKICAgICBmb3Ig KGF1dG8mIHRyYWNrIDogbV90cmFja1NldC52YWx1ZXMoKSkgewotICAgICAgICBpZiAodHJhY2st PnNvdXJjZSgpLnR5cGUoKSA9PSBmaWx0ZXJUeXBlKQorICAgICAgICBpZiAoZmlsdGVyKCp0cmFj aykpCiAgICAgICAgICAgICB0cmFja3MuYXBwZW5kKHRyYWNrKTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaAppbmRleCAzNDE4 Y2Y2M2M5NzY1MDYxZTdkZjFkMGZhNWJiY2I2YWU1YmZjMjljLi43NDMxODBkMjliZWM1MzU3ZGYw YzFlNDgyZmU4YTI1NjRkYmU5MDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdo dCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0 IChDKSAyMDExLCAyMDE1IEVyaWNzc29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29w eXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICog Q29weXJpZ2h0IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICogQ29weXJpZ2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lk aWFyeSgtaWVzKS4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKQEAgLTEzNyw3ICsxMzcsNyBAQCBwcml2YXRl OgogICAgIHZvaWQgc2V0SXNBY3RpdmUoYm9vbCk7CiAgICAgdm9pZCBzdGF0dXNEaWRDaGFuZ2Uo KTsKIAotICAgIE1lZGlhU3RyZWFtVHJhY2tWZWN0b3IgdHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGUpIGNvbnN0OworICAgIE1lZGlhU3RyZWFtVHJhY2tWZWN0b3Ig ZmlsdGVyZWRUcmFja3MoY29uc3QgRnVuY3Rpb248Ym9vbChjb25zdCBNZWRpYVN0cmVhbVRyYWNr Jik+JikgY29uc3Q7CiAKICAgICBSZWY8TWVkaWFTdHJlYW1Qcml2YXRlPiBtX3ByaXZhdGU7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJl YW1UcmFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtVHJhY2suY3BwCmluZGV4IGU5NjNkYWRmOWYxZDFlMDhlNGE4NTcyZjY2N2RlNzAxOWNmMjIy NjguLmJlYmU4ZWYxZjJhZjE2ZGY4Mjc3NDkxMWFiMWZjNTllNzJkNGU4MDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNr LmNwcApAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNSBFcmlj c3NvbiBBQi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE5 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0y MDIyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAx MyBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CkBAIC05Myw3ICs5Myw3IEBAIE1lZGlhU3RyZWFtVHJhY2s6Ok1lZGlhU3RyZWFt VHJhY2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgUmVmPE1lZGlhU3RyCiAKICAg ICBhbGxDYXB0dXJlVHJhY2tzKCkuYWRkKHRoaXMpOwogCi0gICAgaWYgKG1fcHJpdmF0ZS0+dHlw ZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKQorICAgIGlmIChtX3ByaXZh dGUtPmhhc0F1ZGlvKCkpCiAgICAgICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hh cmVkTWFuYWdlcigpLmFkZEF1ZGlvQ2FwdHVyZVNvdXJjZSgqdGhpcyk7CiB9CiAKQEAgLTEwNiw3 ICsxMDYsNyBAQCBNZWRpYVN0cmVhbVRyYWNrOjp+TWVkaWFTdHJlYW1UcmFjaygpCiAKICAgICBh bGxDYXB0dXJlVHJhY2tzKCkucmVtb3ZlKHRoaXMpOwogCi0gICAgaWYgKG1fcHJpdmF0ZS0+dHlw ZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKQorICAgIGlmIChtX3ByaXZh dGUtPmhhc0F1ZGlvKCkpCiAgICAgICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hh cmVkTWFuYWdlcigpLnJlbW92ZUF1ZGlvQ2FwdHVyZVNvdXJjZSgqdGhpcyk7CiB9CiAKQEAgLTEx NSw3ICsxMTUsNyBAQCBjb25zdCBBdG9tU3RyaW5nJiBNZWRpYVN0cmVhbVRyYWNrOjpraW5kKCkg Y29uc3QKICAgICBzdGF0aWMgTWFpblRocmVhZE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJp bmc+IGF1ZGlvS2luZCgiYXVkaW8iLCBBdG9tU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7 CiAgICAgc3RhdGljIE1haW5UaHJlYWROZXZlckRlc3Ryb3llZDxjb25zdCBBdG9tU3RyaW5nPiB2 aWRlb0tpbmQoInZpZGVvIiwgQXRvbVN0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOwogCi0g ICAgaWYgKG1fcHJpdmF0ZS0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1 ZGlvKQorICAgIGlmIChtX3ByaXZhdGUtPmhhc0F1ZGlvKCkpCiAgICAgICAgIHJldHVybiBhdWRp b0tpbmQ7CiAgICAgcmV0dXJuIHZpZGVvS2luZDsKIH0KQEAgLTE1OSw3ICsxNTksNyBAQCBjb25z dCBBdG9tU3RyaW5nJiBNZWRpYVN0cmVhbVRyYWNrOjpjb250ZW50SGludCgpIGNvbnN0CiB2b2lk IE1lZGlhU3RyZWFtVHJhY2s6OnNldENvbnRlbnRIaW50KGNvbnN0IFN0cmluZyYgaGludFZhbHVl KQogewogICAgIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpIaW50VmFsdWUgdmFsdWU7Ci0gICAg aWYgKG1fcHJpdmF0ZS0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv KSB7CisgICAgaWYgKG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkgewogICAgICAgICBpZiAoaGludFZh bHVlID09ICIiKQogICAgICAgICAgICAgdmFsdWUgPSBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6 SGludFZhbHVlOjpFbXB0eTsKICAgICAgICAgZWxzZSBpZiAoaGludFZhbHVlID09ICJzcGVlY2gi KQpAQCAtNTc4LDcgKzU3OCw3IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFjazo6dHJhY2tTdGFydGVk KE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJikKIAogdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjp0cmFj a0VuZGVkKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJikKIHsKLSAgICBpZiAobV9pc0NhcHR1cmVU cmFjayAmJiBtX3ByaXZhdGUtPnR5cGUoKSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpB dWRpbykKKyAgICBpZiAobV9pc0NhcHR1cmVUcmFjayAmJiBtX3ByaXZhdGUtPmhhc0F1ZGlvKCkp CiAgICAgICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLnJl bW92ZUF1ZGlvQ2FwdHVyZVNvdXJjZSgqdGhpcyk7CiAKICAgICBBTFdBWVNfTE9HKExPR0lERU5U SUZJRVIpOwpAQCAtNjgxLDcgKzY4MSw3IEBAIERvY3VtZW50KiBNZWRpYVN0cmVhbVRyYWNrOjpk b2N1bWVudCgpIGNvbnN0CiAKIGJvb2wgTWVkaWFTdHJlYW1UcmFjazo6aXNDYXB0dXJpbmdBdWRp bygpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGlzQ2FwdHVyZVRyYWNrKCkgJiYgbV9wcml2YXRlLT50 eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pOworICAgIEFTU0VSVChp c0NhcHR1cmVUcmFjaygpICYmIG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSk7CiAgICAgcmV0dXJuICFl bmRlZCgpICYmICFtdXRlZCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCmluZGV4IDliOTViOThmZmM4YzM3ZWU1 YTk5MDUwNzAxZmQxOTUxZTk3Yzg3NTAuLmM5YTQzODU5MzU5YWE0ZDhmNzBmYmY0NTUyOWIxYTZl NTdmYjFiOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1UcmFjay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1UcmFjay5oCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAo QykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChD KSAyMDExLCAyMDE1IEVyaWNzc29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJp Z2h0IChDKSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICog Q29weXJpZ2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFy eSgtaWVzKS4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKQEAgLTEwMCw2ICsxMDAsOCBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzdG9wVHJhY2soU3RvcE1vZGUgPSBTdG9wTW9kZTo6U2lsZW50bHkpOwogCiAgICAg Ym9vbCBpc0NhcHR1cmVUcmFjaygpIGNvbnN0IHsgcmV0dXJuIG1faXNDYXB0dXJlVHJhY2s7IH0K KyAgICBib29sIGhhc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gbV9wcml2YXRlLT5oYXNWaWRlbygp OyB9CisgICAgYm9vbCBoYXNBdWRpbygpIGNvbnN0IHsgcmV0dXJuIG1fcHJpdmF0ZS0+aGFzQXVk aW8oKTsgfQogCiAgICAgc3RydWN0IFRyYWNrU2V0dGluZ3MgewogICAgICAgICBzdGQ6Om9wdGlv bmFsPGludD4gd2lkdGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaAppbmRleCA3NjhjZWRmMzE4 N2NiNGZkMWZiNjc0ZDI2NDkzOGQ0MTcwMjc3OWM4Li5kZDJlMTQ5ZjgxM2IxZDc2MGVkZGE1ODhi ZGJiYjQyMTA3YzI5MjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmgKQEAgLTEsNyArMSw3 IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBp dHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqIENvcHlyaWdodCAoQykgMjAxNSBFcmljc3NvbiBBQi4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE5IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDIyIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtOTYsNiArOTYsOCBAQCBwdWJsaWM6CiAgICAgUmVhbHRpbWVNZWRpYVNvdXJjZSYgc291 cmNlKCkgeyByZXR1cm4gbV9zb3VyY2UuZ2V0KCk7IH0KICAgICBjb25zdCBSZWFsdGltZU1lZGlh U291cmNlJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5nZXQoKTsgfQogICAgIFdF QkNPUkVfRVhQT1JUIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgdHlwZSgpIGNvbnN0OworICAg IGJvb2wgaGFzVmlkZW8oKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS0+aGFzVmlkZW8oKTsgfQor ICAgIGJvb2wgaGFzQXVkaW8oKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS0+aGFzQXVkaW8oKTsg fQogCiAgICAgdm9pZCBlbmRUcmFjaygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwCmluZGV4IGU4 NDJjYjAyNDY1NjE4MzY2NmIyNjE1MzNkY2IxZWJkNDJhNWExYjMuLjQ1MzAxZjNhOTNlOTBmNjkx YzdlZDVmNGExNzU5ODQzNmRkMGIwZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwCkBAIC0xMTE0 LDYgKzExMTQsMjAgQEAgU3RyaW5nIFJlYWx0aW1lTWVkaWFTb3VyY2U6OmRldmljZUlESGFzaFNh bHQoKSBjb25zdAogICAgIHJldHVybiBtX2lkSGFzaFNhbHQ7CiB9CiAKK3ZvaWQgUmVhbHRpbWVN ZWRpYVNvdXJjZTo6c2V0VHlwZShUeXBlIHR5cGUpCit7CisgICAgaWYgKHR5cGUgPT0gbV90eXBl KQorICAgICAgICByZXR1cm47CisKKyAgICBtX3R5cGUgPSB0eXBlOworCisgICAgc2NoZWR1bGVE ZWZlcnJlZFRhc2soW3RoaXNdIHsKKyAgICAgICAgZm9yRWFjaE9ic2VydmVyKFtdKGF1dG8mIG9i c2VydmVyKSB7CisgICAgICAgICAgICBvYnNlcnZlci5zb3VyY2VTZXR0aW5nc0NoYW5nZWQoKTsK KyAgICAgICAgfSk7CisgICAgfSk7Cit9CisKIFJlYWx0aW1lTWVkaWFTb3VyY2U6Ok9ic2VydmVy Ojp+T2JzZXJ2ZXIoKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5oCmluZGV4IGNhOGNjOWQ1NmE1ZGYx YWVhMmRhMmZhZmJmMTExZjhlMTIyZWUxZTguLmQxNDZhNTJiNmFkZTY2NTUzOTg0YTkyMTUwMDJm ZjAzZGQ1ZDM2YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICog Q29weXJpZ2h0IChDKSAyMDExIEVyaWNzc29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICog Q29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJz aWRpYXJ5KC1pZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTE3LDYgKzExNyw4IEBAIHB1Ymxp YzoKIAogICAgIGVudW0gY2xhc3MgVHlwZSB7IE5vbmUsIEF1ZGlvLCBWaWRlbywgU2NyZWVuLCBX aW5kb3csIFN5c3RlbUF1ZGlvIH07CiAgICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90 eXBlOyB9CisgICAgYm9vbCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBl OjpWaWRlbyB8fCBtX3R5cGUgPT0gVHlwZTo6V2luZG93IHx8IG1fdHlwZSA9PSBUeXBlOjpTY3Jl ZW47IH0KKyAgICBib29sIGhhc0F1ZGlvKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6 OkF1ZGlvIHx8IG1fdHlwZSA9PSBUeXBlOjpTeXN0ZW1BdWRpbzsgfQogCiAgICAgdmlydHVhbCB2 b2lkIHdoZW5SZWFkeShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyk+JiYpOwogCkBAIC0y NTIsNiArMjU0LDggQEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBlbmQoT2JzZXJ2ZXIqID0gbnVs bHB0cik7CiAKKyAgICB2b2lkIHNldFR5cGUoVHlwZSk7CisKIHByaXZhdGU6CiAgICAgdmlydHVh bCB2b2lkIHN0YXJ0UHJvZHVjaW5nRGF0YSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzdG9wUHJv ZHVjaW5nRGF0YSgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vY29jb2EvRGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29h LmNwcAppbmRleCA0ZTg3YjVhZWI1Nzc0MWZiMWM1YmRkMmM5MjVjZTc2YThmNWVhOTRjLi5lODAy NDJlNTc0NzdhYjU4ZjQ3NzE5NjMzYTBmYThlOGVkNGY5OWRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNv Y29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9E aXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hLmNwcApAQCAtNTksNiArNTksMzAgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCitzdGF0aWMgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSBzb3VyY2VU eXBlRm9yRGV2aWNlKGNvbnN0IENhcHR1cmVEZXZpY2UmIGRldmljZSkKK3sKKyAgICBzd2l0Y2gg KGRldmljZS50eXBlKCkpIHsKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OlNj cmVlbjoKKyAgICAgICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlNjcmVlbjsK KyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OldpbmRvdzoKKyAgICAgICAgcmV0 dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OldpbmRvdzsKKyAgICBjYXNlIENhcHR1cmVE ZXZpY2U6OkRldmljZVR5cGU6OlN5c3RlbUF1ZGlvOgorICAgICAgICByZXR1cm4gUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZTo6U3lzdGVtQXVkaW87CisgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpE ZXZpY2VUeXBlOjpNaWNyb3Bob25lOgorICAgICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJj ZTo6VHlwZTo6QXVkaW87CisgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpDYW1l cmE6CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpWaWRlbzsKKyAg ICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OlNwZWFrZXI6CisgICAgY2FzZSBDYXB0 dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpVbmtub3duOgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6Ok5vbmU7Cisg ICAgICAgIGJyZWFrOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJl dHVybiBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpOb25lOworfQorCiBDYXB0dXJlU291cmNl T3JFcnJvciBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpjcmVhdGUoY29uc3QgQ2FwdHVyZURl dmljZSYgZGV2aWNlLCBTdHJpbmcmJiBoYXNoU2FsdCwgY29uc3QgTWVkaWFDb25zdHJhaW50cyog Y29uc3RyYWludHMpCiB7CiAgICAgc3dpdGNoIChkZXZpY2UudHlwZSgpKSB7CkBAIC0xMDYsNyAr MTMwLDcgQEAgQ2FwdHVyZVNvdXJjZU9yRXJyb3IgRGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYTo6 Y3JlYXRlKEV4cGVjdGVkPFVuaXF1ZVJlZjxDYXB0dXIKIH0KIAogRGlzcGxheUNhcHR1cmVTb3Vy Y2VDb2NvYTo6RGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYShVbmlxdWVSZWY8Q2FwdHVyZXI+JiYg Y2FwdHVyZXIsIFN0cmluZyYmIG5hbWUsIFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcmJiBoYXNo U2FsdCkKLSAgICA6IFJlYWx0aW1lTWVkaWFTb3VyY2UoVHlwZTo6VmlkZW8sIFdURk1vdmUobmFt ZSksIFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICA6IFJlYWx0aW1l TWVkaWFTb3VyY2Uoc291cmNlVHlwZUZvckRldmljZShjYXB0dXJlci5kZXZpY2VUeXBlKCkpLCBX VEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShoYXNoU2FsdCkpCiAgICAg LCBtX2NhcHR1cmVyKFdURk1vdmUoY2FwdHVyZXIpKQogICAgICwgbV90aW1lcihSdW5Mb29wOjpj dXJyZW50KCksIHRoaXMsICZEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjplbWl0RnJhbWUpCiB7 Cg== 450953 2022-02-04 16:52:55 -0800 2022-02-04 18:27:06 -0800 Patch bug-236165-20220204165254.patch text/plain 14583 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ0OGY4NDljYzc4ZTk1 MTVkOWJmNTM0YzRlYzgwMTk2NjI3NzgwZi4uYTMyM2E1NTFiNzllYWRiOGI0Mzc0NTc4MjhmZWFi OWY0NGNkMWIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAyLTA0ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBNZWRp YVN0cmVhbVRyYWNrIHVuZGVyc3RhbmRpbmcgb2Ygc291cmNlIHR5cGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjE2NQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODg1MTM2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmVyIE5vYmxlLgorICAg ICAgICAKKyAgICAgICAgQmVmb3JlIGJ1ZyAyMzU4MzgsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5 cGUgd2FzIGVpdGhlciBBdWRpbyBvciBWaWRlby4gVGhhdCBidWcKKyAgICAgICAgYWRkZWQgbmV3 IHR5cGVzIGZvciBzY3JlZW4sIHdpbmRvdywgYW5kIHN5c3RlbSBhdWRpbyBjYXB0dXJlLCBidXQg TWVkaWFTdHJlYW1UcmFjaworICAgICAgICB3YXNuJ3QgdXBkYXRlZCB0byBhY2NvdW50IGZvciB0 aGVtLiBJbnN0ZWFkIG9mIGNoZWNraW5nIGEgc291cmNlJ3MgdHlwZSwgdXNlIHRoZSBuZXcKKyAg ICAgICAgYGhhc0F1ZGlvYCBhbmQgJ2hhc1ZpZGVvYCBtZXRob2RzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJl YW06OmdldEF1ZGlvVHJhY2tzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt OjpnZXRWaWRlb1RyYWNrcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6 ZmlsdGVyZWRUcmFja3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnRy YWNrVmVjdG9yRm9yVHlwZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5oOgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6 Ok1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 fk1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 a2luZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjpzZXRDb250 ZW50SGludCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjp0cmFja0VuZGVk KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6OmlzQ2FwdHVyaW5nQXVkaW8g Y29uc3QpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5o OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzVmlkZW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzQXVkaW8gY29uc3QpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmg6CisK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlYWx0aW1lTWVkaWFTb3VyY2U6OnNldFR5cGUpOiAKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmg6CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29h LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNvdXJjZVR5cGVGb3JEZXZpY2UpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYTo6RGlzcGxheUNhcHR1cmVTb3VyY2VD b2NvYSk6IFNldCB0aGUgY29ycmVjdAorICAgICAgICBzb3VyY2UgdHlwZS4KKwogMjAyMi0wMi0w MyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBB Ym9ydFNpZ25hbC50aW1lb3V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKaW5kZXggMWZkN2RlYTM3ZjlmOGY3MGYwNzY4N2RhNWQx ODE3YmQyNmY5NjAzYi4uNWRkOGM2NmNkODRjZmY5ZTNiZjdhNjBjODhhYjk0YTc1MjI2NjBiMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIsIDIw MTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIw MTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dApAQCAtMTU4LDEyICsxNTgsMTYgQEAgTWVkaWFTdHJlYW1UcmFjayog TWVkaWFTdHJlYW06OmdldFRyYWNrQnlJZChTdHJpbmcgaWQpCiAKIE1lZGlhU3RyZWFtVHJhY2tW ZWN0b3IgTWVkaWFTdHJlYW06OmdldEF1ZGlvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1cm4g dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKTsKKyAg ICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAgICAg ICAgcmV0dXJuIHRyYWNrLmhhc0F1ZGlvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFtVHJh Y2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFZpZGVvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gdHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvKTsK KyAgICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAg ICAgICAgcmV0dXJuIHRyYWNrLmhhc1ZpZGVvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFt VHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFRyYWNrcygpIGNvbnN0CkBAIC0zMjgsMTEgKzMz MiwxMSBAQCB2b2lkIE1lZGlhU3RyZWFtOjp1cGRhdGVBY3RpdmVTdGF0ZSgpCiAgICAgc2V0SXNB Y3RpdmUoYWN0aXZlKTsKIH0KIAotTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBNZWRpYVN0cmVhbTo6 dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgZmlsdGVyVHlwZSkg Y29uc3QKK01lZGlhU3RyZWFtVHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmZpbHRlcmVkVHJhY2tz KGNvbnN0IEZ1bmN0aW9uPGJvb2woY29uc3QgTWVkaWFTdHJlYW1UcmFjayYpPiYgZmlsdGVyKSBj b25zdAogewogICAgIE1lZGlhU3RyZWFtVHJhY2tWZWN0b3IgdHJhY2tzOwogICAgIGZvciAoYXV0 byYgdHJhY2sgOiBtX3RyYWNrU2V0LnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICh0cmFjay0+c291 cmNlKCkudHlwZSgpID09IGZpbHRlclR5cGUpCisgICAgICAgIGlmIChmaWx0ZXIoKnRyYWNrKSkK ICAgICAgICAgICAgIHRyYWNrcy5hcHBlbmQodHJhY2spOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCmluZGV4IDM0MThjZjYz Yzk3NjUwNjFlN2RmMWQwZmE1YmJjYjZhZTViZmMyOWMuLjc0MzE4MGQyOWJlYzUzNTdkZjBjMWU0 ODJmZThhMjU2NGRiZTkwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL01lZGlhU3RyZWFtLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChD KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5 KC1pZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTM3LDcgKzEzNyw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRJc0FjdGl2ZShib29sKTsKICAgICB2b2lkIHN0YXR1c0RpZENoYW5nZSgpOwog Ci0gICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciB0cmFja1ZlY3RvckZvclR5cGUoUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZSkgY29uc3Q7CisgICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBmaWx0 ZXJlZFRyYWNrcyhjb25zdCBGdW5jdGlvbjxib29sKGNvbnN0IE1lZGlhU3RyZWFtVHJhY2smKT4m KSBjb25zdDsKIAogICAgIFJlZjxNZWRpYVN0cmVhbVByaXZhdGU+IG1fcHJpdmF0ZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRy YWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1U cmFjay5jcHAKaW5kZXggZTk2M2RhZGY5ZjFkMWUwOGU0YTg1NzJmNjY3ZGU3MDE5Y2YyMjI2OC4u YmViZThlZjFmMmFmMTZkZjgyNzc0OTExYWIxZmM1OWU3MmQ0ZTgwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3Bw CkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDE1IEVyaWNzc29u IEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEzIE5v a2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKQEAgLTkzLDcgKzkzLDcgQEAgTWVkaWFTdHJlYW1UcmFjazo6TWVkaWFTdHJlYW1UcmFj ayhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBSZWY8TWVkaWFTdHIKIAogICAgIGFs bENhcHR1cmVUcmFja3MoKS5hZGQodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkuYWRkQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTA2LDcgKzEw Niw3IEBAIE1lZGlhU3RyZWFtVHJhY2s6On5NZWRpYVN0cmVhbVRyYWNrKCkKIAogICAgIGFsbENh cHR1cmVUcmFja3MoKS5yZW1vdmUodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkucmVtb3ZlQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTE1LDcg KzExNSw3IEBAIGNvbnN0IEF0b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmtpbmQoKSBjb25z dAogICAgIHN0YXRpYyBNYWluVGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbVN0cmluZz4g YXVkaW9LaW5kKCJhdWRpbyIsIEF0b21TdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAg ICBzdGF0aWMgTWFpblRocmVhZE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IHZpZGVv S2luZCgidmlkZW8iLCBBdG9tU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAKLSAgICBp ZiAobV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8p CisgICAgaWYgKG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAgICAgICAgcmV0dXJuIGF1ZGlvS2lu ZDsKICAgICByZXR1cm4gdmlkZW9LaW5kOwogfQpAQCAtMTU5LDcgKzE1OSw3IEBAIGNvbnN0IEF0 b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmNvbnRlbnRIaW50KCkgY29uc3QKIHZvaWQgTWVk aWFTdHJlYW1UcmFjazo6c2V0Q29udGVudEhpbnQoY29uc3QgU3RyaW5nJiBoaW50VmFsdWUpCiB7 CiAgICAgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OkhpbnRWYWx1ZSB2YWx1ZTsKLSAgICBpZiAo bV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pIHsK KyAgICBpZiAobV9wcml2YXRlLT5oYXNBdWRpbygpKSB7CiAgICAgICAgIGlmIChoaW50VmFsdWUg PT0gIiIpCiAgICAgICAgICAgICB2YWx1ZSA9IE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpIaW50 VmFsdWU6OkVtcHR5OwogICAgICAgICBlbHNlIGlmIChoaW50VmFsdWUgPT0gInNwZWVjaCIpCkBA IC01NzgsNyArNTc4LDcgQEAgdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjp0cmFja1N0YXJ0ZWQoTWVk aWFTdHJlYW1UcmFja1ByaXZhdGUmKQogCiB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OnRyYWNrRW5k ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKQogewotICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNr ICYmIG1fcHJpdmF0ZS0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv KQorICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNrICYmIG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAg ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIAogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF Uik7CkBAIC02ODEsNyArNjgxLDcgQEAgRG9jdW1lbnQqIE1lZGlhU3RyZWFtVHJhY2s6OmRvY3Vt ZW50KCkgY29uc3QKIAogYm9vbCBNZWRpYVN0cmVhbVRyYWNrOjppc0NhcHR1cmluZ0F1ZGlvKCkg Y29uc3QKIHsKLSAgICBBU1NFUlQoaXNDYXB0dXJlVHJhY2soKSAmJiBtX3ByaXZhdGUtPnR5cGUo KSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbyk7CisgICAgQVNTRVJUKGlzQ2Fw dHVyZVRyYWNrKCkgJiYgbV9wcml2YXRlLT5oYXNBdWRpbygpKTsKICAgICByZXR1cm4gIWVuZGVk KCkgJiYgIW11dGVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmgKaW5kZXggOWI5NWI5OGZmYzhjMzdlZTVhOTkw NTA3MDFmZDE5NTFlOTdjODc1MC4uYzlhNDM4NTkzNTlhYTRkOGY3MGZiZjQ1NTI5YjFhNmU1N2Zi MWI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1p ZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTAwLDYgKzEwMCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHN0b3BUcmFjayhTdG9wTW9kZSA9IFN0b3BNb2RlOjpTaWxlbnRseSk7CiAKICAgICBib29s IGlzQ2FwdHVyZVRyYWNrKCkgY29uc3QgeyByZXR1cm4gbV9pc0NhcHR1cmVUcmFjazsgfQorICAg IGJvb2wgaGFzVmlkZW8oKSBjb25zdCB7IHJldHVybiBtX3ByaXZhdGUtPmhhc1ZpZGVvKCk7IH0K KyAgICBib29sIGhhc0F1ZGlvKCkgY29uc3QgeyByZXR1cm4gbV9wcml2YXRlLT5oYXNBdWRpbygp OyB9CiAKICAgICBzdHJ1Y3QgVHJhY2tTZXR0aW5ncyB7CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8 aW50PiB3aWR0aDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5oCmluZGV4IDc2OGNlZGYzMTg3Y2I0 ZmQxZmI2NzRkMjY0OTM4ZDQxNzAyNzc5YzguLmRkMmUxNDlmODEzYjFkNzYwZWRkYTU4OGJkYmJi NDIxMDdjMjkyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaApAQCAtMSw3ICsxLDcgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBz dWJzaWRpYXJ5KC1pZXMpLgogICogQ29weXJpZ2h0IChDKSAyMDE1IEVyaWNzc29uIEFCLiBBbGwg cmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC05Niw2ICs5Niw4IEBAIHB1YmxpYzoKICAgICBSZWFsdGltZU1lZGlhU291cmNlJiBzb3VyY2Uo KSB7IHJldHVybiBtX3NvdXJjZS5nZXQoKTsgfQogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3Vy Y2UmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmdldCgpOyB9CiAgICAgV0VCQ09S RV9FWFBPUlQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlKCkgY29uc3Q7CisgICAgYm9v bCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNWaWRlbygpOyB9CisgICAg Ym9vbCBoYXNBdWRpbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNBdWRpbygpOyB9CiAK ICAgICB2b2lkIGVuZFRyYWNrKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKaW5kZXggZTg0MmNi MDI0NjU2MTgzNjY2YjI2MTUzM2RjYjFlYmQ0MmE1YTFiMy4uNDUzMDFmM2E5M2U5MGY2OTFjN2Vk NWY0YTE3NTk4NDM2ZGQwYjBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKQEAgLTExMTQsNiAr MTExNCwyMCBAQCBTdHJpbmcgUmVhbHRpbWVNZWRpYVNvdXJjZTo6ZGV2aWNlSURIYXNoU2FsdCgp IGNvbnN0CiAgICAgcmV0dXJuIG1faWRIYXNoU2FsdDsKIH0KIAordm9pZCBSZWFsdGltZU1lZGlh U291cmNlOjpzZXRUeXBlKFR5cGUgdHlwZSkKK3sKKyAgICBpZiAodHlwZSA9PSBtX3R5cGUpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fdHlwZSA9IHR5cGU7CisKKyAgICBzY2hlZHVsZURlZmVy cmVkVGFzayhbdGhpc10geworICAgICAgICBmb3JFYWNoT2JzZXJ2ZXIoW10oYXV0byYgb2JzZXJ2 ZXIpIHsKKyAgICAgICAgICAgIG9ic2VydmVyLnNvdXJjZVNldHRpbmdzQ2hhbmdlZCgpOworICAg ICAgICB9KTsKKyAgICB9KTsKK30KKwogUmVhbHRpbWVNZWRpYVNvdXJjZTo6T2JzZXJ2ZXI6On5P YnNlcnZlcigpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmgKaW5kZXggY2E4Y2M5ZDU2YTVkZjFhZWEy ZGEyZmFmYmYxMTFmOGUxMjJlZTFlOC4uZDE0NmE1MmI2YWRlNjY1NTM5ODRhOTIxNTAwMmZmMDNk ZDVkMzZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVNZWRpYVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuaApAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHly aWdodCAoQykgMjAxMy0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENv cHlyaWdodCAoQykgMjAxMy0yMDIyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq IENvcHlyaWdodCAoQykgMjAxMyBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlh cnkoLWllcykuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0xMTcsNiArMTE3LDggQEAgcHVibGljOgog CiAgICAgZW51bSBjbGFzcyBUeXBlIHsgTm9uZSwgQXVkaW8sIFZpZGVvLCBTY3JlZW4sIFdpbmRv dywgU3lzdGVtQXVkaW8gfTsKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7 IH0KKyAgICBib29sIGhhc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6OlZp ZGVvIHx8IG1fdHlwZSA9PSBUeXBlOjpXaW5kb3cgfHwgbV90eXBlID09IFR5cGU6OlNjcmVlbjsg fQorICAgIGJvb2wgaGFzQXVkaW8oKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gVHlwZTo6QXVk aW8gfHwgbV90eXBlID09IFR5cGU6OlN5c3RlbUF1ZGlvOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQg d2hlblJlYWR5KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJik7CiAKQEAgLTI1Miw2 ICsyNTQsOCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGVuZChPYnNlcnZlciogPSBudWxscHRy KTsKIAorICAgIHZvaWQgc2V0VHlwZShUeXBlKTsKKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZv aWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHN0b3BQcm9kdWNp bmdEYXRhKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3BsYXlDYXB0dXJlU291cmNlQ29jb2EuY3Bw CmluZGV4IDRlODdiNWFlYjU3NzQxZmIxYzViZGQyYzkyNWNlNzZhOGY1ZWE5NGMuLmFlMzFjNjA5 NzMwZjMwZDE1NDBiNTg5OTg1MDQ0N2U5ZWVmZjJjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3BsYXlDYXB0dXJlU291cmNlQ29jb2Eu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3Bs YXlDYXB0dXJlU291cmNlQ29jb2EuY3BwCkBAIC01OSw2ICs1OSwzMCBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKK3N0YXRpYyBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlIHNvdXJjZVR5cGVG b3JEZXZpY2UoQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSB0eXBlKQoreworICAgIHN3aXRjaCAo dHlwZSkgeworICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6U2NyZWVuOgorICAg ICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6U2NyZWVuOworICAgIGNhc2Ug Q2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6V2luZG93OgorICAgICAgICByZXR1cm4gUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6V2luZG93OworICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2 aWNlVHlwZTo6U3lzdGVtQXVkaW86CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNl OjpUeXBlOjpTeXN0ZW1BdWRpbzsKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6 Ok1pY3JvcGhvbmU6CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpB dWRpbzsKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OkNhbWVyYToKKyAgICAg ICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvOworICAgIGNhc2UgQ2Fw dHVyZURldmljZTo6RGV2aWNlVHlwZTo6U3BlYWtlcjoKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6 OkRldmljZVR5cGU6OlVua25vd246CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6Tm9uZTsKKyAgICAgICAgYnJl YWs7CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGU6Ok5vbmU7Cit9CisKIENhcHR1cmVTb3VyY2VPckVycm9yIERp c3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OmNyZWF0ZShjb25zdCBDYXB0dXJlRGV2aWNlJiBkZXZp Y2UsIFN0cmluZyYmIGhhc2hTYWx0LCBjb25zdCBNZWRpYUNvbnN0cmFpbnRzKiBjb25zdHJhaW50 cykKIHsKICAgICBzd2l0Y2ggKGRldmljZS50eXBlKCkpIHsKQEAgLTEwNiw3ICsxMzAsNyBAQCBD YXB0dXJlU291cmNlT3JFcnJvciBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpjcmVhdGUoRXhw ZWN0ZWQ8VW5pcXVlUmVmPENhcHR1cgogfQogCiBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpE aXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hKFVuaXF1ZVJlZjxDYXB0dXJlcj4mJiBjYXB0dXJlciwg U3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIGhhc2hTYWx0KQotICAg IDogUmVhbHRpbWVNZWRpYVNvdXJjZShUeXBlOjpWaWRlbywgV1RGTW92ZShuYW1lKSwgV1RGTW92 ZShkZXZpY2VJRCksIFdURk1vdmUoaGFzaFNhbHQpKQorICAgIDogUmVhbHRpbWVNZWRpYVNvdXJj ZShzb3VyY2VUeXBlRm9yRGV2aWNlKGNhcHR1cmVyLmRldmljZVR5cGUoKSksIFdURk1vdmUobmFt ZSksIFdURk1vdmUoZGV2aWNlSUQpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKICAgICAsIG1fY2FwdHVy ZXIoV1RGTW92ZShjYXB0dXJlcikpCiAgICAgLCBtX3RpbWVyKFJ1bkxvb3A6OmN1cnJlbnQoKSwg dGhpcywgJkRpc3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OmVtaXRGcmFtZSkKIHsK 450957 2022-02-04 17:36:43 -0800 2022-02-04 18:40:00 -0800 Patch bug-236165-20220204173642.patch text/plain 14584 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ0OGY4NDljYzc4ZTk1 MTVkOWJmNTM0YzRlYzgwMTk2NjI3NzgwZi4uYTMyM2E1NTFiNzllYWRiOGI0Mzc0NTc4MjhmZWFi OWY0NGNkMWIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAyLTA0ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBNZWRp YVN0cmVhbVRyYWNrIHVuZGVyc3RhbmRpbmcgb2Ygc291cmNlIHR5cGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjE2NQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODg1MTM2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmVyIE5vYmxlLgorICAg ICAgICAKKyAgICAgICAgQmVmb3JlIGJ1ZyAyMzU4MzgsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5 cGUgd2FzIGVpdGhlciBBdWRpbyBvciBWaWRlby4gVGhhdCBidWcKKyAgICAgICAgYWRkZWQgbmV3 IHR5cGVzIGZvciBzY3JlZW4sIHdpbmRvdywgYW5kIHN5c3RlbSBhdWRpbyBjYXB0dXJlLCBidXQg TWVkaWFTdHJlYW1UcmFjaworICAgICAgICB3YXNuJ3QgdXBkYXRlZCB0byBhY2NvdW50IGZvciB0 aGVtLiBJbnN0ZWFkIG9mIGNoZWNraW5nIGEgc291cmNlJ3MgdHlwZSwgdXNlIHRoZSBuZXcKKyAg ICAgICAgYGhhc0F1ZGlvYCBhbmQgJ2hhc1ZpZGVvYCBtZXRob2RzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJl YW06OmdldEF1ZGlvVHJhY2tzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt OjpnZXRWaWRlb1RyYWNrcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6 ZmlsdGVyZWRUcmFja3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnRy YWNrVmVjdG9yRm9yVHlwZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5oOgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6 Ok1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 fk1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 a2luZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjpzZXRDb250 ZW50SGludCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjp0cmFja0VuZGVk KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6OmlzQ2FwdHVyaW5nQXVkaW8g Y29uc3QpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5o OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzVmlkZW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzQXVkaW8gY29uc3QpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmg6CisK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlYWx0aW1lTWVkaWFTb3VyY2U6OnNldFR5cGUpOiAKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmg6CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29h LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNvdXJjZVR5cGVGb3JEZXZpY2UpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYTo6RGlzcGxheUNhcHR1cmVTb3VyY2VD b2NvYSk6IFNldCB0aGUgY29ycmVjdAorICAgICAgICBzb3VyY2UgdHlwZS4KKwogMjAyMi0wMi0w MyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBB Ym9ydFNpZ25hbC50aW1lb3V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKaW5kZXggMWZkN2RlYTM3ZjlmOGY3MGYwNzY4N2RhNWQx ODE3YmQyNmY5NjAzYi4uNWRkOGM2NmNkODRjZmY5ZTNiZjdhNjBjODhhYjk0YTc1MjI2NjBiMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIsIDIw MTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIw MTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dApAQCAtMTU4LDEyICsxNTgsMTYgQEAgTWVkaWFTdHJlYW1UcmFjayog TWVkaWFTdHJlYW06OmdldFRyYWNrQnlJZChTdHJpbmcgaWQpCiAKIE1lZGlhU3RyZWFtVHJhY2tW ZWN0b3IgTWVkaWFTdHJlYW06OmdldEF1ZGlvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1cm4g dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKTsKKyAg ICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAgICAg ICAgcmV0dXJuIHRyYWNrLmhhc0F1ZGlvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFtVHJh Y2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFZpZGVvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gdHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvKTsK KyAgICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAg ICAgICAgcmV0dXJuIHRyYWNrLmhhc1ZpZGVvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFt VHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFRyYWNrcygpIGNvbnN0CkBAIC0zMjgsMTEgKzMz MiwxMSBAQCB2b2lkIE1lZGlhU3RyZWFtOjp1cGRhdGVBY3RpdmVTdGF0ZSgpCiAgICAgc2V0SXNB Y3RpdmUoYWN0aXZlKTsKIH0KIAotTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBNZWRpYVN0cmVhbTo6 dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgZmlsdGVyVHlwZSkg Y29uc3QKK01lZGlhU3RyZWFtVHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmZpbHRlcmVkVHJhY2tz KGNvbnN0IEZ1bmN0aW9uPGJvb2woY29uc3QgTWVkaWFTdHJlYW1UcmFjayYpPiYgZmlsdGVyKSBj b25zdAogewogICAgIE1lZGlhU3RyZWFtVHJhY2tWZWN0b3IgdHJhY2tzOwogICAgIGZvciAoYXV0 byYgdHJhY2sgOiBtX3RyYWNrU2V0LnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICh0cmFjay0+c291 cmNlKCkudHlwZSgpID09IGZpbHRlclR5cGUpCisgICAgICAgIGlmIChmaWx0ZXIoKnRyYWNrKSkK ICAgICAgICAgICAgIHRyYWNrcy5hcHBlbmQodHJhY2spOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCmluZGV4IDM0MThjZjYz Yzk3NjUwNjFlN2RmMWQwZmE1YmJjYjZhZTViZmMyOWMuLjc0MzE4MGQyOWJlYzUzNTdkZjBjMWU0 ODJmZThhMjU2NGRiZTkwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL01lZGlhU3RyZWFtLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChD KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5 KC1pZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTM3LDcgKzEzNyw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRJc0FjdGl2ZShib29sKTsKICAgICB2b2lkIHN0YXR1c0RpZENoYW5nZSgpOwog Ci0gICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciB0cmFja1ZlY3RvckZvclR5cGUoUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZSkgY29uc3Q7CisgICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBmaWx0 ZXJlZFRyYWNrcyhjb25zdCBGdW5jdGlvbjxib29sKGNvbnN0IE1lZGlhU3RyZWFtVHJhY2smKT4m KSBjb25zdDsKIAogICAgIFJlZjxNZWRpYVN0cmVhbVByaXZhdGU+IG1fcHJpdmF0ZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRy YWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1U cmFjay5jcHAKaW5kZXggZTk2M2RhZGY5ZjFkMWUwOGU0YTg1NzJmNjY3ZGU3MDE5Y2YyMjI2OC4u YmViZThlZjFmMmFmMTZkZjgyNzc0OTExYWIxZmM1OWU3MmQ0ZTgwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3Bw CkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDE1IEVyaWNzc29u IEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEzIE5v a2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKQEAgLTkzLDcgKzkzLDcgQEAgTWVkaWFTdHJlYW1UcmFjazo6TWVkaWFTdHJlYW1UcmFj ayhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBSZWY8TWVkaWFTdHIKIAogICAgIGFs bENhcHR1cmVUcmFja3MoKS5hZGQodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkuYWRkQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTA2LDcgKzEw Niw3IEBAIE1lZGlhU3RyZWFtVHJhY2s6On5NZWRpYVN0cmVhbVRyYWNrKCkKIAogICAgIGFsbENh cHR1cmVUcmFja3MoKS5yZW1vdmUodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkucmVtb3ZlQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTE1LDcg KzExNSw3IEBAIGNvbnN0IEF0b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmtpbmQoKSBjb25z dAogICAgIHN0YXRpYyBNYWluVGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbVN0cmluZz4g YXVkaW9LaW5kKCJhdWRpbyIsIEF0b21TdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAg ICBzdGF0aWMgTWFpblRocmVhZE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IHZpZGVv S2luZCgidmlkZW8iLCBBdG9tU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAKLSAgICBp ZiAobV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8p CisgICAgaWYgKG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAgICAgICAgcmV0dXJuIGF1ZGlvS2lu ZDsKICAgICByZXR1cm4gdmlkZW9LaW5kOwogfQpAQCAtMTU5LDcgKzE1OSw3IEBAIGNvbnN0IEF0 b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmNvbnRlbnRIaW50KCkgY29uc3QKIHZvaWQgTWVk aWFTdHJlYW1UcmFjazo6c2V0Q29udGVudEhpbnQoY29uc3QgU3RyaW5nJiBoaW50VmFsdWUpCiB7 CiAgICAgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OkhpbnRWYWx1ZSB2YWx1ZTsKLSAgICBpZiAo bV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pIHsK KyAgICBpZiAobV9wcml2YXRlLT5oYXNBdWRpbygpKSB7CiAgICAgICAgIGlmIChoaW50VmFsdWUg PT0gIiIpCiAgICAgICAgICAgICB2YWx1ZSA9IE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpIaW50 VmFsdWU6OkVtcHR5OwogICAgICAgICBlbHNlIGlmIChoaW50VmFsdWUgPT0gInNwZWVjaCIpCkBA IC01NzgsNyArNTc4LDcgQEAgdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjp0cmFja1N0YXJ0ZWQoTWVk aWFTdHJlYW1UcmFja1ByaXZhdGUmKQogCiB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OnRyYWNrRW5k ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKQogewotICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNr ICYmIG1fcHJpdmF0ZS0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv KQorICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNrICYmIG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAg ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIAogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF Uik7CkBAIC02ODEsNyArNjgxLDcgQEAgRG9jdW1lbnQqIE1lZGlhU3RyZWFtVHJhY2s6OmRvY3Vt ZW50KCkgY29uc3QKIAogYm9vbCBNZWRpYVN0cmVhbVRyYWNrOjppc0NhcHR1cmluZ0F1ZGlvKCkg Y29uc3QKIHsKLSAgICBBU1NFUlQoaXNDYXB0dXJlVHJhY2soKSAmJiBtX3ByaXZhdGUtPnR5cGUo KSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbyk7CisgICAgQVNTRVJUKGlzQ2Fw dHVyZVRyYWNrKCkgJiYgbV9wcml2YXRlLT5oYXNBdWRpbygpKTsKICAgICByZXR1cm4gIWVuZGVk KCkgJiYgIW11dGVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmgKaW5kZXggOWI5NWI5OGZmYzhjMzdlZTVhOTkw NTA3MDFmZDE5NTFlOTdjODc1MC4uYzlhNDM4NTkzNTlhYTRkOGY3MGZiZjQ1NTI5YjFhNmU1N2Zi MWI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1p ZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTAwLDYgKzEwMCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHN0b3BUcmFjayhTdG9wTW9kZSA9IFN0b3BNb2RlOjpTaWxlbnRseSk7CiAKICAgICBib29s IGlzQ2FwdHVyZVRyYWNrKCkgY29uc3QgeyByZXR1cm4gbV9pc0NhcHR1cmVUcmFjazsgfQorICAg IGJvb2wgaGFzVmlkZW8oKSBjb25zdCB7IHJldHVybiBtX3ByaXZhdGUtPmhhc1ZpZGVvKCk7IH0K KyAgICBib29sIGhhc0F1ZGlvKCkgY29uc3QgeyByZXR1cm4gbV9wcml2YXRlLT5oYXNBdWRpbygp OyB9CiAKICAgICBzdHJ1Y3QgVHJhY2tTZXR0aW5ncyB7CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8 aW50PiB3aWR0aDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5oCmluZGV4IDc2OGNlZGYzMTg3Y2I0 ZmQxZmI2NzRkMjY0OTM4ZDQxNzAyNzc5YzguLmRkMmUxNDlmODEzYjFkNzYwZWRkYTU4OGJkYmJi NDIxMDdjMjkyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaApAQCAtMSw3ICsxLDcgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBz dWJzaWRpYXJ5KC1pZXMpLgogICogQ29weXJpZ2h0IChDKSAyMDE1IEVyaWNzc29uIEFCLiBBbGwg cmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC05Niw2ICs5Niw4IEBAIHB1YmxpYzoKICAgICBSZWFsdGltZU1lZGlhU291cmNlJiBzb3VyY2Uo KSB7IHJldHVybiBtX3NvdXJjZS5nZXQoKTsgfQogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3Vy Y2UmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmdldCgpOyB9CiAgICAgV0VCQ09S RV9FWFBPUlQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlKCkgY29uc3Q7CisgICAgYm9v bCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNWaWRlbygpOyB9CisgICAg Ym9vbCBoYXNBdWRpbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNBdWRpbygpOyB9CiAK ICAgICB2b2lkIGVuZFRyYWNrKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKaW5kZXggZTg0MmNi MDI0NjU2MTgzNjY2YjI2MTUzM2RjYjFlYmQ0MmE1YTFiMy4uNDUzMDFmM2E5M2U5MGY2OTFjN2Vk NWY0YTE3NTk4NDM2ZGQwYjBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKQEAgLTExMTQsNiAr MTExNCwyMCBAQCBTdHJpbmcgUmVhbHRpbWVNZWRpYVNvdXJjZTo6ZGV2aWNlSURIYXNoU2FsdCgp IGNvbnN0CiAgICAgcmV0dXJuIG1faWRIYXNoU2FsdDsKIH0KIAordm9pZCBSZWFsdGltZU1lZGlh U291cmNlOjpzZXRUeXBlKFR5cGUgdHlwZSkKK3sKKyAgICBpZiAodHlwZSA9PSBtX3R5cGUpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fdHlwZSA9IHR5cGU7CisKKyAgICBzY2hlZHVsZURlZmVy cmVkVGFzayhbdGhpc10geworICAgICAgICBmb3JFYWNoT2JzZXJ2ZXIoW10oYXV0byYgb2JzZXJ2 ZXIpIHsKKyAgICAgICAgICAgIG9ic2VydmVyLnNvdXJjZVNldHRpbmdzQ2hhbmdlZCgpOworICAg ICAgICB9KTsKKyAgICB9KTsKK30KKwogUmVhbHRpbWVNZWRpYVNvdXJjZTo6T2JzZXJ2ZXI6On5P YnNlcnZlcigpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmgKaW5kZXggY2E4Y2M5ZDU2YTVkZjFhZWEy ZGEyZmFmYmYxMTFmOGUxMjJlZTFlOC4uZDE0NmE1MmI2YWRlNjY1NTM5ODRhOTIxNTAwMmZmMDNk ZDVkMzZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVNZWRpYVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuaApAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHly aWdodCAoQykgMjAxMy0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENv cHlyaWdodCAoQykgMjAxMy0yMDIyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq IENvcHlyaWdodCAoQykgMjAxMyBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlh cnkoLWllcykuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0xMTcsNiArMTE3LDggQEAgcHVibGljOgog CiAgICAgZW51bSBjbGFzcyBUeXBlIHsgTm9uZSwgQXVkaW8sIFZpZGVvLCBTY3JlZW4sIFdpbmRv dywgU3lzdGVtQXVkaW8gfTsKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7 IH0KKyAgICBib29sIGhhc1ZpZGVvKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6OlZp ZGVvIHx8IG1fdHlwZSA9PSBUeXBlOjpXaW5kb3cgfHwgbV90eXBlID09IFR5cGU6OlNjcmVlbjsg fQorICAgIGJvb2wgaGFzQXVkaW8oKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gVHlwZTo6QXVk aW8gfHwgbV90eXBlID09IFR5cGU6OlN5c3RlbUF1ZGlvOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQg d2hlblJlYWR5KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJik7CiAKQEAgLTI1Miw2 ICsyNTQsOCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGVuZChPYnNlcnZlciogPSBudWxscHRy KTsKIAorICAgIHZvaWQgc2V0VHlwZShUeXBlKTsKKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZv aWQgc3RhcnRQcm9kdWNpbmdEYXRhKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHN0b3BQcm9kdWNp bmdEYXRhKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3BsYXlDYXB0dXJlU291cmNlQ29jb2EuY3Bw CmluZGV4IDRlODdiNWFlYjU3NzQxZmIxYzViZGQyYzkyNWNlNzZhOGY1ZWE5NGMuLjNjNmY3Mzli ODExYmRiMDU5ZmFlM2EzODg2YzU3OWYzM2E2NjE2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3BsYXlDYXB0dXJlU291cmNlQ29jb2Eu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3Bs YXlDYXB0dXJlU291cmNlQ29jb2EuY3BwCkBAIC01OSw2ICs1OSwzMCBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKK3N0YXRpYyBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlIHNvdXJjZVR5cGVG b3JEZXZpY2UoQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSB0eXBlKQoreworICAgIHN3aXRjaCAo dHlwZSkgeworICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6U2NyZWVuOgorICAg ICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6U2NyZWVuOworICAgIGNhc2Ug Q2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6V2luZG93OgorICAgICAgICByZXR1cm4gUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6V2luZG93OworICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2 aWNlVHlwZTo6U3lzdGVtQXVkaW86CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNl OjpUeXBlOjpTeXN0ZW1BdWRpbzsKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6 Ok1pY3JvcGhvbmU6CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpB dWRpbzsKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OkNhbWVyYToKKyAgICAg ICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvOworICAgIGNhc2UgQ2Fw dHVyZURldmljZTo6RGV2aWNlVHlwZTo6U3BlYWtlcjoKKyAgICBjYXNlIENhcHR1cmVEZXZpY2U6 OkRldmljZVR5cGU6OlVua25vd246CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6Tm9uZTsKKyAgICAgICAgYnJl YWs7CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGU6Ok5vbmU7Cit9CisKIENhcHR1cmVTb3VyY2VPckVycm9yIERp c3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OmNyZWF0ZShjb25zdCBDYXB0dXJlRGV2aWNlJiBkZXZp Y2UsIFN0cmluZyYmIGhhc2hTYWx0LCBjb25zdCBNZWRpYUNvbnN0cmFpbnRzKiBjb25zdHJhaW50 cykKIHsKICAgICBzd2l0Y2ggKGRldmljZS50eXBlKCkpIHsKQEAgLTEwNiw3ICsxMzAsNyBAQCBD YXB0dXJlU291cmNlT3JFcnJvciBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpjcmVhdGUoRXhw ZWN0ZWQ8VW5pcXVlUmVmPENhcHR1cgogfQogCiBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpE aXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hKFVuaXF1ZVJlZjxDYXB0dXJlcj4mJiBjYXB0dXJlciwg U3RyaW5nJiYgbmFtZSwgU3RyaW5nJiYgZGV2aWNlSUQsIFN0cmluZyYmIGhhc2hTYWx0KQotICAg IDogUmVhbHRpbWVNZWRpYVNvdXJjZShUeXBlOjpWaWRlbywgV1RGTW92ZShuYW1lKSwgV1RGTW92 ZShkZXZpY2VJRCksIFdURk1vdmUoaGFzaFNhbHQpKQorICAgIDogUmVhbHRpbWVNZWRpYVNvdXJj ZShzb3VyY2VUeXBlRm9yRGV2aWNlKGNhcHR1cmVyLT5kZXZpY2VUeXBlKCkpLCBXVEZNb3ZlKG5h bWUpLCBXVEZNb3ZlKGRldmljZUlEKSwgV1RGTW92ZShoYXNoU2FsdCkpCiAgICAgLCBtX2NhcHR1 cmVyKFdURk1vdmUoY2FwdHVyZXIpKQogICAgICwgbV90aW1lcihSdW5Mb29wOjpjdXJyZW50KCks IHRoaXMsICZEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjplbWl0RnJhbWUpCiB7Cg== 450960 2022-02-04 18:40:03 -0800 2022-02-04 21:34:09 -0800 Patch bug-236165-20220204184002.patch text/plain 15936 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ0OGY4NDljYzc4ZTk1 MTVkOWJmNTM0YzRlYzgwMTk2NjI3NzgwZi4uYTMyM2E1NTFiNzllYWRiOGI0Mzc0NTc4MjhmZWFi OWY0NGNkMWIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAyLTA0ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBNZWRp YVN0cmVhbVRyYWNrIHVuZGVyc3RhbmRpbmcgb2Ygc291cmNlIHR5cGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjE2NQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODg1MTM2MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmVyIE5vYmxlLgorICAg ICAgICAKKyAgICAgICAgQmVmb3JlIGJ1ZyAyMzU4MzgsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5 cGUgd2FzIGVpdGhlciBBdWRpbyBvciBWaWRlby4gVGhhdCBidWcKKyAgICAgICAgYWRkZWQgbmV3 IHR5cGVzIGZvciBzY3JlZW4sIHdpbmRvdywgYW5kIHN5c3RlbSBhdWRpbyBjYXB0dXJlLCBidXQg TWVkaWFTdHJlYW1UcmFjaworICAgICAgICB3YXNuJ3QgdXBkYXRlZCB0byBhY2NvdW50IGZvciB0 aGVtLiBJbnN0ZWFkIG9mIGNoZWNraW5nIGEgc291cmNlJ3MgdHlwZSwgdXNlIHRoZSBuZXcKKyAg ICAgICAgYGhhc0F1ZGlvYCBhbmQgJ2hhc1ZpZGVvYCBtZXRob2RzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJl YW06OmdldEF1ZGlvVHJhY2tzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt OjpnZXRWaWRlb1RyYWNrcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6 ZmlsdGVyZWRUcmFja3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnRy YWNrVmVjdG9yRm9yVHlwZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5oOgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6 Ok1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 fk1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6 a2luZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjpzZXRDb250 ZW50SGludCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjp0cmFja0VuZGVk KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6OmlzQ2FwdHVyaW5nQXVkaW8g Y29uc3QpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5o OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzVmlkZW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6aGFzQXVkaW8gY29uc3QpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmg6CisK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlYWx0aW1lTWVkaWFTb3VyY2U6OnNldFR5cGUpOiAKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmg6CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jb2NvYS9EaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29h LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNvdXJjZVR5cGVGb3JEZXZpY2UpOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYTo6RGlzcGxheUNhcHR1cmVTb3VyY2VD b2NvYSk6IFNldCB0aGUgY29ycmVjdAorICAgICAgICBzb3VyY2UgdHlwZS4KKwogMjAyMi0wMi0w MyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBB Ym9ydFNpZ25hbC50aW1lb3V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKaW5kZXggMWZkN2RlYTM3ZjlmOGY3MGYwNzY4N2RhNWQx ODE3YmQyNmY5NjAzYi4uNWRkOGM2NmNkODRjZmY5ZTNiZjdhNjBjODhhYjk0YTc1MjI2NjBiMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHAKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIsIDIw MTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIw MTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQg KEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dApAQCAtMTU4LDEyICsxNTgsMTYgQEAgTWVkaWFTdHJlYW1UcmFjayog TWVkaWFTdHJlYW06OmdldFRyYWNrQnlJZChTdHJpbmcgaWQpCiAKIE1lZGlhU3RyZWFtVHJhY2tW ZWN0b3IgTWVkaWFTdHJlYW06OmdldEF1ZGlvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1cm4g dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKTsKKyAg ICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAgICAg ICAgcmV0dXJuIHRyYWNrLmhhc0F1ZGlvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFtVHJh Y2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFZpZGVvVHJhY2tzKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gdHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvKTsK KyAgICByZXR1cm4gZmlsdGVyZWRUcmFja3MoW10gKGF1dG8mIHRyYWNrKSBtdXRhYmxlIHsKKyAg ICAgICAgcmV0dXJuIHRyYWNrLmhhc1ZpZGVvKCk7CisgICAgfSk7CiB9CiAKIE1lZGlhU3RyZWFt VHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmdldFRyYWNrcygpIGNvbnN0CkBAIC0zMjgsMTEgKzMz MiwxMSBAQCB2b2lkIE1lZGlhU3RyZWFtOjp1cGRhdGVBY3RpdmVTdGF0ZSgpCiAgICAgc2V0SXNB Y3RpdmUoYWN0aXZlKTsKIH0KIAotTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBNZWRpYVN0cmVhbTo6 dHJhY2tWZWN0b3JGb3JUeXBlKFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgZmlsdGVyVHlwZSkg Y29uc3QKK01lZGlhU3RyZWFtVHJhY2tWZWN0b3IgTWVkaWFTdHJlYW06OmZpbHRlcmVkVHJhY2tz KGNvbnN0IEZ1bmN0aW9uPGJvb2woY29uc3QgTWVkaWFTdHJlYW1UcmFjayYpPiYgZmlsdGVyKSBj b25zdAogewogICAgIE1lZGlhU3RyZWFtVHJhY2tWZWN0b3IgdHJhY2tzOwogICAgIGZvciAoYXV0 byYgdHJhY2sgOiBtX3RyYWNrU2V0LnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICh0cmFjay0+c291 cmNlKCkudHlwZSgpID09IGZpbHRlclR5cGUpCisgICAgICAgIGlmIChmaWx0ZXIoKnRyYWNrKSkK ICAgICAgICAgICAgIHRyYWNrcy5hcHBlbmQodHJhY2spOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCmluZGV4IDM0MThjZjYz Yzk3NjUwNjFlN2RmMWQwZmE1YmJjYjZhZTViZmMyOWMuLjc0MzE4MGQyOWJlYzUzNTdkZjBjMWU0 ODJmZThhMjU2NGRiZTkwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL01lZGlhU3RyZWFtLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChD KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5 KC1pZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTM3LDcgKzEzNyw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRJc0FjdGl2ZShib29sKTsKICAgICB2b2lkIHN0YXR1c0RpZENoYW5nZSgpOwog Ci0gICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciB0cmFja1ZlY3RvckZvclR5cGUoUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZSkgY29uc3Q7CisgICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBmaWx0 ZXJlZFRyYWNrcyhjb25zdCBGdW5jdGlvbjxib29sKGNvbnN0IE1lZGlhU3RyZWFtVHJhY2smKT4m KSBjb25zdDsKIAogICAgIFJlZjxNZWRpYVN0cmVhbVByaXZhdGU+IG1fcHJpdmF0ZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRy YWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1U cmFjay5jcHAKaW5kZXggZTk2M2RhZGY5ZjFkMWUwOGU0YTg1NzJmNjY3ZGU3MDE5Y2YyMjI2OC4u YmViZThlZjFmMmFmMTZkZjgyNzc0OTExYWIxZmM1OWU3MmQ0ZTgwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3Bw CkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDE1IEVyaWNzc29u IEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEzIE5v a2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKQEAgLTkzLDcgKzkzLDcgQEAgTWVkaWFTdHJlYW1UcmFjazo6TWVkaWFTdHJlYW1UcmFj ayhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBSZWY8TWVkaWFTdHIKIAogICAgIGFs bENhcHR1cmVUcmFja3MoKS5hZGQodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkuYWRkQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTA2LDcgKzEw Niw3IEBAIE1lZGlhU3RyZWFtVHJhY2s6On5NZWRpYVN0cmVhbVRyYWNrKCkKIAogICAgIGFsbENh cHR1cmVUcmFja3MoKS5yZW1vdmUodGhpcyk7CiAKLSAgICBpZiAobV9wcml2YXRlLT50eXBlKCkg PT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pCisgICAgaWYgKG1fcHJpdmF0ZS0+ aGFzQXVkaW8oKSkKICAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRN YW5hZ2VyKCkucmVtb3ZlQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIApAQCAtMTE1LDcg KzExNSw3IEBAIGNvbnN0IEF0b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmtpbmQoKSBjb25z dAogICAgIHN0YXRpYyBNYWluVGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbVN0cmluZz4g YXVkaW9LaW5kKCJhdWRpbyIsIEF0b21TdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAg ICBzdGF0aWMgTWFpblRocmVhZE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IHZpZGVv S2luZCgidmlkZW8iLCBBdG9tU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAKLSAgICBp ZiAobV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8p CisgICAgaWYgKG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAgICAgICAgcmV0dXJuIGF1ZGlvS2lu ZDsKICAgICByZXR1cm4gdmlkZW9LaW5kOwogfQpAQCAtMTU5LDcgKzE1OSw3IEBAIGNvbnN0IEF0 b21TdHJpbmcmIE1lZGlhU3RyZWFtVHJhY2s6OmNvbnRlbnRIaW50KCkgY29uc3QKIHZvaWQgTWVk aWFTdHJlYW1UcmFjazo6c2V0Q29udGVudEhpbnQoY29uc3QgU3RyaW5nJiBoaW50VmFsdWUpCiB7 CiAgICAgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OkhpbnRWYWx1ZSB2YWx1ZTsKLSAgICBpZiAo bV9wcml2YXRlLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8pIHsK KyAgICBpZiAobV9wcml2YXRlLT5oYXNBdWRpbygpKSB7CiAgICAgICAgIGlmIChoaW50VmFsdWUg PT0gIiIpCiAgICAgICAgICAgICB2YWx1ZSA9IE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpIaW50 VmFsdWU6OkVtcHR5OwogICAgICAgICBlbHNlIGlmIChoaW50VmFsdWUgPT0gInNwZWVjaCIpCkBA IC01NzgsNyArNTc4LDcgQEAgdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjp0cmFja1N0YXJ0ZWQoTWVk aWFTdHJlYW1UcmFja1ByaXZhdGUmKQogCiB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OnRyYWNrRW5k ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKQogewotICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNr ICYmIG1fcHJpdmF0ZS0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv KQorICAgIGlmIChtX2lzQ2FwdHVyZVRyYWNrICYmIG1fcHJpdmF0ZS0+aGFzQXVkaW8oKSkKICAg ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIAogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF Uik7CkBAIC02ODEsNyArNjgxLDcgQEAgRG9jdW1lbnQqIE1lZGlhU3RyZWFtVHJhY2s6OmRvY3Vt ZW50KCkgY29uc3QKIAogYm9vbCBNZWRpYVN0cmVhbVRyYWNrOjppc0NhcHR1cmluZ0F1ZGlvKCkg Y29uc3QKIHsKLSAgICBBU1NFUlQoaXNDYXB0dXJlVHJhY2soKSAmJiBtX3ByaXZhdGUtPnR5cGUo KSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbyk7CisgICAgQVNTRVJUKGlzQ2Fw dHVyZVRyYWNrKCkgJiYgbV9wcml2YXRlLT5oYXNBdWRpbygpKTsKICAgICByZXR1cm4gIWVuZGVk KCkgJiYgIW11dGVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmgKaW5kZXggOWI5NWI5OGZmYzhjMzdlZTVhOTkw NTA3MDFmZDE5NTFlOTdjODc1MC4uYzlhNDM4NTkzNTlhYTRkOGY3MGZiZjQ1NTI5YjFhNmU1N2Zi MWI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmgKQEAgLTEsNyArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MTEsIDIwMTUgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTMtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTMtMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1p ZXMpLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTAwLDYgKzEwMCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHN0b3BUcmFjayhTdG9wTW9kZSA9IFN0b3BNb2RlOjpTaWxlbnRseSk7CiAKICAgICBib29s IGlzQ2FwdHVyZVRyYWNrKCkgY29uc3QgeyByZXR1cm4gbV9pc0NhcHR1cmVUcmFjazsgfQorICAg IGJvb2wgaGFzVmlkZW8oKSBjb25zdCB7IHJldHVybiBtX3ByaXZhdGUtPmhhc1ZpZGVvKCk7IH0K KyAgICBib29sIGhhc0F1ZGlvKCkgY29uc3QgeyByZXR1cm4gbV9wcml2YXRlLT5oYXNBdWRpbygp OyB9CiAKICAgICBzdHJ1Y3QgVHJhY2tTZXR0aW5ncyB7CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8 aW50PiB3aWR0aDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5oCmluZGV4IDc2OGNlZGYzMTg3Y2I0 ZmQxZmI2NzRkMjY0OTM4ZDQxNzAyNzc5YzguLmRkMmUxNDlmODEzYjFkNzYwZWRkYTU4OGJkYmJi NDIxMDdjMjkyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaApAQCAtMSw3ICsxLDcgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTMgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBz dWJzaWRpYXJ5KC1pZXMpLgogICogQ29weXJpZ2h0IChDKSAyMDE1IEVyaWNzc29uIEFCLiBBbGwg cmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjIgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC05Niw2ICs5Niw4IEBAIHB1YmxpYzoKICAgICBSZWFsdGltZU1lZGlhU291cmNlJiBzb3VyY2Uo KSB7IHJldHVybiBtX3NvdXJjZS5nZXQoKTsgfQogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3Vy Y2UmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLmdldCgpOyB9CiAgICAgV0VCQ09S RV9FWFBPUlQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlKCkgY29uc3Q7CisgICAgYm9v bCBoYXNWaWRlbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNWaWRlbygpOyB9CisgICAg Ym9vbCBoYXNBdWRpbygpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlLT5oYXNBdWRpbygpOyB9CiAK ICAgICB2b2lkIGVuZFRyYWNrKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKaW5kZXggZTg0MmNi MDI0NjU2MTgzNjY2YjI2MTUzM2RjYjFlYmQ0MmE1YTFiMy4uMDczMTMzOTE0MmNmMzNjZTkxNGUx OGRjOTE0NzM5MWEzN2QwM2I2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKQEAgLTExMTQsNiAr MTExNCwyMCBAQCBTdHJpbmcgUmVhbHRpbWVNZWRpYVNvdXJjZTo6ZGV2aWNlSURIYXNoU2FsdCgp IGNvbnN0CiAgICAgcmV0dXJuIG1faWRIYXNoU2FsdDsKIH0KIAordm9pZCBSZWFsdGltZU1lZGlh U291cmNlOjpzZXRUeXBlKFR5cGUgdHlwZSkKK3sKKyAgICBpZiAodHlwZSA9PSBtX3R5cGUpCisg ICAgICAgIHJldHVybjsKKworICAgIG1fdHlwZSA9IHR5cGU7CisKKyAgICBzY2hlZHVsZURlZmVy cmVkVGFzayhbdGhpc10geworICAgICAgICBmb3JFYWNoT2JzZXJ2ZXIoW10oYXV0byYgb2JzZXJ2 ZXIpIHsKKyAgICAgICAgICAgIG9ic2VydmVyLnNvdXJjZVNldHRpbmdzQ2hhbmdlZCgpOworICAg ICAgICB9KTsKKyAgICB9KTsKK30KKwogUmVhbHRpbWVNZWRpYVNvdXJjZTo6T2JzZXJ2ZXI6On5P YnNlcnZlcigpCiB7CiB9CkBAIC0xMTM4LDEwICsxMTUyLDE2IEBAIFN0cmluZyBjb252ZXJ0RW51 bWVyYXRpb25Ub1N0cmluZyhSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlIGVudW1lcmF0aW9uVmFs dWUpCiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJOb25lIiksCiAgICAgICAgIE1B S0VfU1RBVElDX1NUUklOR19JTVBMKCJBdWRpbyIpLAogICAgICAgICBNQUtFX1NUQVRJQ19TVFJJ TkdfSU1QTCgiVmlkZW8iKSwKKyAgICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIlNjcmVl biIpLAorICAgICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiV2luZG93IiksCisgICAgICAg IE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJTeXN0ZW1BdWRpbyIpLAogICAgIH07CiAgICAgc3Rh dGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6 Ok5vbmUpID09IDAsICJSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpOb25lIGlzIG5vdCAwIGFz IGV4cGVjdGVkIik7CiAgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKSA9PSAxLCAiUmVhbHRpbWVNZWRpYVNvdXJjZTo6 VHlwZTo6QXVkaW8gaXMgbm90IDEgYXMgZXhwZWN0ZWQiKTsKICAgICBzdGF0aWNfYXNzZXJ0KHN0 YXRpY19jYXN0PHNpemVfdD4oUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW8pID09IDIs ICJSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpWaWRlbyBpcyBub3QgMiBhcyBleHBlY3RlZCIp OworICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihSZWFsdGltZU1lZGlhU291 cmNlOjpUeXBlOjpTY3JlZW4pID09IDMsICJSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpTY3Jl ZW4gaXMgbm90IDMgYXMgZXhwZWN0ZWQiKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0 PHNpemVfdD4oUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6V2luZG93KSA9PSA0LCAiUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6V2luZG93IGlzIG5vdCA0IGFzIGV4cGVjdGVkIik7CisgICAg c3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5 cGU6OlN5c3RlbUF1ZGlvKSA9PSA1LCAiUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6U3lzdGVt QXVkaW8gaXMgbm90IDUgYXMgZXhwZWN0ZWQiKTsKICAgICBBU1NFUlQoc3RhdGljX2Nhc3Q8c2l6 ZV90PihlbnVtZXJhdGlvblZhbHVlKSA8IFdURl9BUlJBWV9MRU5HVEgodmFsdWVzKSk7CiAgICAg cmV0dXJuIHZhbHVlc1tzdGF0aWNfY2FzdDxzaXplX3Q+KGVudW1lcmF0aW9uVmFsdWUpXTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1l TWVkaWFTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0 aW1lTWVkaWFTb3VyY2UuaAppbmRleCBjYThjYzlkNTZhNWRmMWFlYTJkYTJmYWZiZjExMWY4ZTEy MmVlMWU4Li5kMTQ2YTUyYjZhZGU2NjU1Mzk4NGE5MjE1MDAyZmYwM2RkNWQzNmE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291 cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVN ZWRpYVNvdXJjZS5oCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBF cmljc3NvbiBBQi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMiBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIw MTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEz LTIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKQEAgLTExNyw2ICsxMTcsOCBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNz IFR5cGUgeyBOb25lLCBBdWRpbywgVmlkZW8sIFNjcmVlbiwgV2luZG93LCBTeXN0ZW1BdWRpbyB9 OwogICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQorICAgIGJvb2wgaGFz VmlkZW8oKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gVHlwZTo6VmlkZW8gfHwgbV90eXBlID09 IFR5cGU6OldpbmRvdyB8fCBtX3R5cGUgPT0gVHlwZTo6U2NyZWVuOyB9CisgICAgYm9vbCBoYXNB dWRpbygpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBlOjpBdWRpbyB8fCBtX3R5cGUgPT0g VHlwZTo6U3lzdGVtQXVkaW87IH0KIAogICAgIHZpcnR1YWwgdm9pZCB3aGVuUmVhZHkoQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChTdHJpbmcpPiYmKTsKIApAQCAtMjUyLDYgKzI1NCw4IEBAIHByb3Rl Y3RlZDoKIAogICAgIHZvaWQgZW5kKE9ic2VydmVyKiA9IG51bGxwdHIpOwogCisgICAgdm9pZCBz ZXRUeXBlKFR5cGUpOworCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzdGFydFByb2R1Y2lu Z0RhdGEoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc3RvcFByb2R1Y2luZ0RhdGEoKSB7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2NvY29hL0Rpc3Bs YXlDYXB0dXJlU291cmNlQ29jb2EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vY29jb2EvRGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYS5jcHAKaW5kZXggNGU4N2I1YWVi NTc3NDFmYjFjNWJkZDJjOTI1Y2U3NmE4ZjVlYTk0Yy4uM2M2ZjczOWI4MTFiZGIwNTlmYWUzYTM4 ODZjNTc5ZjMzYTY2MTZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vY29jb2EvRGlzcGxheUNhcHR1cmVTb3VyY2VDb2NvYS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY29jb2EvRGlzcGxheUNhcHR1cmVTb3VyY2VD b2NvYS5jcHAKQEAgLTU5LDYgKzU5LDMwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3Rh dGljIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgc291cmNlVHlwZUZvckRldmljZShDYXB0dXJl RGV2aWNlOjpEZXZpY2VUeXBlIHR5cGUpCit7CisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2Fz ZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpTY3JlZW46CisgICAgICAgIHJldHVybiBSZWFs dGltZU1lZGlhU291cmNlOjpUeXBlOjpTY3JlZW47CisgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpE ZXZpY2VUeXBlOjpXaW5kb3c6CisgICAgICAgIHJldHVybiBSZWFsdGltZU1lZGlhU291cmNlOjpU eXBlOjpXaW5kb3c7CisgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpTeXN0ZW1B dWRpbzoKKyAgICAgICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlN5c3RlbUF1 ZGlvOworICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6TWljcm9waG9uZToKKyAg ICAgICAgcmV0dXJuIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvOworICAgIGNhc2Ug Q2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhOgorICAgICAgICByZXR1cm4gUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW87CisgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZp Y2VUeXBlOjpTcGVha2VyOgorICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6VW5r bm93bjoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBSZWFs dGltZU1lZGlhU291cmNlOjpUeXBlOjpOb25lOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZTo6 VHlwZTo6Tm9uZTsKK30KKwogQ2FwdHVyZVNvdXJjZU9yRXJyb3IgRGlzcGxheUNhcHR1cmVTb3Vy Y2VDb2NvYTo6Y3JlYXRlKGNvbnN0IENhcHR1cmVEZXZpY2UmIGRldmljZSwgU3RyaW5nJiYgaGFz aFNhbHQsIGNvbnN0IE1lZGlhQ29uc3RyYWludHMqIGNvbnN0cmFpbnRzKQogewogICAgIHN3aXRj aCAoZGV2aWNlLnR5cGUoKSkgewpAQCAtMTA2LDcgKzEzMCw3IEBAIENhcHR1cmVTb3VyY2VPckVy cm9yIERpc3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OmNyZWF0ZShFeHBlY3RlZDxVbmlxdWVSZWY8 Q2FwdHVyCiB9CiAKIERpc3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OkRpc3BsYXlDYXB0dXJlU291 cmNlQ29jb2EoVW5pcXVlUmVmPENhcHR1cmVyPiYmIGNhcHR1cmVyLCBTdHJpbmcmJiBuYW1lLCBT dHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5nJiYgaGFzaFNhbHQpCi0gICAgOiBSZWFsdGltZU1lZGlh U291cmNlKFR5cGU6OlZpZGVvLCBXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKGRldmljZUlEKSwgV1RG TW92ZShoYXNoU2FsdCkpCisgICAgOiBSZWFsdGltZU1lZGlhU291cmNlKHNvdXJjZVR5cGVGb3JE ZXZpY2UoY2FwdHVyZXItPmRldmljZVR5cGUoKSksIFdURk1vdmUobmFtZSksIFdURk1vdmUoZGV2 aWNlSUQpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKICAgICAsIG1fY2FwdHVyZXIoV1RGTW92ZShjYXB0 dXJlcikpCiAgICAgLCBtX3RpbWVyKFJ1bkxvb3A6OmN1cnJlbnQoKSwgdGhpcywgJkRpc3BsYXlD YXB0dXJlU291cmNlQ29jb2E6OmVtaXRGcmFtZSkKIHsK