220939 2021-01-25 11:49:14 -0800 Rename MediaElementSession::playbackPermitted() to MediaElementSession::playbackStateChangePermitted() 2021-03-30 12:15:05 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=220887 InRadar P2 Normal --- 1 peng.liu6 peng.liu6 calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1722177 0 peng.liu6 2021-01-25 11:49:14 -0800 MediaElementSession::playbackPermitted() is used in many places to check whether a playback state change is allowed or not. We had better add a parameter to indicate the state change request. Otherwise, it may return false when it is expected to return true. 1724345 1 webkit-bug-importer 2021-02-01 11:51:33 -0800 <rdar://problem/73839280> 1744982 2 424602 peng.liu6 2021-03-29 17:01:52 -0700 Created attachment 424602 Patch 1745103 3 424602 eric.carlson 2021-03-30 07:04:11 -0700 Comment on attachment 424602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424602&action=review > Source/WebCore/html/MediaElementSession.cpp:286 > ALWAYS_LOG(LOGIDENTIFIER, "Returning FALSE because element is suspended"); Now that we always pass the new state, it would be nice to include that in the logging so we know what state change was allowed/denied. 1745156 4 424602 peng.liu6 2021-03-30 09:42:01 -0700 Comment on attachment 424602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424602&action=review >> Source/WebCore/html/MediaElementSession.cpp:286 >> ALWAYS_LOG(LOGIDENTIFIER, "Returning FALSE because element is suspended"); > > Now that we always pass the new state, it would be nice to include that in the logging so we know what state change was allowed/denied. Good idea! Will add that. 1745175 5 424656 peng.liu6 2021-03-30 10:24:19 -0700 Created attachment 424656 Patch for landing 1745232 6 ews-feeder 2021-03-30 12:15:02 -0700 Committed r275225: <https://commits.webkit.org/r275225> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424656. 424602 2021-03-29 17:01:52 -0700 2021-03-30 05:30:39 -0700 Patch bug-220939-20210329170151.patch text/plain 11534 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmJlOTY0ODEwMGUyMDI3 YTIyZDk3YWMzMzhmZjZjODUwYzQwNGM0Ni4uZTA3NGIyNzlmYjAzMzdlMTY5NmE0NDAwZTIxMDYy M2NhZjk1MjFmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAzLTI5ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIE1lZGlhRWxlbWVu dFNlc3Npb246OnBsYXliYWNrUGVybWl0dGVkKCkgdG8gTWVkaWFFbGVtZW50U2Vzc2lvbjo6cGxh eWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBIGZvbGxvdy11cCBwYXRjaCBvZiByMjcxODcwIHRvIHJlbmFt ZSBmdW5jdGlvbiBgcGxheWJhY2tQZXJtaXR0ZWQoKWAgYW5kCisgICAgICAgIHRoZSBlbnVtIGNs YXNzIGBNZWRpYVBsYXliYWNrT3BlcmF0aW9uYC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMg dGhlcmUgaXMgbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sc0hvc3Q6OnVzZXJHZXN0dXJlUmVxdWlyZWQgY29uc3QpOgorICAgICAgICAq IGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFF bGVtZW50OjpjYW5UcmFuc2l0aW9uRnJvbUF1dG9wbGF5VG9QbGF5IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGxheSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50OjpwYXVzZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpw YXVzZUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFZv bHVtZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckRp ZEFkZEF1ZGlvVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVk aWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6dXBkYXRlU2hvdWxkUGxheSk6CisKKyAgICAgICAgKiBodG1sL01lZGlhRWxl bWVudFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vzc2lvbjo6 cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhRWxlbWVudFNlc3Npb246OnVwZGF0ZU1lZGlhVXNhZ2VJZkNoYW5n ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vzc2lvbjo6cGxheWJhY2tQZXJt aXR0ZWQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lv bi5oOgorCiAyMDIxLTAzLTI4ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW1vdmUgSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIuaC9KU0N1c3RvbVhQYXRoTlNSZXNv bHZlci5jcHAgZnJvbSB0aGUgWGNvZGUgcHJvamVjdCBhcyB0aGV5IGRvbid0IGV4aXN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9s c0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29u dHJvbHNIb3N0LmNwcAppbmRleCA3NWRmMzY0MzgxMmM3MzIwYzE4MDk0MzhjNWUyOTgzYzAyNWFi MjhjLi45OTcwNWFjMzAzMGE5YjU3NmMwMTNjMmZhYThmNzUwMjBlNmFkZTc1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRy b2xzSG9zdC5jcHAKQEAgLTI2NSw3ICsyNjUsNyBAQCBib29sIE1lZGlhQ29udHJvbHNIb3N0Ojpp c0luTWVkaWFEb2N1bWVudCgpIGNvbnN0CiAKIGJvb2wgTWVkaWFDb250cm9sc0hvc3Q6OnVzZXJH ZXN0dXJlUmVxdWlyZWQoKSBjb25zdAogewotICAgIHJldHVybiBtX21lZGlhRWxlbWVudCAmJiAh bV9tZWRpYUVsZW1lbnQtPm1lZGlhU2Vzc2lvbigpLnBsYXliYWNrUGVybWl0dGVkKCk7CisgICAg cmV0dXJuIG1fbWVkaWFFbGVtZW50ICYmICFtX21lZGlhRWxlbWVudC0+bWVkaWFTZXNzaW9uKCku cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcp OwogfQogCiBib29sIE1lZGlhQ29udHJvbHNIb3N0OjpzaG91bGRGb3JjZUNvbnRyb2xzRGlzcGxh eSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBj YmM1OTkwMDdmODdiZmI5OGRjYzQ1MTc0ZWQ0ODQ0NWJmMzkzM2ViLi5hMTY0ZDQ3NzU0NWZmZDJl ODg1YTEyNTZmZmFjZGQ0NjNkNzg0OTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKQEAgLTIzMDAsNyArMjMwMCw3IEBAIFN1Y2Nlc3NPcjxNZWRpYVBsYXliYWNr RGVuaWFsUmVhc29uPiBIVE1MTWVkaWFFbGVtZW50OjpjYW5UcmFuc2l0aW9uRnJvbUF1dG9wbGF5 CiAgICAgICAgIHJldHVybiBNZWRpYVBsYXliYWNrRGVuaWFsUmVhc29uOjpQYWdlQ29uc2VudFJl cXVpcmVkOwogICAgIH0KIAotICAgIGF1dG8gcGVybWl0dGVkID0gbWVkaWFTZXNzaW9uKCkucGxh eWJhY2tQZXJtaXR0ZWQoKTsKKyAgICBhdXRvIHBlcm1pdHRlZCA9IG1lZGlhU2Vzc2lvbigpLnBs YXliYWNrU3RhdGVDaGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5aW5nKTsK ICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBpZiAoIXBlcm1pdHRlZCkKICAgICAgICAg QUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCBwZXJtaXR0ZWQudmFsdWUoKSk7CkBAIC0yNDM0LDcg KzI0MzQsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUoTWVkaWFQbGF5 ZXI6OlJlYWR5U3RhdGUgc3RhdGUpCiAKICAgICAvLyBJZiB3ZSB0cmFuc2l0aW9uIHRvIHRoZSBG dXR1cmUgRGF0YSBzdGF0ZSBhbmQgd2UncmUgYWJvdXQgdG8gYmVnaW4gcGxheWluZywgZW5zdXJl IHBsYXliYWNrIGlzIGFjdHVhbGx5IHBlcm1pdHRlZCBmaXJzdCwKICAgICAvLyBob25vcmluZyBh bnkgcGxheWJhY2sgZGVuaWFsIHJlYXNvbnMgc3VjaCBhcyB0aGUgcmVxdWlyZW1lbnQgb2YgYSB1 c2VyIGdlc3R1cmUuCi0gICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBIQVZFX0ZVVFVSRV9EQVRBICYm IG9sZFN0YXRlIDwgSEFWRV9GVVRVUkVfREFUQSAmJiBwb3RlbnRpYWxseVBsYXlpbmcoKSAmJiAh bV9tZWRpYVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKCkpIHsKKyAgICBpZiAobV9yZWFkeVN0 YXRlID09IEhBVkVfRlVUVVJFX0RBVEEgJiYgb2xkU3RhdGUgPCBIQVZFX0ZVVFVSRV9EQVRBICYm IHBvdGVudGlhbGx5UGxheWluZygpICYmICFtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tTdGF0ZUNo YW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpKSB7CiAgICAgICAgIGF1 dG8gY2FuVHJhbnNpdGlvbiA9IGNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXlUb1BsYXkoKTsKICAg ICAgICAgaWYgKGNhblRyYW5zaXRpb24gJiYgY2FuVHJhbnNpdGlvbi52YWx1ZSgpID09IE1lZGlh UGxheWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJlUmVxdWlyZWQpCiAgICAgICAgICAgICBB TFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJBdXRvcGxheSBibG9ja2VkLCB1c2VyIGdlc3R1cmUg cmVxdWlyZWQiKTsKQEAgLTM0MjMsNyArMzQyMyw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 cGxheShET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcm9taXNlKQogewogICAgIEFMV0FZU19M T0coTE9HSURFTlRJRklFUik7CiAKLSAgICBhdXRvIHN1Y2Nlc3MgPSBtX21lZGlhU2Vzc2lvbi0+ cGxheWJhY2tQZXJtaXR0ZWQoKTsKKyAgICBhdXRvIHN1Y2Nlc3MgPSBtX21lZGlhU2Vzc2lvbi0+ cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcp OwogICAgIGlmICghc3VjY2VzcykgewogICAgICAgICBpZiAoc3VjY2Vzcy52YWx1ZSgpID09IE1l ZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJlUmVxdWlyZWQpCiAgICAgICAgICAg ICBzZXRBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZShBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0 ZTo6UHJldmVudGVkQXV0b3BsYXkpOwpAQCAtMzQ0OSw3ICszNDQ5LDcgQEAgdm9pZCBIVE1MTWVk aWFFbGVtZW50OjpwbGF5KCkKIHsKICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOwogCi0g ICAgYXV0byBzdWNjZXNzID0gbV9tZWRpYVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKCk7Cisg ICAgYXV0byBzdWNjZXNzID0gbV9tZWRpYVNlc3Npb24tPnBsYXliYWNrU3RhdGVDaGFuZ2VQZXJt aXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5aW5nKTsKICAgICBpZiAoIXN1Y2Nlc3MpIHsK ICAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICJwbGF5YmFjayBub3QgcGVybWl0dGVk OiAiLCBzdWNjZXNzLnZhbHVlKCkpOwogICAgICAgICBpZiAoc3VjY2Vzcy52YWx1ZSgpID09IE1l ZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJlUmVxdWlyZWQpCkBAIC0zNTMwLDcg KzM1MzAsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnBhdXNlKCkKICAgICBpZiAobV93YWl0 aW5nVG9FbnRlckZ1bGxzY3JlZW4pCiAgICAgICAgIG1fd2FpdGluZ1RvRW50ZXJGdWxsc2NyZWVu ID0gZmFsc2U7CiAKLSAgICBpZiAoIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFja1Blcm1pdHRlZChN ZWRpYVBsYXliYWNrT3BlcmF0aW9uOjpQYXVzZSkpCisgICAgaWYgKCFtX21lZGlhU2Vzc2lvbi0+ cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBhdXNlZCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChwcm9jZXNzaW5nVXNlckdlc3R1cmVGb3JNZWRp YSgpKQpAQCAtMzU2Miw3ICszNTYyLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwYXVzZUlu dGVybmFsKCkKICAgICBpZiAoIW1fcGxheWVyIHx8IG1fbmV0d29ya1N0YXRlID09IE5FVFdPUktf RU1QVFkpIHsKICAgICAgICAgLy8gVW5sZXNzIHRoZSByZXN0cmljdGlvbiBvbiBtZWRpYSByZXF1 aXJpbmcgdXNlciBhY3Rpb24gaGFzIGJlZW4gbGlmdGVkCiAgICAgICAgIC8vIGRvbid0IHRyaWdn ZXIgbG9hZGluZyBpZiBhIHNjcmlwdCBjYWxscyBwYXVzZSgpLgotICAgICAgICBpZiAoIW1fbWVk aWFTZXNzaW9uLT5wbGF5YmFja1Blcm1pdHRlZCgpKQorICAgICAgICBpZiAoIW1fbWVkaWFTZXNz aW9uLT5wbGF5YmFja1N0YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxh eWluZykpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHNlbGVjdE1lZGlhUmVzb3VyY2Uo KTsKICAgICB9CkBAIC0zNjUxLDcgKzM2NTEsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBIVE1MTWVk aWFFbGVtZW50OjpzZXRWb2x1bWUoZG91YmxlIHZvbHVtZSkKICAgICB1cGRhdGVWb2x1bWUoKTsK ICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS52b2x1bWVjaGFuZ2VFdmVudCk7CiAKLSAg ICBpZiAoaXNQbGF5aW5nKCkgJiYgIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFja1Blcm1pdHRlZCgp KSB7CisgICAgaWYgKGlzUGxheWluZygpICYmICFtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tTdGF0 ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpKSB7CiAgICAgICAg IHNjaGVkdWxlUmVqZWN0UGVuZGluZ1BsYXlQcm9taXNlcyhET01FeGNlcHRpb246OmNyZWF0ZShO b3RBbGxvd2VkRXJyb3IpKTsKICAgICAgICAgcGF1c2VJbnRlcm5hbCgpOwogICAgICAgICBzZXRB dXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZShBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZTo6UHJl dmVudGVkQXV0b3BsYXkpOwpAQCAtMzkxOSw3ICszOTE5LDcgQEAgZG91YmxlIEhUTUxNZWRpYUVs ZW1lbnQ6OnBlcmNlbnRMb2FkZWQoKSBjb25zdAogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1l ZGlhUGxheWVyRGlkQWRkQXVkaW9UcmFjayhBdWRpb1RyYWNrUHJpdmF0ZSYgdHJhY2spCiB7Ci0g ICAgaWYgKGlzUGxheWluZygpICYmICFtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tQZXJtaXR0ZWQo KSkgeworICAgIGlmIChpc1BsYXlpbmcoKSAmJiAhbV9tZWRpYVNlc3Npb24tPnBsYXliYWNrU3Rh dGVDaGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5aW5nKSkgewogICAgICAg ICBzY2hlZHVsZVJlamVjdFBlbmRpbmdQbGF5UHJvbWlzZXMoRE9NRXhjZXB0aW9uOjpjcmVhdGUo Tm90QWxsb3dlZEVycm9yKSk7CiAgICAgICAgIHBhdXNlSW50ZXJuYWwoKTsKICAgICAgICAgc2V0 QXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGU6OlBy ZXZlbnRlZEF1dG9wbGF5KTsKQEAgLTUwOTIsNyArNTA5Miw3IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKQogCiAgICAgdXBkYXRlUmVu ZGVyZXIoKTsKIAotICAgIGlmICghcGF1c2VkKCkgJiYgIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFj a1Blcm1pdHRlZCgpKSB7CisgICAgaWYgKCFwYXVzZWQoKSAmJiAhbV9tZWRpYVNlc3Npb24tPnBs YXliYWNrU3RhdGVDaGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5aW5nKSkg ewogICAgICAgICBzY2hlZHVsZVJlamVjdFBlbmRpbmdQbGF5UHJvbWlzZXMoRE9NRXhjZXB0aW9u OjpjcmVhdGUoTm90QWxsb3dlZEVycm9yKSk7CiAgICAgICAgIHBhdXNlSW50ZXJuYWwoKTsKICAg ICAgICAgc2V0QXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlFdmVudFBsYXliYWNr U3RhdGU6OlByZXZlbnRlZEF1dG9wbGF5KTsKQEAgLTc4NjEsNyArNzg2MSw3IEBAIHZvaWQgSFRN TE1lZGlhRWxlbWVudDo6dXBkYXRlU2hvdWxkQXV0b3BsYXkoKQogCiB2b2lkIEhUTUxNZWRpYUVs ZW1lbnQ6OnVwZGF0ZVNob3VsZFBsYXkoKQogewotICAgIGlmICghcGF1c2VkKCkgJiYgIW1fbWVk aWFTZXNzaW9uLT5wbGF5YmFja1Blcm1pdHRlZCgpKSB7CisgICAgaWYgKCFwYXVzZWQoKSAmJiAh bV9tZWRpYVNlc3Npb24tPnBsYXliYWNrU3RhdGVDaGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFj a1N0YXRlOjpQbGF5aW5nKSkgewogICAgICAgICBzY2hlZHVsZVJlamVjdFBlbmRpbmdQbGF5UHJv bWlzZXMoRE9NRXhjZXB0aW9uOjpjcmVhdGUoTm90QWxsb3dlZEVycm9yKSk7CiAgICAgICAgIHBh dXNlSW50ZXJuYWwoKTsKICAgICAgICAgc2V0QXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUoQXV0 b3BsYXlFdmVudFBsYXliYWNrU3RhdGU6OlByZXZlbnRlZEF1dG9wbGF5KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCmluZGV4IDJhNDE2MTFlNWI1NzIwZGJi ZjMyZGYzMzdmMmE3Y2EzNmM5OTBiNDQuLmZiMGM5ZjBmNDMzMjgzYzI2NjdjNmIwZGE4MTViYzM4 ODQ5N2E0YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vz c2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNw cApAQCAtMjgwLDcgKzI4MCw3IEBAIHZvaWQgTWVkaWFFbGVtZW50U2Vzc2lvbjo6cmVtb3ZlQmVo YXZpb3JSZXN0cmljdGlvbihCZWhhdmlvclJlc3RyaWN0aW9ucyByZXN0cmljCiAgICAgbV9yZXN0 cmljdGlvbnMgJj0gfnJlc3RyaWN0aW9uOwogfQogCi1TdWNjZXNzT3I8TWVkaWFQbGF5YmFja0Rl bmlhbFJlYXNvbj4gTWVkaWFFbGVtZW50U2Vzc2lvbjo6cGxheWJhY2tQZXJtaXR0ZWQoTWVkaWFQ bGF5YmFja09wZXJhdGlvbiBvcGVyYXRpb24pIGNvbnN0CitTdWNjZXNzT3I8TWVkaWFQbGF5YmFj a0RlbmlhbFJlYXNvbj4gTWVkaWFFbGVtZW50U2Vzc2lvbjo6cGxheWJhY2tTdGF0ZUNoYW5nZVBl cm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGUgc3RhdGUpIGNvbnN0CiB7CiAgICAgaWYgKG1fZWxl bWVudC5pc1N1c3BlbmRlZCgpKSB7CiAgICAgICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwg IlJldHVybmluZyBGQUxTRSBiZWNhdXNlIGVsZW1lbnQgaXMgc3VzcGVuZGVkIik7CkBAIC0zMjEs NyArMzIxLDcgQEAgU3VjY2Vzc09yPE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb24+IE1lZGlhRWxl bWVudFNlc3Npb246OnBsYXliYWNrUGVybWl0dGVkKE1lZGkKICAgICBjb25zdCBhdXRvJiB0b3BE b2N1bWVudCA9IGRvY3VtZW50LnRvcERvY3VtZW50KCk7CiAgICAgaWYgKHRvcERvY3VtZW50LnF1 aXJrcygpLnJlcXVpcmVzVXNlckdlc3R1cmVUb1BhdXNlSW5QaWN0dXJlSW5QaWN0dXJlKCkKICAg ICAgICAgJiYgbV9lbGVtZW50LmZ1bGxzY3JlZW5Nb2RlKCkgJiBIVE1MTWVkaWFFbGVtZW50RW51 bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJlSW5QaWN0dXJlCi0gICAgICAgICYmICFtX2Vs ZW1lbnQucGF1c2VkKCkgJiYgb3BlcmF0aW9uID09IE1lZGlhUGxheWJhY2tPcGVyYXRpb246OlBh dXNlCisgICAgICAgICYmICFtX2VsZW1lbnQucGF1c2VkKCkgJiYgc3RhdGUgPT0gTWVkaWFQbGF5 YmFja1N0YXRlOjpQYXVzZWQKICAgICAgICAgJiYgIWRvY3VtZW50LnByb2Nlc3NpbmdVc2VyR2Vz dHVyZUZvck1lZGlhKCkpIHsKICAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiUmV0 dXJuaW5nIEZBTFNFIGJlY2F1c2UgYSBxdWlyayByZXF1aXJlcyBhIHVzZXIgZ2VzdHVyZSB0byBw YXVzZSB3aGlsZSBpbiBQaWN0dXJlLWluLVBpY3R1cmUiKTsKICAgICAgICAgcmV0dXJuIE1lZGlh UGxheWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJlUmVxdWlyZWQ7CkBAIC01MDMsNyArNTAz LDcgQEAgYm9vbCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyKFBs YXliYWNrQ29udHJvbHNQdXJwb3NlIHB1cnBvc2UKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAotICAgIGlmICghcGxheWJhY2tQZXJtaXR0ZWQoKSkgeworICAgIGlmICghcGxheWJhY2tT dGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpKSB7CiAgICAg ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJyZXR1cm5pbmcgRkFMU0U6IHBsYXliYWNrIG5v dCBwZXJtaXR0ZWQiKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTExNTgsNyAr MTE1OCw3IEBAIHZvaWQgTWVkaWFFbGVtZW50U2Vzc2lvbjo6dXBkYXRlTWVkaWFVc2FnZUlmQ2hh bmdlZCgpCiAgICAgICAgIGlzQXVkaW8gJiYgaGFzQmVoYXZpb3JSZXN0cmljdGlvbihSZXF1aXJl VXNlckdlc3R1cmVUb0NvbnRyb2xDb250cm9sc01hbmFnZXIpICYmICFwcm9jZXNzaW5nVXNlckdl c3R1cmUsCiAgICAgICAgIG1fZWxlbWVudC5oYXNBdWRpbygpICYmIGlzUGxheWluZyAmJiBhbGxv d3NQbGF5YmFja0NvbnRyb2xzRm9yQXV0b3BsYXlpbmdBdWRpbygpLCAvLyB1c2VySGFzUGxheWVk QXVkaW9CZWZvcmUKICAgICAgICAgaXNFbGVtZW50UmVjdE1vc3RseUluTWFpbkZyYW1lKG1fZWxl bWVudCksCi0gICAgICAgICEhcGxheWJhY2tQZXJtaXR0ZWQoKSwKKyAgICAgICAgISFwbGF5YmFj a1N0YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZyksCiAgICAg ICAgIHBhZ2UtPm1lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCgpLAogICAgICAgICBkb2N1bWVudC5p c01lZGlhRG9jdW1lbnQoKSAmJiAhZG9jdW1lbnQub3duZXJFbGVtZW50KCksCiAgICAgICAgIHBh Z2VFeHBsaWNpdGx5QWxsb3dzRWxlbWVudFRvQXV0b3BsYXlJbmxpbmUobV9lbGVtZW50KSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5oIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmgKaW5kZXggYzczMTliMTk3NDZj ZDQ3MzZjZDk3ODYwNjAzMTc5MTQzOWM3ZGMyOC4uYjUyODJjZTE0NjhiZjBmMzU3NjZhNzc1MjU1 Y2ZiMGQxMTkwODliMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1l bnRTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9u LmgKQEAgLTQzLDkgKzQzLDkgQEAgZW51bSBjbGFzcyBNZWRpYVNlc3Npb25NYWluQ29udGVudFB1 cnBvc2UgewogICAgIEF1dG9wbGF5CiB9OwogCi1lbnVtIGNsYXNzIE1lZGlhUGxheWJhY2tPcGVy YXRpb24gewotICAgIEFsbCwKLSAgICBQYXVzZQorZW51bSBjbGFzcyBNZWRpYVBsYXliYWNrU3Rh dGUgeworICAgIFBsYXlpbmcsCisgICAgUGF1c2VkCiB9OwogCiBlbnVtIGNsYXNzIE1lZGlhUGxh eWJhY2tEZW5pYWxSZWFzb24gewpAQCAtNzcsOCArNzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBp c1Zpc2libGVJblZpZXdwb3J0Q2hhbmdlZCgpOwogICAgIHZvaWQgaW5BY3RpdmVEb2N1bWVudENo YW5nZWQoKTsKIAotICAgIC8vIEZJWE1FOiA8aHR0cDovL3dlYmtpdC5vcmcvYi8yMjA5Mzk+Ci0g ICAgU3VjY2Vzc09yPE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb24+IHBsYXliYWNrUGVybWl0dGVk KE1lZGlhUGxheWJhY2tPcGVyYXRpb24gPSBNZWRpYVBsYXliYWNrT3BlcmF0aW9uOjpBbGwpIGNv bnN0OworICAgIFN1Y2Nlc3NPcjxNZWRpYVBsYXliYWNrRGVuaWFsUmVhc29uPiBwbGF5YmFja1N0 YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZSkgY29uc3Q7CiAgICAgYm9vbCBh dXRvcGxheVBlcm1pdHRlZCgpIGNvbnN0OwogICAgIGJvb2wgZGF0YUxvYWRpbmdQZXJtaXR0ZWQo KSBjb25zdDsKICAgICBNZWRpYVBsYXllcjo6QnVmZmVyaW5nUG9saWN5IHByZWZlcnJlZEJ1ZmZl cmluZ1BvbGljeSgpIGNvbnN0Owo= 424656 2021-03-30 10:24:19 -0700 2021-03-30 12:15:04 -0700 Patch for landing bug-220939-20210330102418.patch text/plain 11641 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmJlOTY0ODEwMGUyMDI3 YTIyZDk3YWMzMzhmZjZjODUwYzQwNGM0Ni4uZjhkYzU4OGEzNWJkMjBhZTdlNTQ4NjdlOTM0N2Yw Njc4ODQ4ODk3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAzLTMwICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIE1lZGlhRWxlbWVu dFNlc3Npb246OnBsYXliYWNrUGVybWl0dGVkKCkgdG8gTWVkaWFFbGVtZW50U2Vzc2lvbjo6cGxh eWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5MzkKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4g RmFibGV0LgorCisgICAgICAgIEEgZm9sbG93LXVwIHBhdGNoIG9mIHIyNzE4NzAgdG8gcmVuYW1l IGZ1bmN0aW9uIGBwbGF5YmFja1Blcm1pdHRlZCgpYCBhbmQKKyAgICAgICAgdGhlIGVudW0gY2xh c3MgYE1lZGlhUGxheWJhY2tPcGVyYXRpb25gLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0 aGVyZSBpcyBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIE1vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUNvbnRyb2xzSG9zdDo6dXNlckdlc3R1cmVSZXF1aXJlZCBjb25zdCk6CisgICAgICAgICog aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OmNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXlUb1BsYXkgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwbGF5KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBh dXNlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0Vm9s dW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyRGlk QWRkQXVkaW9UcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRp YVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50Ojp1cGRhdGVTaG91bGRQbGF5KToKKworICAgICAgICAqIGh0bWwvTWVkaWFFbGVt ZW50U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpw bGF5YmFja1N0YXRlQ2hhbmdlUGVybWl0dGVkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vzc2lvbjo6dXBkYXRlTWVkaWFVc2FnZUlmQ2hhbmdl ZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpwbGF5YmFja1Blcm1p dHRlZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9u Lmg6CisKIDIwMjEtMDMtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbW92ZSBKU0N1c3RvbVhQYXRoTlNSZXNvbHZlci5oL0pTQ3VzdG9tWFBhdGhOU1Jlc29s dmVyLmNwcCBmcm9tIHRoZSBYY29kZSBwcm9qZWN0IGFzIHRoZXkgZG9uJ3QgZXhpc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz SG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250 cm9sc0hvc3QuY3BwCmluZGV4IDc1ZGYzNjQzODEyYzczMjBjMTgwOTQzOGM1ZTI5ODNjMDI1YWIy OGMuLjk5NzA1YWMzMDMwYTliNTc2YzAxM2MyZmFhOGY3NTAyMGU2YWRlNzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJv bHNIb3N0LmNwcApAQCAtMjY1LDcgKzI2NSw3IEBAIGJvb2wgTWVkaWFDb250cm9sc0hvc3Q6Omlz SW5NZWRpYURvY3VtZW50KCkgY29uc3QKIAogYm9vbCBNZWRpYUNvbnRyb2xzSG9zdDo6dXNlckdl c3R1cmVSZXF1aXJlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fbWVkaWFFbGVtZW50ICYmICFt X21lZGlhRWxlbWVudC0+bWVkaWFTZXNzaW9uKCkucGxheWJhY2tQZXJtaXR0ZWQoKTsKKyAgICBy ZXR1cm4gbV9tZWRpYUVsZW1lbnQgJiYgIW1fbWVkaWFFbGVtZW50LT5tZWRpYVNlc3Npb24oKS5w bGF5YmFja1N0YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZyk7 CiB9CiAKIGJvb2wgTWVkaWFDb250cm9sc0hvc3Q6OnNob3VsZEZvcmNlQ29udHJvbHNEaXNwbGF5 KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGNi YzU5OTAwN2Y4N2JmYjk4ZGNjNDUxNzRlZDQ4NDQ1YmYzOTMzZWIuLmExNjRkNDc3NTQ1ZmZkMmU4 ODVhMTI1NmZmYWNkZDQ2M2Q3ODQ5NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcApAQCAtMjMwMCw3ICsyMzAwLDcgQEAgU3VjY2Vzc09yPE1lZGlhUGxheWJhY2tE ZW5pYWxSZWFzb24+IEhUTUxNZWRpYUVsZW1lbnQ6OmNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXkK ICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlBhZ2VDb25zZW50UmVx dWlyZWQ7CiAgICAgfQogCi0gICAgYXV0byBwZXJtaXR0ZWQgPSBtZWRpYVNlc3Npb24oKS5wbGF5 YmFja1Blcm1pdHRlZCgpOworICAgIGF1dG8gcGVybWl0dGVkID0gbWVkaWFTZXNzaW9uKCkucGxh eWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpOwog I2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIGlmICghcGVybWl0dGVkKQogICAgICAgICBB TFdBWVNfTE9HKExPR0lERU5USUZJRVIsIHBlcm1pdHRlZC52YWx1ZSgpKTsKQEAgLTI0MzQsNyAr MjQzNCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZShNZWRpYVBsYXll cjo6UmVhZHlTdGF0ZSBzdGF0ZSkKIAogICAgIC8vIElmIHdlIHRyYW5zaXRpb24gdG8gdGhlIEZ1 dHVyZSBEYXRhIHN0YXRlIGFuZCB3ZSdyZSBhYm91dCB0byBiZWdpbiBwbGF5aW5nLCBlbnN1cmUg cGxheWJhY2sgaXMgYWN0dWFsbHkgcGVybWl0dGVkIGZpcnN0LAogICAgIC8vIGhvbm9yaW5nIGFu eSBwbGF5YmFjayBkZW5pYWwgcmVhc29ucyBzdWNoIGFzIHRoZSByZXF1aXJlbWVudCBvZiBhIHVz ZXIgZ2VzdHVyZS4KLSAgICBpZiAobV9yZWFkeVN0YXRlID09IEhBVkVfRlVUVVJFX0RBVEEgJiYg b2xkU3RhdGUgPCBIQVZFX0ZVVFVSRV9EQVRBICYmIHBvdGVudGlhbGx5UGxheWluZygpICYmICFt X21lZGlhU2Vzc2lvbi0+cGxheWJhY2tQZXJtaXR0ZWQoKSkgeworICAgIGlmIChtX3JlYWR5U3Rh dGUgPT0gSEFWRV9GVVRVUkVfREFUQSAmJiBvbGRTdGF0ZSA8IEhBVkVfRlVUVVJFX0RBVEEgJiYg cG90ZW50aWFsbHlQbGF5aW5nKCkgJiYgIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFja1N0YXRlQ2hh bmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZykpIHsKICAgICAgICAgYXV0 byBjYW5UcmFuc2l0aW9uID0gY2FuVHJhbnNpdGlvbkZyb21BdXRvcGxheVRvUGxheSgpOwogICAg ICAgICBpZiAoY2FuVHJhbnNpdGlvbiAmJiBjYW5UcmFuc2l0aW9uLnZhbHVlKCkgPT0gTWVkaWFQ bGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVSZXF1aXJlZCkKICAgICAgICAgICAgIEFM V0FZU19MT0coTE9HSURFTlRJRklFUiwgIkF1dG9wbGF5IGJsb2NrZWQsIHVzZXIgZ2VzdHVyZSBy ZXF1aXJlZCIpOwpAQCAtMzQyMyw3ICszNDIzLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpw bGF5KERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmIHByb21pc2UpCiB7CiAgICAgQUxXQVlTX0xP RyhMT0dJREVOVElGSUVSKTsKIAotICAgIGF1dG8gc3VjY2VzcyA9IG1fbWVkaWFTZXNzaW9uLT5w bGF5YmFja1Blcm1pdHRlZCgpOworICAgIGF1dG8gc3VjY2VzcyA9IG1fbWVkaWFTZXNzaW9uLT5w bGF5YmFja1N0YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZyk7 CiAgICAgaWYgKCFzdWNjZXNzKSB7CiAgICAgICAgIGlmIChzdWNjZXNzLnZhbHVlKCkgPT0gTWVk aWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVSZXF1aXJlZCkKICAgICAgICAgICAg IHNldEF1dG9wbGF5RXZlbnRQbGF5YmFja1N0YXRlKEF1dG9wbGF5RXZlbnRQbGF5YmFja1N0YXRl OjpQcmV2ZW50ZWRBdXRvcGxheSk7CkBAIC0zNDQ5LDcgKzM0NDksNyBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnBsYXkoKQogewogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CiAKLSAg ICBhdXRvIHN1Y2Nlc3MgPSBtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tQZXJtaXR0ZWQoKTsKKyAg ICBhdXRvIHN1Y2Nlc3MgPSBtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1p dHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpOwogICAgIGlmICghc3VjY2Vzcykgewog ICAgICAgICBFUlJPUl9MT0coTE9HSURFTlRJRklFUiwgInBsYXliYWNrIG5vdCBwZXJtaXR0ZWQ6 ICIsIHN1Y2Nlc3MudmFsdWUoKSk7CiAgICAgICAgIGlmIChzdWNjZXNzLnZhbHVlKCkgPT0gTWVk aWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVSZXF1aXJlZCkKQEAgLTM1MzAsNyAr MzUzMCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGF1c2UoKQogICAgIGlmIChtX3dhaXRp bmdUb0VudGVyRnVsbHNjcmVlbikKICAgICAgICAgbV93YWl0aW5nVG9FbnRlckZ1bGxzY3JlZW4g PSBmYWxzZTsKIAotICAgIGlmICghbV9tZWRpYVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKE1l ZGlhUGxheWJhY2tPcGVyYXRpb246OlBhdXNlKSkKKyAgICBpZiAoIW1fbWVkaWFTZXNzaW9uLT5w bGF5YmFja1N0YXRlQ2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGF1c2VkKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHByb2Nlc3NpbmdVc2VyR2VzdHVyZUZvck1lZGlh KCkpCkBAIC0zNTYyLDcgKzM1NjIsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnBhdXNlSW50 ZXJuYWwoKQogICAgIGlmICghbV9wbGF5ZXIgfHwgbV9uZXR3b3JrU3RhdGUgPT0gTkVUV09SS19F TVBUWSkgewogICAgICAgICAvLyBVbmxlc3MgdGhlIHJlc3RyaWN0aW9uIG9uIG1lZGlhIHJlcXVp cmluZyB1c2VyIGFjdGlvbiBoYXMgYmVlbiBsaWZ0ZWQKICAgICAgICAgLy8gZG9uJ3QgdHJpZ2dl ciBsb2FkaW5nIGlmIGEgc2NyaXB0IGNhbGxzIHBhdXNlKCkuCi0gICAgICAgIGlmICghbV9tZWRp YVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKCkpCisgICAgICAgIGlmICghbV9tZWRpYVNlc3Np b24tPnBsYXliYWNrU3RhdGVDaGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5 aW5nKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgc2VsZWN0TWVkaWFSZXNvdXJjZSgp OwogICAgIH0KQEAgLTM2NTEsNyArMzY1MSw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEhUTUxNZWRp YUVsZW1lbnQ6OnNldFZvbHVtZShkb3VibGUgdm9sdW1lKQogICAgIHVwZGF0ZVZvbHVtZSgpOwog ICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnZvbHVtZWNoYW5nZUV2ZW50KTsKIAotICAg IGlmIChpc1BsYXlpbmcoKSAmJiAhbV9tZWRpYVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKCkp IHsKKyAgICBpZiAoaXNQbGF5aW5nKCkgJiYgIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFja1N0YXRl Q2hhbmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZykpIHsKICAgICAgICAg c2NoZWR1bGVSZWplY3RQZW5kaW5nUGxheVByb21pc2VzKERPTUV4Y2VwdGlvbjo6Y3JlYXRlKE5v dEFsbG93ZWRFcnJvcikpOwogICAgICAgICBwYXVzZUludGVybmFsKCk7CiAgICAgICAgIHNldEF1 dG9wbGF5RXZlbnRQbGF5YmFja1N0YXRlKEF1dG9wbGF5RXZlbnRQbGF5YmFja1N0YXRlOjpQcmV2 ZW50ZWRBdXRvcGxheSk7CkBAIC0zOTE5LDcgKzM5MTksNyBAQCBkb3VibGUgSFRNTE1lZGlhRWxl bWVudDo6cGVyY2VudExvYWRlZCgpIGNvbnN0CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVk aWFQbGF5ZXJEaWRBZGRBdWRpb1RyYWNrKEF1ZGlvVHJhY2tQcml2YXRlJiB0cmFjaykKIHsKLSAg ICBpZiAoaXNQbGF5aW5nKCkgJiYgIW1fbWVkaWFTZXNzaW9uLT5wbGF5YmFja1Blcm1pdHRlZCgp KSB7CisgICAgaWYgKGlzUGxheWluZygpICYmICFtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tTdGF0 ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpKSB7CiAgICAgICAg IHNjaGVkdWxlUmVqZWN0UGVuZGluZ1BsYXlQcm9taXNlcyhET01FeGNlcHRpb246OmNyZWF0ZShO b3RBbGxvd2VkRXJyb3IpKTsKICAgICAgICAgcGF1c2VJbnRlcm5hbCgpOwogICAgICAgICBzZXRB dXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZShBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZTo6UHJl dmVudGVkQXV0b3BsYXkpOwpAQCAtNTA5Miw3ICs1MDkyLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjptZWRpYVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZCgpCiAKICAgICB1cGRhdGVSZW5k ZXJlcigpOwogCi0gICAgaWYgKCFwYXVzZWQoKSAmJiAhbV9tZWRpYVNlc3Npb24tPnBsYXliYWNr UGVybWl0dGVkKCkpIHsKKyAgICBpZiAoIXBhdXNlZCgpICYmICFtX21lZGlhU2Vzc2lvbi0+cGxh eWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNrU3RhdGU6OlBsYXlpbmcpKSB7 CiAgICAgICAgIHNjaGVkdWxlUmVqZWN0UGVuZGluZ1BsYXlQcm9taXNlcyhET01FeGNlcHRpb246 OmNyZWF0ZShOb3RBbGxvd2VkRXJyb3IpKTsKICAgICAgICAgcGF1c2VJbnRlcm5hbCgpOwogICAg ICAgICBzZXRBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZShBdXRvcGxheUV2ZW50UGxheWJhY2tT dGF0ZTo6UHJldmVudGVkQXV0b3BsYXkpOwpAQCAtNzg2MSw3ICs3ODYxLDcgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVTaG91bGRBdXRvcGxheSgpCiAKIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6dXBkYXRlU2hvdWxkUGxheSgpCiB7Ci0gICAgaWYgKCFwYXVzZWQoKSAmJiAhbV9tZWRp YVNlc3Npb24tPnBsYXliYWNrUGVybWl0dGVkKCkpIHsKKyAgICBpZiAoIXBhdXNlZCgpICYmICFt X21lZGlhU2Vzc2lvbi0+cGxheWJhY2tTdGF0ZUNoYW5nZVBlcm1pdHRlZChNZWRpYVBsYXliYWNr U3RhdGU6OlBsYXlpbmcpKSB7CiAgICAgICAgIHNjaGVkdWxlUmVqZWN0UGVuZGluZ1BsYXlQcm9t aXNlcyhET01FeGNlcHRpb246OmNyZWF0ZShOb3RBbGxvd2VkRXJyb3IpKTsKICAgICAgICAgcGF1 c2VJbnRlcm5hbCgpOwogICAgICAgICBzZXRBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZShBdXRv cGxheUV2ZW50UGxheWJhY2tTdGF0ZTo6UHJldmVudGVkQXV0b3BsYXkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKaW5kZXggMmE0MTYxMWU1YjU3MjBkYmJm MzJkZjMzN2YyYTdjYTM2Yzk5MGI0NC4uNmM5NWM2YWJmOGE4YzEzMmZiYjI1NzEzMWRkZmRhODQy N2U3MzYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNz aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3Bw CkBAIC0yODAsOCArMjgwLDkgQEAgdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpyZW1vdmVCZWhh dmlvclJlc3RyaWN0aW9uKEJlaGF2aW9yUmVzdHJpY3Rpb25zIHJlc3RyaWMKICAgICBtX3Jlc3Ry aWN0aW9ucyAmPSB+cmVzdHJpY3Rpb247CiB9CiAKLVN1Y2Nlc3NPcjxNZWRpYVBsYXliYWNrRGVu aWFsUmVhc29uPiBNZWRpYUVsZW1lbnRTZXNzaW9uOjpwbGF5YmFja1Blcm1pdHRlZChNZWRpYVBs YXliYWNrT3BlcmF0aW9uIG9wZXJhdGlvbikgY29uc3QKK1N1Y2Nlc3NPcjxNZWRpYVBsYXliYWNr RGVuaWFsUmVhc29uPiBNZWRpYUVsZW1lbnRTZXNzaW9uOjpwbGF5YmFja1N0YXRlQ2hhbmdlUGVy bWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZSBzdGF0ZSkgY29uc3QKIHsKKyAgICBBTFdBWVNfTE9H KExPR0lERU5USUZJRVIsICJzdGF0ZSA9ICIsIHN0YXRlKTsKICAgICBpZiAobV9lbGVtZW50Lmlz U3VzcGVuZGVkKCkpIHsKICAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiUmV0dXJu aW5nIEZBTFNFIGJlY2F1c2UgZWxlbWVudCBpcyBzdXNwZW5kZWQiKTsKICAgICAgICAgcmV0dXJu IE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OkludmFsaWRTdGF0ZTsKQEAgLTMyMSw3ICszMjIs NyBAQCBTdWNjZXNzT3I8TWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbj4gTWVkaWFFbGVtZW50U2Vz c2lvbjo6cGxheWJhY2tQZXJtaXR0ZWQoTWVkaQogICAgIGNvbnN0IGF1dG8mIHRvcERvY3VtZW50 ID0gZG9jdW1lbnQudG9wRG9jdW1lbnQoKTsKICAgICBpZiAodG9wRG9jdW1lbnQucXVpcmtzKCku cmVxdWlyZXNVc2VyR2VzdHVyZVRvUGF1c2VJblBpY3R1cmVJblBpY3R1cmUoKQogICAgICAgICAm JiBtX2VsZW1lbnQuZnVsbHNjcmVlbk1vZGUoKSAmIEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6Vmlk ZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUKLSAgICAgICAgJiYgIW1fZWxlbWVudC5w YXVzZWQoKSAmJiBvcGVyYXRpb24gPT0gTWVkaWFQbGF5YmFja09wZXJhdGlvbjo6UGF1c2UKKyAg ICAgICAgJiYgIW1fZWxlbWVudC5wYXVzZWQoKSAmJiBzdGF0ZSA9PSBNZWRpYVBsYXliYWNrU3Rh dGU6OlBhdXNlZAogICAgICAgICAmJiAhZG9jdW1lbnQucHJvY2Vzc2luZ1VzZXJHZXN0dXJlRm9y TWVkaWEoKSkgewogICAgICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJSZXR1cm5pbmcg RkFMU0UgYmVjYXVzZSBhIHF1aXJrIHJlcXVpcmVzIGEgdXNlciBnZXN0dXJlIHRvIHBhdXNlIHdo aWxlIGluIFBpY3R1cmUtaW4tUGljdHVyZSIpOwogICAgICAgICByZXR1cm4gTWVkaWFQbGF5YmFj a0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVSZXF1aXJlZDsKQEAgLTUwMyw3ICs1MDQsNyBAQCBi b29sIE1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIoUGxheWJhY2tD b250cm9sc1B1cnBvc2UgcHVycG9zZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0g ICAgaWYgKCFwbGF5YmFja1Blcm1pdHRlZCgpKSB7CisgICAgaWYgKCFwbGF5YmFja1N0YXRlQ2hh bmdlUGVybWl0dGVkKE1lZGlhUGxheWJhY2tTdGF0ZTo6UGxheWluZykpIHsKICAgICAgICAgSU5G T19MT0coTE9HSURFTlRJRklFUiwgInJldHVybmluZyBGQUxTRTogcGxheWJhY2sgbm90IHBlcm1p dHRlZCIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMTE1OCw3ICsxMTU5LDcg QEAgdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjp1cGRhdGVNZWRpYVVzYWdlSWZDaGFuZ2VkKCkK ICAgICAgICAgaXNBdWRpbyAmJiBoYXNCZWhhdmlvclJlc3RyaWN0aW9uKFJlcXVpcmVVc2VyR2Vz dHVyZVRvQ29udHJvbENvbnRyb2xzTWFuYWdlcikgJiYgIXByb2Nlc3NpbmdVc2VyR2VzdHVyZSwK ICAgICAgICAgbV9lbGVtZW50Lmhhc0F1ZGlvKCkgJiYgaXNQbGF5aW5nICYmIGFsbG93c1BsYXli YWNrQ29udHJvbHNGb3JBdXRvcGxheWluZ0F1ZGlvKCksIC8vIHVzZXJIYXNQbGF5ZWRBdWRpb0Jl Zm9yZQogICAgICAgICBpc0VsZW1lbnRSZWN0TW9zdGx5SW5NYWluRnJhbWUobV9lbGVtZW50KSwK LSAgICAgICAgISFwbGF5YmFja1Blcm1pdHRlZCgpLAorICAgICAgICAhIXBsYXliYWNrU3RhdGVD aGFuZ2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlOjpQbGF5aW5nKSwKICAgICAgICAgcGFn ZS0+bWVkaWFQbGF5YmFja0lzU3VzcGVuZGVkKCksCiAgICAgICAgIGRvY3VtZW50LmlzTWVkaWFE b2N1bWVudCgpICYmICFkb2N1bWVudC5vd25lckVsZW1lbnQoKSwKICAgICAgICAgcGFnZUV4cGxp Y2l0bHlBbGxvd3NFbGVtZW50VG9BdXRvcGxheUlubGluZShtX2VsZW1lbnQpLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uaAppbmRleCBjNzMxOWIxOTc0NmNkNDczNmNk OTc4NjA2MDMxNzkxNDM5YzdkYzI4Li5iNTI4MmNlMTQ2OGJmMGYzNTc2NmE3NzUyNTVjZmIwZDEx OTA4OWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Np b24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uaApAQCAt NDMsOSArNDMsOSBAQCBlbnVtIGNsYXNzIE1lZGlhU2Vzc2lvbk1haW5Db250ZW50UHVycG9zZSB7 CiAgICAgQXV0b3BsYXkKIH07CiAKLWVudW0gY2xhc3MgTWVkaWFQbGF5YmFja09wZXJhdGlvbiB7 Ci0gICAgQWxsLAotICAgIFBhdXNlCitlbnVtIGNsYXNzIE1lZGlhUGxheWJhY2tTdGF0ZSB7Cisg ICAgUGxheWluZywKKyAgICBQYXVzZWQKIH07CiAKIGVudW0gY2xhc3MgTWVkaWFQbGF5YmFja0Rl bmlhbFJlYXNvbiB7CkBAIC03Nyw4ICs3Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGlzVmlzaWJs ZUluVmlld3BvcnRDaGFuZ2VkKCk7CiAgICAgdm9pZCBpbkFjdGl2ZURvY3VtZW50Q2hhbmdlZCgp OwogCi0gICAgLy8gRklYTUU6IDxodHRwOi8vd2Via2l0Lm9yZy9iLzIyMDkzOT4KLSAgICBTdWNj ZXNzT3I8TWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbj4gcGxheWJhY2tQZXJtaXR0ZWQoTWVkaWFQ bGF5YmFja09wZXJhdGlvbiA9IE1lZGlhUGxheWJhY2tPcGVyYXRpb246OkFsbCkgY29uc3Q7Cisg ICAgU3VjY2Vzc09yPE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb24+IHBsYXliYWNrU3RhdGVDaGFu Z2VQZXJtaXR0ZWQoTWVkaWFQbGF5YmFja1N0YXRlKSBjb25zdDsKICAgICBib29sIGF1dG9wbGF5 UGVybWl0dGVkKCkgY29uc3Q7CiAgICAgYm9vbCBkYXRhTG9hZGluZ1Blcm1pdHRlZCgpIGNvbnN0 OwogICAgIE1lZGlhUGxheWVyOjpCdWZmZXJpbmdQb2xpY3kgcHJlZmVycmVkQnVmZmVyaW5nUG9s aWN5KCkgY29uc3Q7Cg==