172734 2017-05-30 15:05:05 -0700 Add support for Certificate and IceCandidatePair stats 2017-05-30 16:32:06 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ggaren jonlee mleaney webkit-bug-importer oldest_to_newest 1313897 0 youennf 2017-05-30 15:05:05 -0700 Useful for debugging and quality checks 1313898 1 311543 youennf 2017-05-30 15:06:52 -0700 Created attachment 311543 Patch 1313899 2 youennf 2017-05-30 15:08:45 -0700 rdar://problem/32368232 1313902 3 webkit-bug-importer 2017-05-30 15:09:09 -0700 <rdar://problem/32473346> 1313903 4 311543 ggaren 2017-05-30 15:09:36 -0700 Comment on attachment 311543 Patch r=me 1313905 5 youennf 2017-05-30 15:11:59 -0700 *** Bug 172681 has been marked as a duplicate of this bug. *** 1313913 6 311548 youennf 2017-05-30 15:51:28 -0700 Created attachment 311548 Patch for landing 1313914 7 youennf 2017-05-30 15:52:21 -0700 (In reply to youenn fablet from comment #6) > Created attachment 311548 [details] > Patch for landing Removing unneeded console.log 1313925 8 311548 commit-queue 2017-05-30 16:32:03 -0700 Comment on attachment 311548 Patch for landing Clearing flags on attachment: 311548 Committed r217583: <http://trac.webkit.org/changeset/217583> 1313926 9 commit-queue 2017-05-30 16:32:06 -0700 All reviewed patches have been landed. Closing bug. 311543 2017-05-30 15:06:52 -0700 2017-05-30 15:51:26 -0700 Patch bug-172734-20170530150652.patch text/plain 13800 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZhNDVkZGY1NGI0Yzg1 N2ZmNDg3Nzg4YjBlYjhiN2RhMTE2YTI1Ny4uY2M0ODgwM2ViODMwNDFiMGVjNzZkZTgxOTYwNTdm MTY4ODBhMWJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTA1LTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig Q2VydGlmaWNhdGUgYW5kIEljZUNhbmRpZGF0ZVBhaXIgc3RhdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjczNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0Lgor CisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciB0aGVzZSB0d28gc3RhdHMgaW4gdGhlIElETCBh bmQgaW4gdGhlIGxpYndlYnJ0YyBiaW5kaW5nIGNvZGUuCisKKyAgICAgICAgKiBNb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSVENTdGF0c1Jl cG9ydDo6SWNlQ2FuZGlkYXRlUGFpclN0YXRzOjpJY2VDYW5kaWRhdGVQYWlyU3RhdHMpOgorICAg ICAgICAoV2ViQ29yZTo6UlRDU3RhdHNSZXBvcnQ6OkNlcnRpZmljYXRlU3RhdHM6OkNlcnRpZmlj YXRlU3RhdHMpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQu aWRsOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01l ZGlhRW5kcG9pbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aWNlQ2FuZGlkYXRlUGFpclN0YXRl KToKKyAgICAgICAgKFdlYkNvcmU6OmZpbGxSVENJY2VDYW5kaWRhdGVQYWlyU3RhdHMpOgorICAg ICAgICAoV2ViQ29yZTo6ZmlsbFJUQ0NlcnRpZmljYXRlU3RhdHMpOgorICAgICAgICAoV2ViQ29y ZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6U3RhdHNDb2xsZWN0b3I6Ok9uU3RhdHNEZWxpdmVy ZWQpOgorCisyMDE3LTA1LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwog ICAgICAgICBSZWFsdGltZU91dGdvaW5nVmlkZW9Tb3VyY2Ugc2hvdWxkIG5vdCByb3RhdGUgbXV0 ZWQgZnJhbWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzI2NTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENTdGF0c1JlcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENTdGF0c1JlcG9ydC5oCmluZGV4IGZmODRmMWUzODg1ZTJmZDU4ZjM2ODk4OWMwMzY5OGNkMzI4 YWY0ZmQuLjAxZjNlN2YxZTE0ODBmZTAzMzQ1NDJlN2I1ODc0ZTE3MjMwMmU4YzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0LmgK QEAgLTE1MSw2ICsxNTEsNTMgQEAgcHVibGljOgogICAgICAgICB1bnNpZ25lZCBsb25nIGxvbmcg Ynl0ZXNSZWNlaXZlZCB7IDAgfTsKICAgICB9OwogCisgICAgZW51bSBjbGFzcyBJY2VDYW5kaWRh dGVQYWlyU3RhdGUgeworICAgICAgICBGcm96ZW4sCisgICAgICAgIFdhaXRpbmcsCisgICAgICAg IElucHJvZ3Jlc3MsCisgICAgICAgIEZhaWxlZCwKKyAgICAgICAgU3VjY2VlZGVkLAorICAgICAg ICBDYW5jZWxsZWQKKyAgICB9OworCisgICAgc3RydWN0IEljZUNhbmRpZGF0ZVBhaXJTdGF0cyA6 IFN0YXRzIHsKKyAgICAgICAgSWNlQ2FuZGlkYXRlUGFpclN0YXRzKCkgeyB0eXBlID0gUlRDU3Rh dHNSZXBvcnQ6OlR5cGU6OkNhbmRpZGF0ZVBhaXI7IH0KKworICAgICAgICBTdHJpbmcgdHJhbnNw b3J0SWQ7CisgICAgICAgIFN0cmluZyBsb2NhbENhbmRpZGF0ZUlkOworICAgICAgICBTdHJpbmcg cmVtb3RlQ2FuZGlkYXRlSWQ7CisgICAgICAgIEljZUNhbmRpZGF0ZVBhaXJTdGF0ZSBzdGF0ZTsK KyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHByaW9yaXR5IHsgMCB9OworICAgICAgICBib29s IG5vbWluYXRlZCB7IGZhbHNlIH07CisgICAgICAgIGJvb2wgd3JpdGFibGUgeyBmYWxzZSB9Owor ICAgICAgICBib29sIHJlYWRhYmxlIHsgZmFsc2UgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBs b25nIGJ5dGVzU2VudCB7IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzUmVj ZWl2ZWQgeyAwIH07CisgICAgICAgIGRvdWJsZSB0b3RhbFJvdW5kVHJpcFRpbWUgeyAwIH07Cisg ICAgICAgIGRvdWJsZSBjdXJyZW50Um91bmRUcmlwVGltZSB7IDAgfTsKKyAgICAgICAgZG91Ymxl IGF2YWlsYWJsZU91dGdvaW5nQml0cmF0ZSB7IDAgfTsKKyAgICAgICAgZG91YmxlIGF2YWlsYWJs ZUluY29taW5nQml0cmF0ZSB7IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJlcXVl c3RzUmVjZWl2ZWQgeyAwIH07CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1ZXN0c1Nl bnQgeyAwIH07CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXNwb25zZXNSZWNlaXZlZCB7 IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJlc3BvbnNlc1NlbnQgeyAwIH07Cisg ICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXRyYW5zbWlzc2lvbnNSZWNlaXZlZCB7IDAgfTsK KyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJldHJhbnNtaXNzaW9uc1NlbnQgeyAwIH07Cisg ICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVxdWVzdHNSZWNlaXZlZCB7IDAgfTsK KyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIGNvbnNlbnRSZXF1ZXN0c1NlbnQgeyAwIH07Cisg ICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVzcG9uc2VzUmVjZWl2ZWQgeyAwIH07 CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVzcG9uc2VzU2VudCB7IDAgfTsK KyAgICB9OworCisgICAgc3RydWN0IENlcnRpZmljYXRlU3RhdHMgOiBTdGF0cyB7CisgICAgICAg IENlcnRpZmljYXRlU3RhdHMoKSB7IHR5cGUgPSBSVENTdGF0c1JlcG9ydDo6VHlwZTo6Q2VydGlm aWNhdGU7IH0KKworICAgICAgICBTdHJpbmcgZmluZ2VycHJpbnQ7CisgICAgICAgIFN0cmluZyBm aW5nZXJwcmludEFsZ29yaXRobTsKKyAgICAgICAgU3RyaW5nIGJhc2U2NENlcnRpZmljYXRlOwor ICAgICAgICBTdHJpbmcgaXNzdWVyQ2VydGlmaWNhdGVJZDsKKyAgICB9OworCiBwcml2YXRlOgog ICAgIFJUQ1N0YXRzUmVwb3J0KCkgPSBkZWZhdWx0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0LmlkbCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCmluZGV4IDE0NGZiZmJi ZjQ4NDI1YTVmYjFjMjEwYjk4NmU1MDZlMGFmZDc4ZmIuLjc0NjA0MjYyZjgyM2Y0ZTgwZDY3Nzhm MWFiZDE2NGU2YjljMmQyZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCkBAIC0xMzMsMTEgKzEzMyw0OSBAQCBkaWN0 aW9uYXJ5IFJUQ0RhdGFDaGFubmVsU3RhdHMgOiBSVENTdGF0cyB7CiAgICAgdW5zaWduZWQgbG9u ZyBsb25nIGJ5dGVzUmVjZWl2ZWQ7CiB9OwogCitlbnVtIFJUQ1N0YXRzSWNlQ2FuZGlkYXRlUGFp clN0YXRlIHsKKyAgICAiZnJvemVuIiwKKyAgICAid2FpdGluZyIsCisgICAgImlucHJvZ3Jlc3Mi LAorICAgICJmYWlsZWQiLAorICAgICJzdWNjZWVkZWQiLAorICAgICJjYW5jZWxsZWQiCit9Owor CitbIEpTR2VuZXJhdGVUb0pTT2JqZWN0IF0KK2RpY3Rpb25hcnkgUlRDSWNlQ2FuZGlkYXRlUGFp clN0YXRzIDogUlRDU3RhdHMgeworICAgIERPTVN0cmluZyB0cmFuc3BvcnRJZDsKKyAgICBET01T dHJpbmcgbG9jYWxDYW5kaWRhdGVJZDsKKyAgICBET01TdHJpbmcgcmVtb3RlQ2FuZGlkYXRlSWQ7 CisgICAgUlRDU3RhdHNJY2VDYW5kaWRhdGVQYWlyU3RhdGUgc3RhdGU7CisgICAgdW5zaWduZWQg bG9uZyBsb25nIHByaW9yaXR5OworICAgIGJvb2xlYW4gbm9taW5hdGVkOworICAgIGJvb2xlYW4g d3JpdGFibGU7CisgICAgYm9vbGVhbiByZWFkYWJsZTsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcg Ynl0ZXNTZW50OworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1JlY2VpdmVkOworICAgIGRv dWJsZSB0b3RhbFJvdW5kVHJpcFRpbWU7CisgICAgZG91YmxlIGN1cnJlbnRSb3VuZFRyaXBUaW1l OworICAgIGRvdWJsZSBhdmFpbGFibGVPdXRnb2luZ0JpdHJhdGU7CisgICAgZG91YmxlIGF2YWls YWJsZUluY29taW5nQml0cmF0ZTsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdHNSZWNl aXZlZDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdHNTZW50OworICAgIHVuc2lnbmVk IGxvbmcgbG9uZyByZXNwb25zZXNSZWNlaXZlZDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVz cG9uc2VzU2VudDsKKyAgICAvLyBGSVhNRTogRXhwb3NlIG90aGVyIGZpZWxkcyBvbmNlIGxpYndl YnJ0YyBzdXBwb3J0IHRoZW0uCit9OworCitbIEpTR2VuZXJhdGVUb0pTT2JqZWN0IF0KK2RpY3Rp b25hcnkgUlRDQ2VydGlmaWNhdGVTdGF0cyA6IFJUQ1N0YXRzIHsKKyAgICBET01TdHJpbmcgZmlu Z2VycHJpbnQ7CisgICAgRE9NU3RyaW5nIGZpbmdlcnByaW50QWxnb3JpdGhtOworICAgIERPTVN0 cmluZyBiYXNlNjRDZXJ0aWZpY2F0ZTsKKyAgICBET01TdHJpbmcgaXNzdWVyQ2VydGlmaWNhdGVJ ZDsKK307CisKIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENDb2RlY1N0YXRzCiAvLyBGSVhN RSAxNjk2NjI6IG1pc3NpbmcgUlRDUGVlckNvbm5lY3Rpb25TdGF0cwogLy8gRklYTUUgMTY5NjYy OiBtaXNzaW5nIFJUQ01lZGlhU3RyZWFtU3RhdHMKIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBS VENUcmFuc3BvcnRTdGF0cwogLy8gRklYTUUgMTY5NjYyOiBtaXNzaW5nIFJUQ0ljZUNhbmRpZGF0 ZVN0YXRzCi0vLyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgUlRDSWNlQ2FuZGlkYXRlUGFpclN0YXRz CiAvLyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgUlRDU3RhdHNJY2VDYW5kaWRhdGVQYWlyU3RhdGUK LS8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENDZXJ0aWZpY2F0ZVN0YXRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENN ZWRpYUVuZHBvaW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCmluZGV4IGQyOTIzZDM5NmU3ZDI4ZTkz ZTY1MDkwM2YwZjgwNjk5M2U0MTY1MjQuLmU0MzdmZTFjMGNiMDJlNTQ2ZjI2NjQ3MjBkODgyOTI4 NWUyNzAxNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3Bw CkBAIC0zODYsNiArMzg2LDk2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBmaWxsUlRDRGF0YUNoYW5u ZWxTdGF0cyhSVENTdGF0c1JlcG9ydDo6RGF0YUNoYW5uZWxTdGF0cyYgc3RhCiAgICAgICAgIHN0 YXRzLmJ5dGVzUmVjZWl2ZWQgPSAqcnRjU3RhdHMuYnl0ZXNfcmVjZWl2ZWQ7CiB9CiAKK3N0YXRp YyBpbmxpbmUgUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0ZSBpY2VDYW5kaWRh dGVQYWlyU3RhdGUoY29uc3Qgc3RkOjpzdHJpbmcmIHN0YXRlKQoreworICAgIGlmIChzdGF0ZSA9 PSAiZnJvemVuIikKKyAgICAgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQ YWlyU3RhdGU6OkZyb3plbjsKKyAgICBpZiAoc3RhdGUgPT0gIndhaXRpbmciKQorICAgICAgICBy ZXR1cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0ZTo6V2FpdGluZzsKKyAg ICBpZiAoc3RhdGUgPT0gImluLXByb2dyZXNzIikKKyAgICAgICAgcmV0dXJuIFJUQ1N0YXRzUmVw b3J0OjpJY2VDYW5kaWRhdGVQYWlyU3RhdGU6OklucHJvZ3Jlc3M7CisgICAgaWYgKHN0YXRlID09 ICJmYWlsZWQiKQorICAgICAgICByZXR1cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBh aXJTdGF0ZTo6RmFpbGVkOworICAgIGlmIChzdGF0ZSA9PSAic3VjY2VlZGVkIikKKyAgICAgICAg cmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQYWlyU3RhdGU6OlN1Y2NlZWRlZDsK KyAgICBpZiAoc3RhdGUgPT0gImNhbmNlbGxlZCIpCisgICAgICAgIHJldHVybiBSVENTdGF0c1Jl cG9ydDo6SWNlQ2FuZGlkYXRlUGFpclN0YXRlOjpDYW5jZWxsZWQ7CisgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQYWlyU3Rh dGU6OkZyb3plbjsKK30KKworc3RhdGljIGlubGluZSB2b2lkIGZpbGxSVENJY2VDYW5kaWRhdGVQ YWlyU3RhdHMoUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0cyYgc3RhdHMsIGNv bnN0IHdlYnJ0Yzo6UlRDSWNlQ2FuZGlkYXRlUGFpclN0YXRzJiBydGNTdGF0cykKK3sKKyAgICBm aWxsUlRDU3RhdHMoc3RhdHMsIHJ0Y1N0YXRzKTsKKworICAgIGlmIChydGNTdGF0cy50cmFuc3Bv cnRfaWQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy50cmFuc3BvcnRJZCA9IGZyb21TdGRT dHJpbmcoKnJ0Y1N0YXRzLnRyYW5zcG9ydF9pZCk7CisgICAgaWYgKHJ0Y1N0YXRzLmxvY2FsX2Nh bmRpZGF0ZV9pZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmxvY2FsQ2FuZGlkYXRlSWQg PSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5sb2NhbF9jYW5kaWRhdGVfaWQpOworICAgIGlmIChy dGNTdGF0cy5yZW1vdGVfY2FuZGlkYXRlX2lkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMu cmVtb3RlQ2FuZGlkYXRlSWQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5yZW1vdGVfY2FuZGlk YXRlX2lkKTsKKyAgICBpZiAocnRjU3RhdHMuc3RhdGUuaXNfZGVmaW5lZCgpKQorICAgICAgICBz dGF0cy5zdGF0ZSA9IGljZUNhbmRpZGF0ZVBhaXJTdGF0ZSgqcnRjU3RhdHMuc3RhdGUpOworCisg ICAgaWYgKHJ0Y1N0YXRzLnByaW9yaXR5LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucHJp b3JpdHkgPSAqcnRjU3RhdHMucHJpb3JpdHk7CisgICAgaWYgKHJ0Y1N0YXRzLm5vbWluYXRlZC5p c19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLm5vbWluYXRlZCA9ICpydGNTdGF0cy5ub21pbmF0 ZWQ7CisgICAgaWYgKHJ0Y1N0YXRzLndyaXRhYmxlLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3Rh dHMud3JpdGFibGUgPSAqcnRjU3RhdHMud3JpdGFibGU7CisgICAgaWYgKHJ0Y1N0YXRzLnJlYWRh YmxlLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucmVhZGFibGUgPSAqcnRjU3RhdHMucmVh ZGFibGU7CisKKyAgICBpZiAocnRjU3RhdHMuYnl0ZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAg ICAgIHN0YXRzLmJ5dGVzU2VudCA9ICpydGNTdGF0cy5ieXRlc19zZW50OworICAgIGlmIChydGNT dGF0cy5ieXRlc19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmJ5dGVzUmVj ZWl2ZWQgPSAqcnRjU3RhdHMuYnl0ZXNfcmVjZWl2ZWQ7CisgICAgaWYgKHJ0Y1N0YXRzLnRvdGFs X3JvdW5kX3RyaXBfdGltZS5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnRvdGFsUm91bmRU cmlwVGltZSA9ICpydGNTdGF0cy50b3RhbF9yb3VuZF90cmlwX3RpbWU7CisgICAgaWYgKHJ0Y1N0 YXRzLmN1cnJlbnRfcm91bmRfdHJpcF90aW1lLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMu Y3VycmVudFJvdW5kVHJpcFRpbWUgPSAqcnRjU3RhdHMuY3VycmVudF9yb3VuZF90cmlwX3RpbWU7 CisgICAgaWYgKHJ0Y1N0YXRzLmF2YWlsYWJsZV9vdXRnb2luZ19iaXRyYXRlLmlzX2RlZmluZWQo KSkKKyAgICAgICAgc3RhdHMuYXZhaWxhYmxlT3V0Z29pbmdCaXRyYXRlID0gKnJ0Y1N0YXRzLmF2 YWlsYWJsZV9vdXRnb2luZ19iaXRyYXRlOworICAgIGlmIChydGNTdGF0cy5hdmFpbGFibGVfaW5j b21pbmdfYml0cmF0ZS5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmF2YWlsYWJsZUluY29t aW5nQml0cmF0ZSA9ICpydGNTdGF0cy5hdmFpbGFibGVfaW5jb21pbmdfYml0cmF0ZTsKKworICAg IGlmIChydGNTdGF0cy5yZXF1ZXN0c19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0 YXRzLnJlcXVlc3RzUmVjZWl2ZWQgPSAqcnRjU3RhdHMucmVxdWVzdHNfcmVjZWl2ZWQ7CisgICAg aWYgKHJ0Y1N0YXRzLnJlcXVlc3RzX3NlbnQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5y ZXF1ZXN0c1NlbnQgPSAqcnRjU3RhdHMucmVxdWVzdHNfc2VudDsKKyAgICBpZiAocnRjU3RhdHMu cmVzcG9uc2VzX3JlY2VpdmVkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucmVzcG9uc2Vz UmVjZWl2ZWQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3JlY2VpdmVkOworICAgIGlmIChydGNTdGF0 cy5yZXNwb25zZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnJlc3BvbnNlc1Nl bnQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7CisKKyAgICBpZiAocnRjU3RhdHMucmVxdWVz dHNfcmVjZWl2ZWQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5yZXRyYW5zbWlzc2lvbnNS ZWNlaXZlZCA9ICpydGNTdGF0cy5yZXF1ZXN0c19yZWNlaXZlZDsKKyAgICBpZiAocnRjU3RhdHMu cmVxdWVzdHNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnJldHJhbnNtaXNzaW9u c1NlbnQgPSAqcnRjU3RhdHMucmVxdWVzdHNfc2VudDsKKyAgICBpZiAocnRjU3RhdHMucmVzcG9u c2VzX3JlY2VpdmVkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY29uc2VudFJlcXVlc3Rz UmVjZWl2ZWQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3JlY2VpdmVkOworICAgIGlmIChydGNTdGF0 cy5yZXNwb25zZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmNvbnNlbnRSZXF1 ZXN0c1NlbnQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7CisgICAgaWYgKHJ0Y1N0YXRzLnJl c3BvbnNlc19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmNvbnNlbnRSZXNw b25zZXNSZWNlaXZlZCA9ICpydGNTdGF0cy5yZXNwb25zZXNfcmVjZWl2ZWQ7CisgICAgaWYgKHJ0 Y1N0YXRzLnJlc3BvbnNlc19zZW50LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY29uc2Vu dFJlc3BvbnNlc1NlbnQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7Cit9CisKK3N0YXRpYyBp bmxpbmUgdm9pZCBmaWxsUlRDQ2VydGlmaWNhdGVTdGF0cyhSVENTdGF0c1JlcG9ydDo6Q2VydGlm aWNhdGVTdGF0cyYgc3RhdHMsIGNvbnN0IHdlYnJ0Yzo6UlRDQ2VydGlmaWNhdGVTdGF0cyYgcnRj U3RhdHMpCit7CisgICAgZmlsbFJUQ1N0YXRzKHN0YXRzLCBydGNTdGF0cyk7CisKKyAgICBpZiAo cnRjU3RhdHMuZmluZ2VycHJpbnQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5maW5nZXJw cmludCA9IGZyb21TdGRTdHJpbmcoKnJ0Y1N0YXRzLmZpbmdlcnByaW50KTsKKyAgICBpZiAocnRj U3RhdHMuZmluZ2VycHJpbnRfYWxnb3JpdGhtLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMu ZmluZ2VycHJpbnRBbGdvcml0aG0gPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5maW5nZXJwcmlu dF9hbGdvcml0aG0pOworICAgIGlmIChydGNTdGF0cy5iYXNlNjRfY2VydGlmaWNhdGUuaXNfZGVm aW5lZCgpKQorICAgICAgICBzdGF0cy5iYXNlNjRDZXJ0aWZpY2F0ZSA9IGZyb21TdGRTdHJpbmco KnJ0Y1N0YXRzLmJhc2U2NF9jZXJ0aWZpY2F0ZSk7CisgICAgaWYgKHJ0Y1N0YXRzLmlzc3Vlcl9j ZXJ0aWZpY2F0ZV9pZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmlzc3VlckNlcnRpZmlj YXRlSWQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5pc3N1ZXJfY2VydGlmaWNhdGVfaWQpOwor fQorCiB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OlN0YXRzQ29sbGVjdG9yOjpPblN0YXRz RGVsaXZlcmVkKGNvbnN0IHJ0Yzo6c2NvcGVkX3JlZnB0cjxjb25zdCB3ZWJydGM6OlJUQ1N0YXRz UmVwb3J0PiYgcnRjUmVwb3J0KQogewogICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRo aXMgPSBydGM6OnNjb3BlZF9yZWZwdHI8TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6U3RhdHNDb2xs ZWN0b3I+KHRoaXMpLCBydGNSZXBvcnRdIHsKQEAgLTQxMyw2ICs1MDMsMTQgQEAgdm9pZCBMaWJX ZWJSVENNZWRpYUVuZHBvaW50OjpTdGF0c0NvbGxlY3Rvcjo6T25TdGF0c0RlbGl2ZXJlZChjb25z dCBydGM6OnNjb3BlZF8KICAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6RGF0YUNoYW5u ZWxTdGF0cyBzdGF0czsKICAgICAgICAgICAgICAgICBmaWxsUlRDRGF0YUNoYW5uZWxTdGF0cyhz dGF0cywgc3RhdGljX2Nhc3Q8Y29uc3Qgd2VicnRjOjpSVENEYXRhQ2hhbm5lbFN0YXRzJj4ocnRj U3RhdHMpKTsKICAgICAgICAgICAgICAgICByZXBvcnQtPmFkZFN0YXRzPElETERpY3Rpb25hcnk8 UlRDU3RhdHNSZXBvcnQ6OkRhdGFDaGFubmVsU3RhdHM+PihXVEZNb3ZlKHN0YXRzKSk7CisgICAg ICAgICAgICB9IGVsc2UgaWYgKHJ0Y1N0YXRzLnR5cGUoKSA9PSB3ZWJydGM6OlJUQ0ljZUNhbmRp ZGF0ZVBhaXJTdGF0czo6a1R5cGUpIHsKKyAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6 SWNlQ2FuZGlkYXRlUGFpclN0YXRzIHN0YXRzOworICAgICAgICAgICAgICAgIGZpbGxSVENJY2VD YW5kaWRhdGVQYWlyU3RhdHMoc3RhdHMsIHN0YXRpY19jYXN0PGNvbnN0IHdlYnJ0Yzo6UlRDSWNl Q2FuZGlkYXRlUGFpclN0YXRzJj4ocnRjU3RhdHMpKTsKKyAgICAgICAgICAgICAgICByZXBvcnQt PmFkZFN0YXRzPElETERpY3Rpb25hcnk8UlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJT dGF0cz4+KFdURk1vdmUoc3RhdHMpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAocnRjU3RhdHMu dHlwZSgpID09IHdlYnJ0Yzo6UlRDQ2VydGlmaWNhdGVTdGF0czo6a1R5cGUpIHsKKyAgICAgICAg ICAgICAgICBSVENTdGF0c1JlcG9ydDo6Q2VydGlmaWNhdGVTdGF0cyBzdGF0czsKKyAgICAgICAg ICAgICAgICBmaWxsUlRDQ2VydGlmaWNhdGVTdGF0cyhzdGF0cywgc3RhdGljX2Nhc3Q8Y29uc3Qg d2VicnRjOjpSVENDZXJ0aWZpY2F0ZVN0YXRzJj4ocnRjU3RhdHMpKTsKKyAgICAgICAgICAgICAg ICByZXBvcnQtPmFkZFN0YXRzPElETERpY3Rpb25hcnk8UlRDU3RhdHNSZXBvcnQ6OkNlcnRpZmlj YXRlU3RhdHM+PihXVEZNb3ZlKHN0YXRzKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCAwNGFhMjgyOWU4ZGY0MGI5ZGJmNWFkNWI0NzJiMGI0ZDUxOTliMTY3Li5j ZGZjMGQ3Yjg4YjU3MDBhMmQxOGE2M2E1YzExNDYzYjQxZTdjZWI5IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MTQgQEAKIDIwMTctMDUtMzAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCisg ICAgICAgIEFkZCBzdXBwb3J0IGZvciBDZXJ0aWZpY2F0ZSBhbmQgSWNlQ2FuZGlkYXRlUGFpciBz dGF0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcy NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3 ZWJydGMvdmlkZW8tc3RhdHMuaHRtbDoKKworMjAxNy0wNS0zMCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CisKICAgICAgICAgUmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlIHNo b3VsZCBub3Qgcm90YXRlIG11dGVkIGZyYW1lcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyNjU5CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dl YnJ0Yy92aWRlby1zdGF0cy5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0 bWwKaW5kZXggNmU5ZDlhOTQ4NTZhYzQ3YjNiZTliYWZlNGRlZGFlYmI1NDc4ZTM5NS4uMmYyMDkz MDdkYzI5YmQ5YmUwMDJkNTNmMGE0Y2E3Y2JhNGY5YjJkMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVv LXN0YXRzLmh0bWwKQEAgLTksNiArOSwxOCBAQAogICAgIDxib2R5PgogICAgICAgICA8c2NyaXB0 IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KK2Z1bmN0aW9u IGdldFN0YXRzVHlwZShjb25uZWN0aW9uKQoreworICAgIHJldHVybiBjb25uZWN0aW9uLmdldFN0 YXRzKCkudGhlbigocmVwb3J0KSA9PiB7CisgICAgICAgIHZhciByZXBvcnRUeXBlcyA9IFtdOwor ICAgICAgICByZXBvcnQuZm9yRWFjaCgoc3RhdEl0ZW0pID0+IHsKKyAgICAgICAgICAgIGlmIChy ZXBvcnRUeXBlcy5pbmRleE9mKHN0YXRJdGVtLnR5cGUpID09PSAtMSkKKyAgICAgICAgICAgICAg ICByZXBvcnRUeXBlcy5wdXNoKHN0YXRJdGVtLnR5cGUpOworICAgICAgICB9KTsKK2NvbnNvbGUu bG9nKHJlcG9ydFR5cGVzLnNvcnQoKSk7CisgICAgICAgIHJldHVybiByZXBvcnRUeXBlcy5zb3J0 KCk7CisgICAgfSk7Cit9CiAKIGZ1bmN0aW9uIGNoZWNrU3RhdHNSZXBvcnRJdGVyYXRvcihyZXBv cnQpCiB7CkBAIC0xMTQsNiArMTI2LDE0IEBAIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogICAg ICAgICByZXR1cm4gY2hlY2tJbmJvdW5kRnJhbWVzTnVtYmVySW5jcmVhc2VkKHNlY29uZENvbm5l Y3Rpb24sIHN0YXRzU2Vjb25kQ29ubmVjdGlvbiwgMCk7CiAgICAgfSkudGhlbigoKSA9PiB7CiAg ICAgICAgIHJldHVybiBjaGVja091dGJvdW5kRnJhbWVzTnVtYmVySW5jcmVhc2VkKGZpcnN0Q29u bmVjdGlvbiwgc3RhdHNGaXJzdENvbm5lY3Rpb24sIDApOworICAgIH0pLnRoZW4oKCkgPT4gewor ICAgICAgICByZXR1cm4gZ2V0U3RhdHNUeXBlKGZpcnN0Q29ubmVjdGlvbik7CisgICAgfSkudGhl bigodHlwZXMpID0+IHsKKyAgICAgICAgYXNzZXJ0X2FycmF5X2VxdWFscyh0eXBlcywgWyJjYW5k aWRhdGUtcGFpciIsICJjZXJ0aWZpY2F0ZSIsICJvdXRib3VuZC1ydHAiXSk7CisgICAgfSkudGhl bigoKSA9PiB7CisgICAgICAgIHJldHVybiBnZXRTdGF0c1R5cGUoc2Vjb25kQ29ubmVjdGlvbik7 CisgICAgfSkudGhlbigodHlwZXMpID0+IHsKKyAgICAgICAgYXNzZXJ0X2FycmF5X2VxdWFscyh0 eXBlcywgWyJjYW5kaWRhdGUtcGFpciIsICJjZXJ0aWZpY2F0ZSIsICJpbmJvdW5kLXJ0cCIsICJ0 cmFjayJdKTsKICAgICB9KTsKIH0sICJCYXNpYyB2aWRlbyBzdGF0cyIpOwogICAgICAgICA8L3Nj cmlwdD4K 311548 2017-05-30 15:51:28 -0700 2017-05-30 16:32:03 -0700 Patch for landing bug-172734-20170530155127.patch text/plain 13760 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZhNDVkZGY1NGI0Yzg1 N2ZmNDg3Nzg4YjBlYjhiN2RhMTE2YTI1Ny4uYjYyZjgxMzZkODYwMzliZGMxZWZiZmIyOGQ0OTI4 NzcwYjc5M2EyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTA1LTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig Q2VydGlmaWNhdGUgYW5kIEljZUNhbmRpZGF0ZVBhaXIgc3RhdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjczNAorCisgICAgICAgIFJldmlld2Vk IGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0LgorCisg ICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciB0aGVzZSB0d28gc3RhdHMgaW4gdGhlIElETCBhbmQg aW4gdGhlIGxpYndlYnJ0YyBiaW5kaW5nIGNvZGUuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1N0YXRzUmVwb3J0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSVENTdGF0c1JlcG9y dDo6SWNlQ2FuZGlkYXRlUGFpclN0YXRzOjpJY2VDYW5kaWRhdGVQYWlyU3RhdHMpOgorICAgICAg ICAoV2ViQ29yZTo6UlRDU3RhdHNSZXBvcnQ6OkNlcnRpZmljYXRlU3RhdHM6OkNlcnRpZmljYXRl U3RhdHMpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRs OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlh RW5kcG9pbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aWNlQ2FuZGlkYXRlUGFpclN0YXRlKToK KyAgICAgICAgKFdlYkNvcmU6OmZpbGxSVENJY2VDYW5kaWRhdGVQYWlyU3RhdHMpOgorICAgICAg ICAoV2ViQ29yZTo6ZmlsbFJUQ0NlcnRpZmljYXRlU3RhdHMpOgorICAgICAgICAoV2ViQ29yZTo6 TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6U3RhdHNDb2xsZWN0b3I6Ok9uU3RhdHNEZWxpdmVyZWQp OgorCisyMDE3LTA1LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAg ICAgICBSZWFsdGltZU91dGdvaW5nVmlkZW9Tb3VyY2Ugc2hvdWxkIG5vdCByb3RhdGUgbXV0ZWQg ZnJhbWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzI2NTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENTdGF0c1JlcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENT dGF0c1JlcG9ydC5oCmluZGV4IGZmODRmMWUzODg1ZTJmZDU4ZjM2ODk4OWMwMzY5OGNkMzI4YWY0 ZmQuLjAxZjNlN2YxZTE0ODBmZTAzMzQ1NDJlN2I1ODc0ZTE3MjMwMmU4YzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0LmgKQEAg LTE1MSw2ICsxNTEsNTMgQEAgcHVibGljOgogICAgICAgICB1bnNpZ25lZCBsb25nIGxvbmcgYnl0 ZXNSZWNlaXZlZCB7IDAgfTsKICAgICB9OwogCisgICAgZW51bSBjbGFzcyBJY2VDYW5kaWRhdGVQ YWlyU3RhdGUgeworICAgICAgICBGcm96ZW4sCisgICAgICAgIFdhaXRpbmcsCisgICAgICAgIElu cHJvZ3Jlc3MsCisgICAgICAgIEZhaWxlZCwKKyAgICAgICAgU3VjY2VlZGVkLAorICAgICAgICBD YW5jZWxsZWQKKyAgICB9OworCisgICAgc3RydWN0IEljZUNhbmRpZGF0ZVBhaXJTdGF0cyA6IFN0 YXRzIHsKKyAgICAgICAgSWNlQ2FuZGlkYXRlUGFpclN0YXRzKCkgeyB0eXBlID0gUlRDU3RhdHNS ZXBvcnQ6OlR5cGU6OkNhbmRpZGF0ZVBhaXI7IH0KKworICAgICAgICBTdHJpbmcgdHJhbnNwb3J0 SWQ7CisgICAgICAgIFN0cmluZyBsb2NhbENhbmRpZGF0ZUlkOworICAgICAgICBTdHJpbmcgcmVt b3RlQ2FuZGlkYXRlSWQ7CisgICAgICAgIEljZUNhbmRpZGF0ZVBhaXJTdGF0ZSBzdGF0ZTsKKyAg ICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHByaW9yaXR5IHsgMCB9OworICAgICAgICBib29sIG5v bWluYXRlZCB7IGZhbHNlIH07CisgICAgICAgIGJvb2wgd3JpdGFibGUgeyBmYWxzZSB9OworICAg ICAgICBib29sIHJlYWRhYmxlIHsgZmFsc2UgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25n IGJ5dGVzU2VudCB7IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzUmVjZWl2 ZWQgeyAwIH07CisgICAgICAgIGRvdWJsZSB0b3RhbFJvdW5kVHJpcFRpbWUgeyAwIH07CisgICAg ICAgIGRvdWJsZSBjdXJyZW50Um91bmRUcmlwVGltZSB7IDAgfTsKKyAgICAgICAgZG91YmxlIGF2 YWlsYWJsZU91dGdvaW5nQml0cmF0ZSB7IDAgfTsKKyAgICAgICAgZG91YmxlIGF2YWlsYWJsZUlu Y29taW5nQml0cmF0ZSB7IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJlcXVlc3Rz UmVjZWl2ZWQgeyAwIH07CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1ZXN0c1NlbnQg eyAwIH07CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXNwb25zZXNSZWNlaXZlZCB7IDAg fTsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJlc3BvbnNlc1NlbnQgeyAwIH07CisgICAg ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXRyYW5zbWlzc2lvbnNSZWNlaXZlZCB7IDAgfTsKKyAg ICAgICAgdW5zaWduZWQgbG9uZyBsb25nIHJldHJhbnNtaXNzaW9uc1NlbnQgeyAwIH07CisgICAg ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVxdWVzdHNSZWNlaXZlZCB7IDAgfTsKKyAg ICAgICAgdW5zaWduZWQgbG9uZyBsb25nIGNvbnNlbnRSZXF1ZXN0c1NlbnQgeyAwIH07CisgICAg ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVzcG9uc2VzUmVjZWl2ZWQgeyAwIH07Cisg ICAgICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBjb25zZW50UmVzcG9uc2VzU2VudCB7IDAgfTsKKyAg ICB9OworCisgICAgc3RydWN0IENlcnRpZmljYXRlU3RhdHMgOiBTdGF0cyB7CisgICAgICAgIENl cnRpZmljYXRlU3RhdHMoKSB7IHR5cGUgPSBSVENTdGF0c1JlcG9ydDo6VHlwZTo6Q2VydGlmaWNh dGU7IH0KKworICAgICAgICBTdHJpbmcgZmluZ2VycHJpbnQ7CisgICAgICAgIFN0cmluZyBmaW5n ZXJwcmludEFsZ29yaXRobTsKKyAgICAgICAgU3RyaW5nIGJhc2U2NENlcnRpZmljYXRlOworICAg ICAgICBTdHJpbmcgaXNzdWVyQ2VydGlmaWNhdGVJZDsKKyAgICB9OworCiBwcml2YXRlOgogICAg IFJUQ1N0YXRzUmVwb3J0KCkgPSBkZWZhdWx0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0LmlkbCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCmluZGV4IDE0NGZiZmJiZjQ4 NDI1YTVmYjFjMjEwYjk4NmU1MDZlMGFmZDc4ZmIuLjc0NjA0MjYyZjgyM2Y0ZTgwZDY3NzhmMWFi ZDE2NGU2YjljMmQyZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaWRsCkBAIC0xMzMsMTEgKzEzMyw0OSBAQCBkaWN0aW9u YXJ5IFJUQ0RhdGFDaGFubmVsU3RhdHMgOiBSVENTdGF0cyB7CiAgICAgdW5zaWduZWQgbG9uZyBs b25nIGJ5dGVzUmVjZWl2ZWQ7CiB9OwogCitlbnVtIFJUQ1N0YXRzSWNlQ2FuZGlkYXRlUGFpclN0 YXRlIHsKKyAgICAiZnJvemVuIiwKKyAgICAid2FpdGluZyIsCisgICAgImlucHJvZ3Jlc3MiLAor ICAgICJmYWlsZWQiLAorICAgICJzdWNjZWVkZWQiLAorICAgICJjYW5jZWxsZWQiCit9OworCitb IEpTR2VuZXJhdGVUb0pTT2JqZWN0IF0KK2RpY3Rpb25hcnkgUlRDSWNlQ2FuZGlkYXRlUGFpclN0 YXRzIDogUlRDU3RhdHMgeworICAgIERPTVN0cmluZyB0cmFuc3BvcnRJZDsKKyAgICBET01TdHJp bmcgbG9jYWxDYW5kaWRhdGVJZDsKKyAgICBET01TdHJpbmcgcmVtb3RlQ2FuZGlkYXRlSWQ7Cisg ICAgUlRDU3RhdHNJY2VDYW5kaWRhdGVQYWlyU3RhdGUgc3RhdGU7CisgICAgdW5zaWduZWQgbG9u ZyBsb25nIHByaW9yaXR5OworICAgIGJvb2xlYW4gbm9taW5hdGVkOworICAgIGJvb2xlYW4gd3Jp dGFibGU7CisgICAgYm9vbGVhbiByZWFkYWJsZTsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgYnl0 ZXNTZW50OworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1JlY2VpdmVkOworICAgIGRvdWJs ZSB0b3RhbFJvdW5kVHJpcFRpbWU7CisgICAgZG91YmxlIGN1cnJlbnRSb3VuZFRyaXBUaW1lOwor ICAgIGRvdWJsZSBhdmFpbGFibGVPdXRnb2luZ0JpdHJhdGU7CisgICAgZG91YmxlIGF2YWlsYWJs ZUluY29taW5nQml0cmF0ZTsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdHNSZWNlaXZl ZDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdHNTZW50OworICAgIHVuc2lnbmVkIGxv bmcgbG9uZyByZXNwb25zZXNSZWNlaXZlZDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgcmVzcG9u c2VzU2VudDsKKyAgICAvLyBGSVhNRTogRXhwb3NlIG90aGVyIGZpZWxkcyBvbmNlIGxpYndlYnJ0 YyBzdXBwb3J0IHRoZW0uCit9OworCitbIEpTR2VuZXJhdGVUb0pTT2JqZWN0IF0KK2RpY3Rpb25h cnkgUlRDQ2VydGlmaWNhdGVTdGF0cyA6IFJUQ1N0YXRzIHsKKyAgICBET01TdHJpbmcgZmluZ2Vy cHJpbnQ7CisgICAgRE9NU3RyaW5nIGZpbmdlcnByaW50QWxnb3JpdGhtOworICAgIERPTVN0cmlu ZyBiYXNlNjRDZXJ0aWZpY2F0ZTsKKyAgICBET01TdHJpbmcgaXNzdWVyQ2VydGlmaWNhdGVJZDsK K307CisKIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENDb2RlY1N0YXRzCiAvLyBGSVhNRSAx Njk2NjI6IG1pc3NpbmcgUlRDUGVlckNvbm5lY3Rpb25TdGF0cwogLy8gRklYTUUgMTY5NjYyOiBt aXNzaW5nIFJUQ01lZGlhU3RyZWFtU3RhdHMKIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENU cmFuc3BvcnRTdGF0cwogLy8gRklYTUUgMTY5NjYyOiBtaXNzaW5nIFJUQ0ljZUNhbmRpZGF0ZVN0 YXRzCi0vLyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgUlRDSWNlQ2FuZGlkYXRlUGFpclN0YXRzCiAv LyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgUlRDU3RhdHNJY2VDYW5kaWRhdGVQYWlyU3RhdGUKLS8v IEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENDZXJ0aWZpY2F0ZVN0YXRzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRp YUVuZHBvaW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCmluZGV4IGQyOTIzZDM5NmU3ZDI4ZTkzZTY1 MDkwM2YwZjgwNjk5M2U0MTY1MjQuLmU0MzdmZTFjMGNiMDJlNTQ2ZjI2NjQ3MjBkODgyOTI4NWUy NzAxNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCkBA IC0zODYsNiArMzg2LDk2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBmaWxsUlRDRGF0YUNoYW5uZWxT dGF0cyhSVENTdGF0c1JlcG9ydDo6RGF0YUNoYW5uZWxTdGF0cyYgc3RhCiAgICAgICAgIHN0YXRz LmJ5dGVzUmVjZWl2ZWQgPSAqcnRjU3RhdHMuYnl0ZXNfcmVjZWl2ZWQ7CiB9CiAKK3N0YXRpYyBp bmxpbmUgUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0ZSBpY2VDYW5kaWRhdGVQ YWlyU3RhdGUoY29uc3Qgc3RkOjpzdHJpbmcmIHN0YXRlKQoreworICAgIGlmIChzdGF0ZSA9PSAi ZnJvemVuIikKKyAgICAgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQYWly U3RhdGU6OkZyb3plbjsKKyAgICBpZiAoc3RhdGUgPT0gIndhaXRpbmciKQorICAgICAgICByZXR1 cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0ZTo6V2FpdGluZzsKKyAgICBp ZiAoc3RhdGUgPT0gImluLXByb2dyZXNzIikKKyAgICAgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0 OjpJY2VDYW5kaWRhdGVQYWlyU3RhdGU6OklucHJvZ3Jlc3M7CisgICAgaWYgKHN0YXRlID09ICJm YWlsZWQiKQorICAgICAgICByZXR1cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJT dGF0ZTo6RmFpbGVkOworICAgIGlmIChzdGF0ZSA9PSAic3VjY2VlZGVkIikKKyAgICAgICAgcmV0 dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQYWlyU3RhdGU6OlN1Y2NlZWRlZDsKKyAg ICBpZiAoc3RhdGUgPT0gImNhbmNlbGxlZCIpCisgICAgICAgIHJldHVybiBSVENTdGF0c1JlcG9y dDo6SWNlQ2FuZGlkYXRlUGFpclN0YXRlOjpDYW5jZWxsZWQ7CisgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVQYWlyU3RhdGU6 OkZyb3plbjsKK30KKworc3RhdGljIGlubGluZSB2b2lkIGZpbGxSVENJY2VDYW5kaWRhdGVQYWly U3RhdHMoUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0cyYgc3RhdHMsIGNvbnN0 IHdlYnJ0Yzo6UlRDSWNlQ2FuZGlkYXRlUGFpclN0YXRzJiBydGNTdGF0cykKK3sKKyAgICBmaWxs UlRDU3RhdHMoc3RhdHMsIHJ0Y1N0YXRzKTsKKworICAgIGlmIChydGNTdGF0cy50cmFuc3BvcnRf aWQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy50cmFuc3BvcnRJZCA9IGZyb21TdGRTdHJp bmcoKnJ0Y1N0YXRzLnRyYW5zcG9ydF9pZCk7CisgICAgaWYgKHJ0Y1N0YXRzLmxvY2FsX2NhbmRp ZGF0ZV9pZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmxvY2FsQ2FuZGlkYXRlSWQgPSBm cm9tU3RkU3RyaW5nKCpydGNTdGF0cy5sb2NhbF9jYW5kaWRhdGVfaWQpOworICAgIGlmIChydGNT dGF0cy5yZW1vdGVfY2FuZGlkYXRlX2lkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucmVt b3RlQ2FuZGlkYXRlSWQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5yZW1vdGVfY2FuZGlkYXRl X2lkKTsKKyAgICBpZiAocnRjU3RhdHMuc3RhdGUuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0 cy5zdGF0ZSA9IGljZUNhbmRpZGF0ZVBhaXJTdGF0ZSgqcnRjU3RhdHMuc3RhdGUpOworCisgICAg aWYgKHJ0Y1N0YXRzLnByaW9yaXR5LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucHJpb3Jp dHkgPSAqcnRjU3RhdHMucHJpb3JpdHk7CisgICAgaWYgKHJ0Y1N0YXRzLm5vbWluYXRlZC5pc19k ZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLm5vbWluYXRlZCA9ICpydGNTdGF0cy5ub21pbmF0ZWQ7 CisgICAgaWYgKHJ0Y1N0YXRzLndyaXRhYmxlLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMu d3JpdGFibGUgPSAqcnRjU3RhdHMud3JpdGFibGU7CisgICAgaWYgKHJ0Y1N0YXRzLnJlYWRhYmxl LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucmVhZGFibGUgPSAqcnRjU3RhdHMucmVhZGFi bGU7CisKKyAgICBpZiAocnRjU3RhdHMuYnl0ZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAg IHN0YXRzLmJ5dGVzU2VudCA9ICpydGNTdGF0cy5ieXRlc19zZW50OworICAgIGlmIChydGNTdGF0 cy5ieXRlc19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmJ5dGVzUmVjZWl2 ZWQgPSAqcnRjU3RhdHMuYnl0ZXNfcmVjZWl2ZWQ7CisgICAgaWYgKHJ0Y1N0YXRzLnRvdGFsX3Jv dW5kX3RyaXBfdGltZS5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnRvdGFsUm91bmRUcmlw VGltZSA9ICpydGNTdGF0cy50b3RhbF9yb3VuZF90cmlwX3RpbWU7CisgICAgaWYgKHJ0Y1N0YXRz LmN1cnJlbnRfcm91bmRfdHJpcF90aW1lLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY3Vy cmVudFJvdW5kVHJpcFRpbWUgPSAqcnRjU3RhdHMuY3VycmVudF9yb3VuZF90cmlwX3RpbWU7Cisg ICAgaWYgKHJ0Y1N0YXRzLmF2YWlsYWJsZV9vdXRnb2luZ19iaXRyYXRlLmlzX2RlZmluZWQoKSkK KyAgICAgICAgc3RhdHMuYXZhaWxhYmxlT3V0Z29pbmdCaXRyYXRlID0gKnJ0Y1N0YXRzLmF2YWls YWJsZV9vdXRnb2luZ19iaXRyYXRlOworICAgIGlmIChydGNTdGF0cy5hdmFpbGFibGVfaW5jb21p bmdfYml0cmF0ZS5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmF2YWlsYWJsZUluY29taW5n Qml0cmF0ZSA9ICpydGNTdGF0cy5hdmFpbGFibGVfaW5jb21pbmdfYml0cmF0ZTsKKworICAgIGlm IChydGNTdGF0cy5yZXF1ZXN0c19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRz LnJlcXVlc3RzUmVjZWl2ZWQgPSAqcnRjU3RhdHMucmVxdWVzdHNfcmVjZWl2ZWQ7CisgICAgaWYg KHJ0Y1N0YXRzLnJlcXVlc3RzX3NlbnQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5yZXF1 ZXN0c1NlbnQgPSAqcnRjU3RhdHMucmVxdWVzdHNfc2VudDsKKyAgICBpZiAocnRjU3RhdHMucmVz cG9uc2VzX3JlY2VpdmVkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucmVzcG9uc2VzUmVj ZWl2ZWQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3JlY2VpdmVkOworICAgIGlmIChydGNTdGF0cy5y ZXNwb25zZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnJlc3BvbnNlc1NlbnQg PSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7CisKKyAgICBpZiAocnRjU3RhdHMucmVxdWVzdHNf cmVjZWl2ZWQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5yZXRyYW5zbWlzc2lvbnNSZWNl aXZlZCA9ICpydGNTdGF0cy5yZXF1ZXN0c19yZWNlaXZlZDsKKyAgICBpZiAocnRjU3RhdHMucmVx dWVzdHNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnJldHJhbnNtaXNzaW9uc1Nl bnQgPSAqcnRjU3RhdHMucmVxdWVzdHNfc2VudDsKKyAgICBpZiAocnRjU3RhdHMucmVzcG9uc2Vz X3JlY2VpdmVkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY29uc2VudFJlcXVlc3RzUmVj ZWl2ZWQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3JlY2VpdmVkOworICAgIGlmIChydGNTdGF0cy5y ZXNwb25zZXNfc2VudC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmNvbnNlbnRSZXF1ZXN0 c1NlbnQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7CisgICAgaWYgKHJ0Y1N0YXRzLnJlc3Bv bnNlc19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmNvbnNlbnRSZXNwb25z ZXNSZWNlaXZlZCA9ICpydGNTdGF0cy5yZXNwb25zZXNfcmVjZWl2ZWQ7CisgICAgaWYgKHJ0Y1N0 YXRzLnJlc3BvbnNlc19zZW50LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY29uc2VudFJl c3BvbnNlc1NlbnQgPSAqcnRjU3RhdHMucmVzcG9uc2VzX3NlbnQ7Cit9CisKK3N0YXRpYyBpbmxp bmUgdm9pZCBmaWxsUlRDQ2VydGlmaWNhdGVTdGF0cyhSVENTdGF0c1JlcG9ydDo6Q2VydGlmaWNh dGVTdGF0cyYgc3RhdHMsIGNvbnN0IHdlYnJ0Yzo6UlRDQ2VydGlmaWNhdGVTdGF0cyYgcnRjU3Rh dHMpCit7CisgICAgZmlsbFJUQ1N0YXRzKHN0YXRzLCBydGNTdGF0cyk7CisKKyAgICBpZiAocnRj U3RhdHMuZmluZ2VycHJpbnQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5maW5nZXJwcmlu dCA9IGZyb21TdGRTdHJpbmcoKnJ0Y1N0YXRzLmZpbmdlcnByaW50KTsKKyAgICBpZiAocnRjU3Rh dHMuZmluZ2VycHJpbnRfYWxnb3JpdGhtLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuZmlu Z2VycHJpbnRBbGdvcml0aG0gPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5maW5nZXJwcmludF9h bGdvcml0aG0pOworICAgIGlmIChydGNTdGF0cy5iYXNlNjRfY2VydGlmaWNhdGUuaXNfZGVmaW5l ZCgpKQorICAgICAgICBzdGF0cy5iYXNlNjRDZXJ0aWZpY2F0ZSA9IGZyb21TdGRTdHJpbmcoKnJ0 Y1N0YXRzLmJhc2U2NF9jZXJ0aWZpY2F0ZSk7CisgICAgaWYgKHJ0Y1N0YXRzLmlzc3Vlcl9jZXJ0 aWZpY2F0ZV9pZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmlzc3VlckNlcnRpZmljYXRl SWQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5pc3N1ZXJfY2VydGlmaWNhdGVfaWQpOworfQor CiB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OlN0YXRzQ29sbGVjdG9yOjpPblN0YXRzRGVs aXZlcmVkKGNvbnN0IHJ0Yzo6c2NvcGVkX3JlZnB0cjxjb25zdCB3ZWJydGM6OlJUQ1N0YXRzUmVw b3J0PiYgcnRjUmVwb3J0KQogewogICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMg PSBydGM6OnNjb3BlZF9yZWZwdHI8TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6U3RhdHNDb2xsZWN0 b3I+KHRoaXMpLCBydGNSZXBvcnRdIHsKQEAgLTQxMyw2ICs1MDMsMTQgQEAgdm9pZCBMaWJXZWJS VENNZWRpYUVuZHBvaW50OjpTdGF0c0NvbGxlY3Rvcjo6T25TdGF0c0RlbGl2ZXJlZChjb25zdCBy dGM6OnNjb3BlZF8KICAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6RGF0YUNoYW5uZWxT dGF0cyBzdGF0czsKICAgICAgICAgICAgICAgICBmaWxsUlRDRGF0YUNoYW5uZWxTdGF0cyhzdGF0 cywgc3RhdGljX2Nhc3Q8Y29uc3Qgd2VicnRjOjpSVENEYXRhQ2hhbm5lbFN0YXRzJj4ocnRjU3Rh dHMpKTsKICAgICAgICAgICAgICAgICByZXBvcnQtPmFkZFN0YXRzPElETERpY3Rpb25hcnk8UlRD U3RhdHNSZXBvcnQ6OkRhdGFDaGFubmVsU3RhdHM+PihXVEZNb3ZlKHN0YXRzKSk7CisgICAgICAg ICAgICB9IGVsc2UgaWYgKHJ0Y1N0YXRzLnR5cGUoKSA9PSB3ZWJydGM6OlJUQ0ljZUNhbmRpZGF0 ZVBhaXJTdGF0czo6a1R5cGUpIHsKKyAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6SWNl Q2FuZGlkYXRlUGFpclN0YXRzIHN0YXRzOworICAgICAgICAgICAgICAgIGZpbGxSVENJY2VDYW5k aWRhdGVQYWlyU3RhdHMoc3RhdHMsIHN0YXRpY19jYXN0PGNvbnN0IHdlYnJ0Yzo6UlRDSWNlQ2Fu ZGlkYXRlUGFpclN0YXRzJj4ocnRjU3RhdHMpKTsKKyAgICAgICAgICAgICAgICByZXBvcnQtPmFk ZFN0YXRzPElETERpY3Rpb25hcnk8UlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0 cz4+KFdURk1vdmUoc3RhdHMpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAocnRjU3RhdHMudHlw ZSgpID09IHdlYnJ0Yzo6UlRDQ2VydGlmaWNhdGVTdGF0czo6a1R5cGUpIHsKKyAgICAgICAgICAg ICAgICBSVENTdGF0c1JlcG9ydDo6Q2VydGlmaWNhdGVTdGF0cyBzdGF0czsKKyAgICAgICAgICAg ICAgICBmaWxsUlRDQ2VydGlmaWNhdGVTdGF0cyhzdGF0cywgc3RhdGljX2Nhc3Q8Y29uc3Qgd2Vi cnRjOjpSVENDZXJ0aWZpY2F0ZVN0YXRzJj4ocnRjU3RhdHMpKTsKKyAgICAgICAgICAgICAgICBy ZXBvcnQtPmFkZFN0YXRzPElETERpY3Rpb25hcnk8UlRDU3RhdHNSZXBvcnQ6OkNlcnRpZmljYXRl U3RhdHM+PihXVEZNb3ZlKHN0YXRzKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9 KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAwNGFhMjgyOWU4ZGY0MGI5ZGJmNWFkNWI0NzJiMGI0ZDUxOTliMTY3Li5mNGY3 ZDNhODQwYjA1YmZmNmY3MjlmYjc2MDZlMTRmNjJjMTBmYmM3IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQg QEAKIDIwMTctMDUtMzAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciBDZXJ0aWZpY2F0ZSBhbmQgSWNlQ2FuZGlkYXRlUGFpciBzdGF0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyNzM0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgKiB3ZWJydGMv dmlkZW8tc3RhdHMuaHRtbDoKKworMjAxNy0wNS0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKICAgICAgICAgUmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlIHNob3VsZCBu b3Qgcm90YXRlIG11dGVkIGZyYW1lcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTcyNjU5CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1zdGF0cy5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwKaW5k ZXggNmU5ZDlhOTQ4NTZhYzQ3YjNiZTliYWZlNGRlZGFlYmI1NDc4ZTM5NS4uMzM0MGJmMTczNjg0 MjY3NjY1MGNkNzhlN2FiYTIzM2NjMzkzMTYwZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2Vi cnRjL3ZpZGVvLXN0YXRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRz Lmh0bWwKQEAgLTksNiArOSwxNyBAQAogICAgIDxib2R5PgogICAgICAgICA8c2NyaXB0IHNyYyA9 InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KK2Z1bmN0aW9uIGdldFN0 YXRzVHlwZShjb25uZWN0aW9uKQoreworICAgIHJldHVybiBjb25uZWN0aW9uLmdldFN0YXRzKCku dGhlbigocmVwb3J0KSA9PiB7CisgICAgICAgIHZhciByZXBvcnRUeXBlcyA9IFtdOworICAgICAg ICByZXBvcnQuZm9yRWFjaCgoc3RhdEl0ZW0pID0+IHsKKyAgICAgICAgICAgIGlmIChyZXBvcnRU eXBlcy5pbmRleE9mKHN0YXRJdGVtLnR5cGUpID09PSAtMSkKKyAgICAgICAgICAgICAgICByZXBv cnRUeXBlcy5wdXNoKHN0YXRJdGVtLnR5cGUpOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJu IHJlcG9ydFR5cGVzLnNvcnQoKTsKKyAgICB9KTsKK30KIAogZnVuY3Rpb24gY2hlY2tTdGF0c1Jl cG9ydEl0ZXJhdG9yKHJlcG9ydCkKIHsKQEAgLTExNCw2ICsxMjUsMTQgQEAgcHJvbWlzZV90ZXN0 KCh0ZXN0KSA9PiB7CiAgICAgICAgIHJldHVybiBjaGVja0luYm91bmRGcmFtZXNOdW1iZXJJbmNy ZWFzZWQoc2Vjb25kQ29ubmVjdGlvbiwgc3RhdHNTZWNvbmRDb25uZWN0aW9uLCAwKTsKICAgICB9 KS50aGVuKCgpID0+IHsKICAgICAgICAgcmV0dXJuIGNoZWNrT3V0Ym91bmRGcmFtZXNOdW1iZXJJ bmNyZWFzZWQoZmlyc3RDb25uZWN0aW9uLCBzdGF0c0ZpcnN0Q29ubmVjdGlvbiwgMCk7CisgICAg fSkudGhlbigoKSA9PiB7CisgICAgICAgIHJldHVybiBnZXRTdGF0c1R5cGUoZmlyc3RDb25uZWN0 aW9uKTsKKyAgICB9KS50aGVuKCh0eXBlcykgPT4geworICAgICAgICBhc3NlcnRfYXJyYXlfZXF1 YWxzKHR5cGVzLCBbImNhbmRpZGF0ZS1wYWlyIiwgImNlcnRpZmljYXRlIiwgIm91dGJvdW5kLXJ0 cCJdKTsKKyAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgcmV0dXJuIGdldFN0YXRzVHlwZShz ZWNvbmRDb25uZWN0aW9uKTsKKyAgICB9KS50aGVuKCh0eXBlcykgPT4geworICAgICAgICBhc3Nl cnRfYXJyYXlfZXF1YWxzKHR5cGVzLCBbImNhbmRpZGF0ZS1wYWlyIiwgImNlcnRpZmljYXRlIiwg ImluYm91bmQtcnRwIiwgInRyYWNrIl0pOwogICAgIH0pOwogfSwgIkJhc2ljIHZpZGVvIHN0YXRz Iik7CiAgICAgICAgIDwvc2NyaXB0Pgo=