210008 2020-04-04 10:46:04 -0700 Add even more logging to try and diagnose <webkit.org/b/209685> 2020-04-04 11:52:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin megan_gardner ryanhaddad thorton webkit-bug-importer oldest_to_newest 1637709 0 wenson_hsieh 2020-04-04 10:46:04 -0700 SSIA 1637713 1 395459 wenson_hsieh 2020-04-04 11:13:46 -0700 Created attachment 395459 Patch 1637717 2 395459 thorton 2020-04-04 11:47:24 -0700 Comment on attachment 395459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395459&action=review > Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:859 > + NSLog(@"%s - %@", __PRETTY_FUNCTION__, lists); NSLog? 1637718 3 395459 wenson_hsieh 2020-04-04 11:50:17 -0700 Comment on attachment 395459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395459&action=review >> Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:859 >> + NSLog(@"%s - %@", __PRETTY_FUNCTION__, lists); > > NSLog? Yes (this is so that it shows up in the run-api-tests’ output when the test fails). My plan is to continue adding these (and removing old ones along the way) until I have a speculative fix, after which I can just remove all of them. 1637719 4 ews-feeder 2020-04-04 11:52:21 -0700 Committed r259534: <https://trac.webkit.org/changeset/259534> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395459. 395459 2020-04-04 11:13:46 -0700 2020-04-04 11:52:21 -0700 Patch bug-210008-20200404111345.patch text/plain 23037 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM0OGFkOGE2MDdjY2Y4 NmIyZGQwZmQ1YTNhYTFiNGY1NGNhMTBiYS4uYWEyNTljZmY1MWRkZjIxMGU5OWJjNDIwYjU1ZWRj MzM5ODljN2Q4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA0LTA0ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBldmVuIG1v cmUgbG9nZ2luZyB0byB0cnkgYW5kIGRpYWdub3NlIDx3ZWJraXQub3JnL2IvMjA5Njg1PgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMDA4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9p b3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbToKKyAgICAgICAgKC1bV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZCBzdGFnZVJlZ2lzdHJhdGlvbkxpc3RzOl0pOgorCiAyMDIwLTA0LTAzICBE YXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4OiBI VE1MRm9ybUVsZW1lbnQgc2hvdWxkIHVzZSBXZWFrUHRyIHRvIGtlZXAgdHJhY2sgb2YgaXRzIEZv cm1OYW1lZEl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggM2Q4OTVmM2MzMGIyN2QwMTc2NjI1MWEwNmFkZjhlYWUz YjVlNmQwMy4uYmVkNTFkNjIxNGYxYjgyMzkzMTZkNGE5ODIwOWNiYTgxZjVmZTE1NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwzNCBAQAorMjAyMC0wNC0wNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZXZlbiBtb3JlIGxvZ2dpbmcgdG8gdHJ5IGFu ZCBkaWFnbm9zZSA8d2Via2l0Lm9yZy9iLzIwOTY4NT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDAwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmVydCBhbGwgKGV4Y2VwdCBvbmUpIG9mIHRoZSBs b2dnaW5nIHN0YXRlbWVudHMgYWRkZWQgaW4gcjI1OTUxOCwgYW5kIGFkZCBzZXZlcmFsIG5ldyBv bmVzLiBUaGlzIGxhc3QgbG9nZ2luZworICAgICAgICBwYXNzIGRlbW9uc3RyYXRlZCB0aGF0IERy YWdDb250cm9sbGVyIGhhZCBmYWlsZWQgdG8gc3RhcnQgYSBkcmFnLCBzaW5jZSAtW1dLQ29udGVu dFZpZXcgX2RpZEhhbmRsZURyYWdTdGFydFJlcXVlc3Q6XQorICAgICAgICByZWNlaXZlcyB3b3Jk IHRoYXQgdGhlIGRyYWcgaGFzIHN0YXJ0ZWQsIHlldCB0aGVyZSBhcmUgbm8gc3RhZ2VkIGRyYWcg aXRlbXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL0RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0 ZS5tbToKKyAgICAgICAgKFdlYktpdDo6RHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlOjpzdGFnZURy YWdJdGVtKToKKyAgICAgICAgKFdlYktpdDo6RHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlOjpjbGVh clN0YWdlZERyYWdTb3VyY2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kaWRIYW5kbGVBZGRp dGlvbmFsRHJhZ0l0ZW1zUmVxdWVzdDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVh blVwRHJhZ1NvdXJjZVNlc3Npb25TdGF0ZV0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9k aWRQZXJmb3JtRHJhZ09wZXJhdGlvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcHJl cGFyZVRvRHJhZ1Byb21pc2VkQXR0YWNobWVudDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfZHJhZ0ludGVyYWN0aW9uOnByZXBhcmVGb3JTZXNzaW9uOmNvbXBsZXRpb246XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgZHJhZ0ludGVyYWN0aW9uOml0ZW1zRm9yQmVnaW5uaW5nU2Vz c2lvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246d2lsbEFu aW1hdGVMaWZ0V2l0aEFuaW1hdG9yOnNlc3Npb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgZHJhZ0ludGVyYWN0aW9uOnNlc3Npb25XaWxsQmVnaW46XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgZHJhZ0ludGVyYWN0aW9uOnNlc3Npb246ZGlkRW5kV2l0aE9wZXJhdGlvbjpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246aXRlbTp3aWxsQW5pbWF0 ZUNhbmNlbFdpdGhBbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkcm9wSW50 ZXJhY3Rpb246Y2FuSGFuZGxlU2Vzc2lvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBk cm9wSW50ZXJhY3Rpb246c2Vzc2lvbkRpZEVudGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IGRyb3BJbnRlcmFjdGlvbjpzZXNzaW9uRGlkRXhpdDpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBkcm9wSW50ZXJhY3Rpb246cGVyZm9ybURyb3A6XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgZHJvcEludGVyYWN0aW9uOnNlc3Npb25EaWRFbmQ6XSk6CisKIDIwMjAtMDQtMDMg IERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJQbGF0Zm9y bVN0cmF0ZWdpZXM6OntyZWFkQnVmZmVyRnJvbVBhc3RlYm9hcmQsYnVmZmVyRm9yVHlwZX0gc2hv dWxkIHZhbGlkYXRlIHRoZWlyIGBzaXplYCBwYXJhbWV0ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KaW5kZXgg NzE5M2I2NWJlYmU0OWE1MDQwZGQ4ZDgxMThlYmEwZmVmNWIyYTg2YS4uNTRjNTg2Y2YxNzUyNTAz NGZiNjAxN2Q3OTkyYTZjYTk1NTA2YTNmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KQEAgLTg1Niw2ICs4 NTYsNyBAQCAtICh2b2lkKWVudW1lcmF0ZUl0ZW1Qcm92aWRlcnNXaXRoQmxvY2s6KHZvaWQgKF4p KF9fa2luZG9mIE5TSXRlbVByb3ZpZGVyICppdGVtUAogLSAodm9pZClzdGFnZVJlZ2lzdHJhdGlv bkxpc3RzOihOU0FycmF5PFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbkluZm9MaXN0ICo+ICop bGlzdHMKIHsKICAgICBBU1NFUlQobGlzdHMuY291bnQpOworICAgIE5TTG9nKEAiJXMgLSAlQCIs IF9fUFJFVFRZX0ZVTkNUSU9OX18sIGxpc3RzKTsKICAgICBfc3RhZ2VkUmVnaXN0cmF0aW9uSW5m b0xpc3RzID0gbGlzdHM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9EcmFnRHJvcEludGVyYWN0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvRHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLm1tCmluZGV4IDU4OGU4M2M5NTJhYzkxZjMx OWVkZTFkMGNmODUzN2ZlZmM3MTA3NjYuLmFkMGM5NTZiNmY3NTIyNjc3OWZmZDE0OTMyOTI2YjEw MjE1MGVkMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9EcmFnRHJv cEludGVyYWN0aW9uU3RhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL0Ry YWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5tbQpAQCAtMzM5LDYgKzMzOSw3IEBAIHZvaWQgRHJhZ0Ry b3BJbnRlcmFjdGlvblN0YXRlOjpkcm9wU2Vzc2lvbkRpZEVudGVyT3JVcGRhdGUoaWQgPFVJRHJv cFNlc3Npb24+IHNlCiAKIHZvaWQgRHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlOjpzdGFnZURyYWdJ dGVtKGNvbnN0IERyYWdJdGVtJiBpdGVtLCBVSUltYWdlICpkcmFnSW1hZ2UpCiB7CisgICAgTlNM b2coQCIlcyAtIHNvdXJjZSBhY3Rpb24gOj0gJTAyeCIsIF9fUFJFVFRZX0ZVTkNUSU9OX18sIGl0 ZW0uc291cmNlQWN0aW9uKTsKICAgICBzdGF0aWMgTlNJbnRlZ2VyIGN1cnJlbnREcmFnU291cmNl SXRlbUlkZW50aWZpZXIgPSAwOwogCiAgICAgbV9hZGp1c3RlZFBvc2l0aW9uRm9yRHJhZ0VuZCA9 IGl0ZW0uZXZlbnRQb3NpdGlvbkluQ29udGVudENvb3JkaW5hdGVzOwpAQCAtMzYzLDYgKzM2NCw5 IEBAIGJvb2wgRHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlOjpoYXNTdGFnZWREcmFnU291cmNlKCkg Y29uc3QKIAogdm9pZCBEcmFnRHJvcEludGVyYWN0aW9uU3RhdGU6OmNsZWFyU3RhZ2VkRHJhZ1Nv dXJjZShEaWRCZWNvbWVBY3RpdmUgZGlkQmVjb21lQWN0aXZlKQogeworICAgIGlmIChtX3N0YWdl ZERyYWdTb3VyY2UpCisgICAgICAgIE5TTG9nKEAiJXMgLSBzb3VyY2UgYWN0aW9uIDo9ICUwMngi LCBfX1BSRVRUWV9GVU5DVElPTl9fLCBtX3N0YWdlZERyYWdTb3VyY2UtPmFjdGlvbik7CisKICAg ICBpZiAoZGlkQmVjb21lQWN0aXZlID09IERpZEJlY29tZUFjdGl2ZTo6WWVzKQogICAgICAgICBt X2FjdGl2ZURyYWdTb3VyY2VzLmFwcGVuZChzdGFnZWREcmFnU291cmNlKCkpOwogICAgIG1fc3Rh Z2VkRHJhZ1NvdXJjZSA9IFdURjo6bnVsbG9wdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDE4ZjRmNmQ5 MjEwZmFhNjU5MjQ4NTBkZmNmNDc0OWViZDUxYmNkZGQuLmRmYThlMTY2Yzc0NWJhN2ExYmM0YzQw ZjMzYTcyNWQ1N2RmMGQ5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNzA2NSw3ICs3MDY1LDcgQEAg LSAodm9pZClfZGlkSGFuZGxlQWRkaXRpb25hbERyYWdJdGVtc1JlcXVlc3Q6KEJPT0wpYWRkZWQK ICAgICBhdXRvIHN0YWdlZERyYWdTb3VyY2UgPSBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLnN0 YWdlZERyYWdTb3VyY2UoKTsKICAgICBOU0FycmF5ICpkcmFnSXRlbXNUb0FkZCA9IFtzZWxmIF9p dGVtc0ZvckJlZ2lubmluZ09yQWRkaW5nVG9TZXNzaW9uV2l0aFJlZ2lzdHJhdGlvbkxpc3RzOnJl Z2lzdHJhdGlvbkxpc3RzIHN0YWdlZERyYWdTb3VyY2U6c3RhZ2VkRHJhZ1NvdXJjZV07CiAKLSAg ICBOU0xvZyhAIkRyYWcgc2Vzc2lvbjogJXAgYWRkaW5nICV0dSBpdGVtcyIsIF9kcmFnRHJvcElu dGVyYWN0aW9uU3RhdGUuZHJhZ1Nlc3Npb24oKSwgZHJhZ0l0ZW1zVG9BZGQuY291bnQpOworICAg IFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uOiAlcCBhZGRpbmcgJXR1IGl0 ZW1zIiwgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5kcmFnU2Vzc2lvbigpLCBkcmFnSXRlbXNU b0FkZC5jb3VudCk7CiAgICAgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5jbGVhclN0YWdlZERy YWdTb3VyY2UoZHJhZ0l0ZW1zVG9BZGQuY291bnQgPyBXZWJLaXQ6OkRyYWdEcm9wSW50ZXJhY3Rp b25TdGF0ZTo6RGlkQmVjb21lQWN0aXZlOjpZZXMgOiBXZWJLaXQ6OkRyYWdEcm9wSW50ZXJhY3Rp b25TdGF0ZTo6RGlkQmVjb21lQWN0aXZlOjpObyk7CiAKICAgICBjb21wbGV0aW9uKGRyYWdJdGVt c1RvQWRkKTsKQEAgLTcxMzQsNyArNzEzNCw3IEBAIC0gKHZvaWQpY2xlYW5VcERyYWdTb3VyY2VT ZXNzaW9uU3RhdGUKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKF9kcmFnRHJvcEludGVyYWN0 aW9uU3RhdGUuZHJhZ1Nlc3Npb24oKSB8fCBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLmlzUGVy Zm9ybWluZ0Ryb3AoKSkKLSAgICAgICAgTlNMb2coQCJDbGVhbmluZyB1cCBkcmFnZ2luZyBzdGF0 ZSAoaGFzIHBlbmRpbmcgb3BlcmF0aW9uOiAlZCkiLCBbW1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9h cmQgc2hhcmVkSW5zdGFuY2VdIGhhc1BlbmRpbmdPcGVyYXRpb25dKTsKKyAgICAgICAgUkVMRUFT RV9MT0coRHJhZ0FuZERyb3AsICJDbGVhbmluZyB1cCBkcmFnZ2luZyBzdGF0ZSAoaGFzIHBlbmRp bmcgb3BlcmF0aW9uOiAlZCkiLCBbW1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgc2hhcmVkSW5z dGFuY2VdIGhhc1BlbmRpbmdPcGVyYXRpb25dKTsKIAogICAgIGlmICghW1tXZWJJdGVtUHJvdmlk ZXJQYXN0ZWJvYXJkIHNoYXJlZEluc3RhbmNlXSBoYXNQZW5kaW5nT3BlcmF0aW9uXSkgewogICAg ICAgICAvLyBJZiB3ZSdyZSBwZXJmb3JtaW5nIGEgZHJhZyBvcGVyYXRpb24sIGRvbid0IGNsZWFy IG91dCB0aGUgcGFzdGVib2FyZCB5ZXQsIHNpbmNlIGFub3RoZXIgd2ViIHZpZXcgbWF5IHN0aWxs IHJlcXVpcmUgYWNjZXNzIHRvIGl0LgpAQCAtNzIxOCw3ICs3MjE4LDcgQEAgLSAodm9pZClfZGVs aXZlckRlbGF5ZWREcm9wUHJldmlld0lmUG9zc2libGU6KE9wdGlvbmFsPFdlYkNvcmU6OlRleHRJ bmRpY2F0b3JEYXQKIAogLSAodm9pZClfZGlkUGVyZm9ybURyYWdPcGVyYXRpb246KEJPT0wpaGFu ZGxlZAogewotICAgIE5TTG9nKEAiRmluaXNoZWQgcGVyZm9ybWluZyBkcmFnIGNvbnRyb2xsZXIg b3BlcmF0aW9uIChoYW5kbGVkOiAlZCkiLCBoYW5kbGVkKTsKKyAgICBSRUxFQVNFX0xPRyhEcmFn QW5kRHJvcCwgIkZpbmlzaGVkIHBlcmZvcm1pbmcgZHJhZyBjb250cm9sbGVyIG9wZXJhdGlvbiAo aGFuZGxlZDogJWQpIiwgaGFuZGxlZCk7CiAgICAgW1tXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJk IHNoYXJlZEluc3RhbmNlXSBkZWNyZW1lbnRQZW5kaW5nT3BlcmF0aW9uQ291bnRdOwogICAgIGlk IDxVSURyb3BTZXNzaW9uPiBkcm9wU2Vzc2lvbiA9IF9kcmFnRHJvcEludGVyYWN0aW9uU3RhdGUu ZHJvcFNlc3Npb24oKTsKICAgICBpZiAoW3NlbGYud2ViVmlld1VJRGVsZWdhdGUgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkYXRhSW50ZXJhY3Rpb25PcGVyYXRpb25XYXNI YW5kbGVkOmZvclNlc3Npb246aXRlbVByb3ZpZGVyczopXSkKQEAgLTcyNjQsNyArNzI2NCw3IEBA IC0gKHZvaWQpX3ByZXBhcmVUb0RyYWdQcm9taXNlZEF0dGFjaG1lbnQ6KGNvbnN0IFdlYkNvcmU6 OlByb21pc2VkQXR0YWNobWVudEluZm8mCiAgICAgYXV0byBudW1iZXJPZkFkZGl0aW9uYWxUeXBl cyA9IGluZm8uYWRkaXRpb25hbFR5cGVzLnNpemUoKTsKICAgICBBU1NFUlQobnVtYmVyT2ZBZGRp dGlvbmFsVHlwZXMgPT0gaW5mby5hZGRpdGlvbmFsRGF0YS5zaXplKCkpOwogCi0gICAgTlNMb2co QCJEcmFnIHNlc3Npb246ICVwIHByZXBhcmluZyB0byBkcmFnIGJsb2I6ICVzIHdpdGggYXR0YWNo bWVudCBpZGVudGlmaWVyOiAlcyIsIHNlc3Npb24uZ2V0KCksIGluZm8uYmxvYlVSTC5zdHJpbmco KS51dGY4KCkuZGF0YSgpLCBpbmZvLmF0dGFjaG1lbnRJZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCkp OworICAgIFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uOiAlcCBwcmVwYXJp bmcgdG8gZHJhZyBibG9iOiAlcyB3aXRoIGF0dGFjaG1lbnQgaWRlbnRpZmllcjogJXMiLCBzZXNz aW9uLmdldCgpLCBpbmZvLmJsb2JVUkwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgaW5mby5hdHRh Y2htZW50SWRlbnRpZmllci51dGY4KCkuZGF0YSgpKTsKIAogICAgIE5TU3RyaW5nICp1dGlUeXBl ID0gaW5mby5jb250ZW50VHlwZTsKICAgICBOU1N0cmluZyAqZmlsZU5hbWUgPSBpbmZvLmZpbGVO YW1lOwpAQCAtNzI5Niw3ICs3Mjk2LDcgQEAgLSAodm9pZClfcHJlcGFyZVRvRHJhZ1Byb21pc2Vk QXR0YWNobWVudDooY29uc3QgV2ViQ29yZTo6UHJvbWlzZWRBdHRhY2htZW50SW5mbyYKIAogICAg ICAgICBhdXRvIGF0dGFjaG1lbnQgPSBzdHJvbmdTZWxmLT5fcGFnZS0+YXR0YWNobWVudEZvcklk ZW50aWZpZXIoaW5mby5hdHRhY2htZW50SWRlbnRpZmllcik7CiAgICAgICAgIGlmIChhdHRhY2ht ZW50ICYmIGF0dGFjaG1lbnQtPmZpbGVXcmFwcGVyKCkpIHsKLSAgICAgICAgICAgIE5TTG9nKEAi RHJhZyBzZXNzaW9uOiAlcCBkZWxpdmVyaW5nIHByb21pc2VkIGF0dGFjaG1lbnQ6ICVzIGF0IHBh dGg6ICVAIiwgc2Vzc2lvbi5nZXQoKSwgaW5mby5hdHRhY2htZW50SWRlbnRpZmllci51dGY4KCku ZGF0YSgpLCBkZXN0aW5hdGlvblVSTC5wYXRoKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKERy YWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uOiAlcCBkZWxpdmVyaW5nIHByb21pc2VkIGF0dGFjaG1l bnQ6ICVzIGF0IHBhdGg6ICVAIiwgc2Vzc2lvbi5nZXQoKSwgaW5mby5hdHRhY2htZW50SWRlbnRp Zmllci51dGY4KCkuZGF0YSgpLCBkZXN0aW5hdGlvblVSTC5wYXRoKTsKICAgICAgICAgICAgIE5T RXJyb3IgKmZpbGVXcmFwcGVyRXJyb3IgPSBuaWw7CiAgICAgICAgICAgICBpZiAoW2F0dGFjaG1l bnQtPmZpbGVXcmFwcGVyKCkgd3JpdGVUb1VSTDpkZXN0aW5hdGlvblVSTCBvcHRpb25zOjAgb3Jp Z2luYWxDb250ZW50c1VSTDpuaWwgZXJyb3I6JmZpbGVXcmFwcGVyRXJyb3JdKQogICAgICAgICAg ICAgICAgIGNhbGxiYWNrKGRlc3RpbmF0aW9uVVJMLCBuaWwpOwpAQCAtNzYxOSwxMCArNzYxOSwx MCBAQCAtICh2b2lkKV9kcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJh Y3Rpb24gcHJlcGFyZUZvclNlc3Npb246KGlkCiB7CiAgICAgW3NlbGYgX2NhbmNlbExvbmdQcmVz c0dlc3R1cmVSZWNvZ25pemVyXTsKIAotICAgIE5TTG9nKEAiUHJlcGFyaW5nIGZvciBkcmFnIHNl c3Npb246ICVwIiwgc2Vzc2lvbik7CisgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJQcmVw YXJpbmcgZm9yIGRyYWcgc2Vzc2lvbjogJXAiLCBzZXNzaW9uKTsKICAgICBpZiAoc2VsZi5jdXJy ZW50RHJhZ09yRHJvcFNlc3Npb24pIHsKICAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgbXVsdGlw bGUgc2ltdWx0YW5lb3VzIGRyYWcgc2Vzc2lvbnMgaW4gdGhlIGZ1dHVyZS4KLSAgICAgICAgTlNM b2coQCJEcmFnIHNlc3Npb24gZmFpbGVkOiAlcCAoYSBjdXJyZW50IGRyYWcgc2Vzc2lvbiBhbHJl YWR5IGV4aXN0cykiLCBzZXNzaW9uKTsKKyAgICAgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3As ICJEcmFnIHNlc3Npb24gZmFpbGVkOiAlcCAoYSBjdXJyZW50IGRyYWcgc2Vzc2lvbiBhbHJlYWR5 IGV4aXN0cykiLCBzZXNzaW9uKTsKICAgICAgICAgY29tcGxldGlvbigpOwogICAgICAgICByZXR1 cm47CiAgICAgfQpAQCAtNzYzNCwyMCArNzYzNCwyMCBAQCAtICh2b2lkKV9kcmFnSW50ZXJhY3Rp b246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gcHJlcGFyZUZvclNlc3Npb246KGlk CiAgICAgYXV0byBkcmFnT3JpZ2luID0gV2ViQ29yZTo6cm91bmRlZEludFBvaW50KFtzZXNzaW9u IGxvY2F0aW9uSW5WaWV3OnNlbGZdKTsKICAgICBfcGFnZS0+cmVxdWVzdERyYWdTdGFydChkcmFn T3JpZ2luLCBXZWJDb3JlOjpyb3VuZGVkSW50UG9pbnQoW3NlbGYgY29udmVydFBvaW50OmRyYWdP cmlnaW4gdG9WaWV3OnNlbGYud2luZG93XSksIHNlbGYuX2FsbG93ZWREcmFnU291cmNlQWN0aW9u cyk7CiAKLSAgICBOU0xvZyhAIkRyYWcgc2Vzc2lvbiByZXF1ZXN0ZWQ6ICVwIGF0IG9yaWdpbjog eyVkLCAlZH0iLCBzZXNzaW9uLCBkcmFnT3JpZ2luLngoKSwgZHJhZ09yaWdpbi55KCkpOworICAg IFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uIHJlcXVlc3RlZDogJXAgYXQg b3JpZ2luOiB7JWQsICVkfSIsIHNlc3Npb24sIGRyYWdPcmlnaW4ueCgpLCBkcmFnT3JpZ2luLnko KSk7CiB9CiAKIC0gKE5TQXJyYXk8VUlEcmFnSXRlbSAqPiAqKWRyYWdJbnRlcmFjdGlvbjooVUlE cmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBpdGVtc0ZvckJlZ2lubmluZ1Nlc3Npb246KGlk IDxVSURyYWdTZXNzaW9uPilzZXNzaW9uCiB7CiAgICAgQVNTRVJUKGludGVyYWN0aW9uID09IF9k cmFnSW50ZXJhY3Rpb24pOwotICAgIE5TTG9nKEAiRHJhZyBpdGVtcyByZXF1ZXN0ZWQgZm9yIHNl c3Npb246ICVwIiwgc2Vzc2lvbik7CisgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcmFn IGl0ZW1zIHJlcXVlc3RlZCBmb3Igc2Vzc2lvbjogJXAiLCBzZXNzaW9uKTsKICAgICBpZiAoX2Ry YWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5kcmFnU2Vzc2lvbigpICE9IHNlc3Npb24pIHsKLSAgICAg ICAgTlNMb2coQCJEcmFnIHNlc3Npb24gZmFpbGVkOiAlcCAoZGVsZWdhdGUgc2Vzc2lvbiBkb2Vz IG5vdCBtYXRjaCAlcCkiLCBzZXNzaW9uLCBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLmRyYWdT ZXNzaW9uKCkpOworICAgICAgICBSRUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyYWcgc2Vzc2lv biBmYWlsZWQ6ICVwIChkZWxlZ2F0ZSBzZXNzaW9uIGRvZXMgbm90IG1hdGNoICVwKSIsIHNlc3Np b24sIF9kcmFnRHJvcEludGVyYWN0aW9uU3RhdGUuZHJhZ1Nlc3Npb24oKSk7CiAgICAgICAgIHJl dHVybiBAWyBdOwogICAgIH0KIAogICAgIGlmICghX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5o YXNTdGFnZWREcmFnU291cmNlKCkpIHsKLSAgICAgICAgTlNMb2coQCJEcmFnIHNlc3Npb24gZmFp bGVkOiAlcCAobWlzc2luZyBzdGFnZWQgZHJhZyBzb3VyY2UpIiwgc2Vzc2lvbik7CisgICAgICAg IFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uIGZhaWxlZDogJXAgKG1pc3Np bmcgc3RhZ2VkIGRyYWcgc291cmNlKSIsIHNlc3Npb24pOwogICAgICAgICByZXR1cm4gQFsgXTsK ICAgICB9CiAKQEAgLTc2NTcsNyArNzY1Nyw3IEBAIC0gKE5TQXJyYXk8VUlEcmFnSXRlbSAqPiAq KWRyYWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBpdGVtCiAg ICAgaWYgKCFbZHJhZ0l0ZW1zIGNvdW50XSkKICAgICAgICAgX3BhZ2UtPmRyYWdDYW5jZWxsZWQo KTsKIAotICAgIE5TTG9nKEAiRHJhZyBzZXNzaW9uOiAlcCBzdGFydGluZyB3aXRoICV0dSBpdGVt cyIsIHNlc3Npb24sIFtkcmFnSXRlbXMgY291bnRdKTsKKyAgICBSRUxFQVNFX0xPRyhEcmFnQW5k RHJvcCwgIkRyYWcgc2Vzc2lvbjogJXAgc3RhcnRpbmcgd2l0aCAldHUgaXRlbXMiLCBzZXNzaW9u LCBbZHJhZ0l0ZW1zIGNvdW50XSk7CiAgICAgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5jbGVh clN0YWdlZERyYWdTb3VyY2UoW2RyYWdJdGVtcyBjb3VudF0gPyBXZWJLaXQ6OkRyYWdEcm9wSW50 ZXJhY3Rpb25TdGF0ZTo6RGlkQmVjb21lQWN0aXZlOjpZZXMgOiBXZWJLaXQ6OkRyYWdEcm9wSW50 ZXJhY3Rpb25TdGF0ZTo6RGlkQmVjb21lQWN0aXZlOjpObyk7CiAKICAgICByZXR1cm4gZHJhZ0l0 ZW1zOwpAQCAtNzY3Niw3ICs3Njc2LDcgQEAgLSAoVUlUYXJnZXRlZERyYWdQcmV2aWV3ICopZHJh Z0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXYKIAogLSAo dm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2ls bEFuaW1hdGVMaWZ0V2l0aEFuaW1hdG9yOihpZCA8VUlEcmFnQW5pbWF0aW5nPilhbmltYXRvciBz ZXNzaW9uOihpZCA8VUlEcmFnU2Vzc2lvbj4pc2Vzc2lvbgogewotICAgIE5TTG9nKEAiRHJhZyBz ZXNzaW9uIHdpbGxBbmltYXRlTGlmdFdpdGhBbmltYXRvcjogJXAiLCBzZXNzaW9uKTsKKyAgICBS RUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyYWcgc2Vzc2lvbiB3aWxsQW5pbWF0ZUxpZnRXaXRo QW5pbWF0b3I6ICVwIiwgc2Vzc2lvbik7CiAgICAgaWYgKF9kcmFnRHJvcEludGVyYWN0aW9uU3Rh dGUuYW55QWN0aXZlRHJhZ1NvdXJjZUlzKFdlYkNvcmU6OkRyYWdTb3VyY2VBY3Rpb25TZWxlY3Rp b24pKSB7CiAgICAgICAgIFtzZWxmIGNhbmNlbEFjdGl2ZVRleHRJbnRlcmFjdGlvbkdlc3R1cmVz XTsKICAgICAgICAgaWYgKCFfc2hvdWxkUmVzdG9yZUNhbGxvdXRCYXJBZnRlckRyb3ApIHsKQEAg LTc2OTMsMjEgKzc2OTMsMjEgQEAgLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVy YWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW0KICAgICAgICAgVU5V U0VEX1BBUkFNKHNlc3Npb24pOwogI2VuZGlmCiAgICAgICAgIGlmIChmaW5hbFBvc2l0aW9uID09 IFVJVmlld0FuaW1hdGluZ1Bvc2l0aW9uU3RhcnQpIHsKLSAgICAgICAgICAgIE5TTG9nKEAiRHJh ZyBzZXNzaW9uIGVuZGVkIGF0IHN0YXJ0OiAlcCIsIHNlc3Npb24pOworICAgICAgICAgICAgUkVM RUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcmFnIHNlc3Npb24gZW5kZWQgYXQgc3RhcnQ6ICVwIiwg c2Vzc2lvbik7CiAgICAgICAgICAgICAvLyBUaGUgbGlmdCB3YXMgY2FuY2VsZWQsIHNvIC1kcm9w SW50ZXJhY3Rpb246c2Vzc2lvbkRpZEVuZDogd2lsbCBuZXZlciBiZSBpbnZva2VkLiBUaGlzIGlz IHRoZSBsYXN0IGNoYW5jZSB0byBjbGVhbiB1cC4KICAgICAgICAgICAgIFtwcm90ZWN0ZWRTZWxm IGNsZWFuVXBEcmFnU291cmNlU2Vzc2lvblN0YXRlXTsKICAgICAgICAgICAgIHBhZ2UtPmRyYWdF bmRlZChwb3NpdGlvbkZvckRyYWdFbmQsIHBvc2l0aW9uRm9yRHJhZ0VuZCwgV2ViQ29yZTo6RHJh Z09wZXJhdGlvbk5vbmUpOwogICAgICAgICB9CiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgIE5TTG9nKEAiRHJhZyBzZXNzaW9uIGRpZCBub3QgZW5k IGF0IHN0YXJ0OiAlcCIsIHNlc3Npb24pOworICAgICAgICAgICAgUkVMRUFTRV9MT0coRHJhZ0Fu ZERyb3AsICJEcmFnIHNlc3Npb24gZGlkIG5vdCBlbmQgYXQgc3RhcnQ6ICVwIiwgc2Vzc2lvbik7 CiAjZW5kaWYKICAgICB9XTsKIH0KIAogLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0lu dGVyYWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbldpbGxCZWdpbjooaWQgPFVJRHJhZ1Nlc3Np b24+KXNlc3Npb24KIHsKLSAgICBOU0xvZyhAIkRyYWcgc2Vzc2lvbiBiZWdpbm5pbmc6ICVwIiwg c2Vzc2lvbik7CisgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcmFnIHNlc3Npb24gYmVn aW5uaW5nOiAlcCIsIHNlc3Npb24pOwogICAgIGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPiB1aURl bGVnYXRlID0gc2VsZi53ZWJWaWV3VUlEZWxlZ2F0ZTsKICAgICBpZiAoW3VpRGVsZWdhdGUgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkYXRhSW50ZXJhY3Rpb246c2Vzc2lv bldpbGxCZWdpbjopXSkKICAgICAgICAgW3VpRGVsZWdhdGUgX3dlYlZpZXc6c2VsZi53ZWJWaWV3 IGRhdGFJbnRlcmFjdGlvbjppbnRlcmFjdGlvbiBzZXNzaW9uV2lsbEJlZ2luOnNlc3Npb25dOwpA QCAtNzcxOSw3ICs3NzE5LDcgQEAgLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVy YWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbldpbGxCZWdpbjooaWQgPFUKIAogLSAodm9pZClk cmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbjoo aWQgPFVJRHJhZ1Nlc3Npb24+KXNlc3Npb24gZGlkRW5kV2l0aE9wZXJhdGlvbjooVUlEcm9wT3Bl cmF0aW9uKW9wZXJhdGlvbgogewotICAgIE5TTG9nKEAiRHJhZyBzZXNzaW9uIGVuZGVkOiAlcCAo d2l0aCBvcGVyYXRpb246ICV0dSwgcGVyZm9ybWluZyBvcGVyYXRpb246ICVkLCBiZWdhbiBkcmFn Z2luZzogJWQpIiwgc2Vzc2lvbiwgb3BlcmF0aW9uLCBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRl LmlzUGVyZm9ybWluZ0Ryb3AoKSwgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5kaWRCZWdpbkRy YWdnaW5nKCkpOworICAgIFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBzZXNzaW9uIGVu ZGVkOiAlcCAod2l0aCBvcGVyYXRpb246ICV0dSwgcGVyZm9ybWluZyBvcGVyYXRpb246ICVkLCBi ZWdhbiBkcmFnZ2luZzogJWQpIiwgc2Vzc2lvbiwgb3BlcmF0aW9uLCBfZHJhZ0Ryb3BJbnRlcmFj dGlvblN0YXRlLmlzUGVyZm9ybWluZ0Ryb3AoKSwgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5k aWRCZWdpbkRyYWdnaW5nKCkpOwogCiAgICAgW3NlbGYgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVk ZWRdOwogCkBAIC03NzUzLDkgKzc3NTMsOSBAQCAtIChCT09MKV9kcmFnSW50ZXJhY3Rpb246KFVJ RHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gaXRlbTooVUlEcmFnSXRlbSAqKWl0ZQogCiAt ICh2b2lkKWRyYWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBp dGVtOihVSURyYWdJdGVtICopaXRlbSB3aWxsQW5pbWF0ZUNhbmNlbFdpdGhBbmltYXRvcjooaWQg PFVJRHJhZ0FuaW1hdGluZz4pYW5pbWF0b3IKIHsKLSAgICBOU0xvZyhAIkRyYWcgaW50ZXJhY3Rp b24gd2lsbEFuaW1hdGVDYW5jZWxXaXRoQW5pbWF0b3IiKTsKKyAgICBSRUxFQVNFX0xPRyhEcmFn QW5kRHJvcCwgIkRyYWcgaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVDYW5jZWxXaXRoQW5pbWF0b3Ii KTsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbcHJvdGVjdGVkU2VsZiA9IHJldGFpblB0 cihzZWxmKSwgcGFnZSA9IF9wYWdlXSAoVUlWaWV3QW5pbWF0aW5nUG9zaXRpb24gZmluYWxQb3Np dGlvbikgewotICAgICAgICBOU0xvZyhAIkRyYWcgaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVDYW5j ZWxXaXRoQW5pbWF0b3IgKGFuaW1hdGlvbiBjb21wbGV0aW9uIGJsb2NrIGZpcmVkKSIpOworICAg ICAgICBSRUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyYWcgaW50ZXJhY3Rpb24gd2lsbEFuaW1h dGVDYW5jZWxXaXRoQW5pbWF0b3IgKGFuaW1hdGlvbiBjb21wbGV0aW9uIGJsb2NrIGZpcmVkKSIp OwogICAgICAgICBwYWdlLT5kcmFnQ2FuY2VsbGVkKCk7CiAgICAgICAgIGlmIChhdXRvIGNvbXBs ZXRpb24gPSBwcm90ZWN0ZWRTZWxmLT5fZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLnRha2VEcmFn Q2FuY2VsU2V0RG93bkJsb2NrKCkpIHsKICAgICAgICAgICAgIHBhZ2UtPmNhbGxBZnRlck5leHRQ cmVzZW50YXRpb25VcGRhdGUoW2NvbXBsZXRpb25dIChXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJy b3IpIHsKQEAgLTc3ODUsMTQgKzc3ODUsMTQgQEAgLSAoQk9PTClkcm9wSW50ZXJhY3Rpb246KFVJ RHJvcEludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY2FuSGFuZGxlU2Vzc2lvbjooaWQ8VUkKIHsK ICAgICAvLyBGSVhNRTogU3VwcG9ydCBtdWx0aXBsZSBzaW11bHRhbmVvdXMgZHJvcCBzZXNzaW9u cyBpbiB0aGUgZnV0dXJlLgogICAgIGlkIDxVSURyYWdEcm9wU2Vzc2lvbj4gZHJhZ09yRHJvcFNl c3Npb24gPSBzZWxmLmN1cnJlbnREcmFnT3JEcm9wU2Vzc2lvbjsKLSAgICBOU0xvZyhAIkNhbiBo YW5kbGUgZHJhZyBzZXNzaW9uOiAlcCB3aXRoIGxvY2FsIHNlc3Npb246ICVwIGV4aXN0aW5nIHNl c3Npb246ICVwPyIsIHNlc3Npb24sIHNlc3Npb24ubG9jYWxEcmFnU2Vzc2lvbiwgZHJhZ09yRHJv cFNlc3Npb24pOworICAgIFJFTEVBU0VfTE9HKERyYWdBbmREcm9wLCAiQ2FuIGhhbmRsZSBkcmFn IHNlc3Npb246ICVwIHdpdGggbG9jYWwgc2Vzc2lvbjogJXAgZXhpc3Rpbmcgc2Vzc2lvbjogJXA/ Iiwgc2Vzc2lvbiwgc2Vzc2lvbi5sb2NhbERyYWdTZXNzaW9uLCBkcmFnT3JEcm9wU2Vzc2lvbik7 CiAKICAgICByZXR1cm4gIWRyYWdPckRyb3BTZXNzaW9uIHx8IHNlc3Npb24ubG9jYWxEcmFnU2Vz c2lvbiA9PSBkcmFnT3JEcm9wU2Vzc2lvbjsKIH0KIAogLSAodm9pZClkcm9wSW50ZXJhY3Rpb246 KFVJRHJvcEludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbkRpZEVudGVyOihpZCA8VUlE cm9wU2Vzc2lvbj4pc2Vzc2lvbgogewotICAgIE5TTG9nKEAiRHJvcCBzZXNzaW9uIGVudGVyZWQ6 ICVwIHdpdGggJXR1IGl0ZW1zIiwgc2Vzc2lvbiwgc2Vzc2lvbi5pdGVtcy5jb3VudCk7CisgICAg UkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcm9wIHNlc3Npb24gZW50ZXJlZDogJXAgd2l0aCAl dHUgaXRlbXMiLCBzZXNzaW9uLCBzZXNzaW9uLml0ZW1zLmNvdW50KTsKICAgICBhdXRvIGRyYWdE YXRhID0gW3NlbGYgZHJhZ0RhdGFGb3JEcm9wU2Vzc2lvbjpzZXNzaW9uIGRyYWdEZXN0aW5hdGlv bkFjdGlvbjpbc2VsZiBfZHJhZ0Rlc3RpbmF0aW9uQWN0aW9uRm9yRHJvcFNlc3Npb246c2Vzc2lv bl1dOwogCiAgICAgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5kcm9wU2Vzc2lvbkRpZEVudGVy T3JVcGRhdGUoc2Vzc2lvbiwgZHJhZ0RhdGEpOwpAQCAtNzgzNCw3ICs3ODM0LDcgQEAgLSAoVUlE cm9wUHJvcG9zYWwgKilkcm9wSW50ZXJhY3Rpb246KFVJRHJvcEludGVyYWN0aW9uICopaW50ZXJh Y3Rpb24gc2Vzc2lvbkRpZFUKIAogLSAodm9pZClkcm9wSW50ZXJhY3Rpb246KFVJRHJvcEludGVy YWN0aW9uICopaW50ZXJhY3Rpb24gc2Vzc2lvbkRpZEV4aXQ6KGlkIDxVSURyb3BTZXNzaW9uPilz ZXNzaW9uCiB7Ci0gICAgTlNMb2coQCJEcm9wIHNlc3Npb24gZXhpdGVkOiAlcCB3aXRoICV0dSBp dGVtcyIsIHNlc3Npb24sIHNlc3Npb24uaXRlbXMuY291bnQpOworICAgIFJFTEVBU0VfTE9HKERy YWdBbmREcm9wLCAiRHJvcCBzZXNzaW9uIGV4aXRlZDogJXAgd2l0aCAldHUgaXRlbXMiLCBzZXNz aW9uLCBzZXNzaW9uLml0ZW1zLmNvdW50KTsKICAgICBbW1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9h cmQgc2hhcmVkSW5zdGFuY2VdIHNldEl0ZW1Qcm92aWRlcnM6ZXh0cmFjdEl0ZW1Qcm92aWRlcnNG cm9tRHJvcFNlc3Npb24oc2Vzc2lvbildOwogCiAgICAgYXV0byBkcmFnRGF0YSA9IFtzZWxmIGRy YWdEYXRhRm9yRHJvcFNlc3Npb246c2Vzc2lvbiBkcmFnRGVzdGluYXRpb25BY3Rpb246V0tEcmFn RGVzdGluYXRpb25BY3Rpb25BbnldOwpAQCAtNzg2NiwxNCArNzg2NiwxNCBAQCAtICh2b2lkKWRy b3BJbnRlcmFjdGlvbjooVUlEcm9wSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwZXJmb3JtRHJv cDooaWQgPFVJRHJvcAogICAgIGF1dG8gZHJhZ0RhdGEgPSBbc2VsZiBkcmFnRGF0YUZvckRyb3BT ZXNzaW9uOnNlc3Npb24gZHJhZ0Rlc3RpbmF0aW9uQWN0aW9uOldLRHJhZ0Rlc3RpbmF0aW9uQWN0 aW9uQW55XTsKICAgICBCT09MIHNob3VsZFNuYXBzaG90VmlldyA9ICFbc2VsZiBfaGFuZGxlRHJv cEJ5SW5zZXJ0aW5nSW1hZ2VQbGFjZWhvbGRlcnM6aXRlbVByb3ZpZGVycyBzZXNzaW9uOnNlc3Np b25dOwogCi0gICAgTlNMb2coQCJMb2FkaW5nIGRhdGEgZnJvbSAldHUgaXRlbSBwcm92aWRlcnMg Zm9yIHNlc3Npb246ICVwIiwgaXRlbVByb3ZpZGVycy5jb3VudCwgc2Vzc2lvbik7CisgICAgUkVM RUFTRV9MT0coRHJhZ0FuZERyb3AsICJMb2FkaW5nIGRhdGEgZnJvbSAldHUgaXRlbSBwcm92aWRl cnMgZm9yIHNlc3Npb246ICVwIiwgaXRlbVByb3ZpZGVycy5jb3VudCwgc2Vzc2lvbik7CiAgICAg Ly8gQWx3YXlzIGxvYWRpbmcgY29udGVudCBmcm9tIHRoZSBpdGVtIHByb3ZpZGVyIGVuc3VyZXMg dGhhdCB0aGUgd2ViIHByb2Nlc3Mgd2lsbCBiZSBhbGxvd2VkIHRvIGNhbGwgYmFjayBpbiB0byB0 aGUgVUkKICAgICAvLyBwcm9jZXNzIHRvIGFjY2VzcyBwYXN0ZWJvYXJkIGNvbnRlbnRzIGF0IGEg bGF0ZXIgdGltZS4gSWRlYWxseSwgd2Ugb25seSBuZWVkIHRvIGRvIHRoaXMgd29yayBpZiB3ZSdy ZSBvdmVyIGEgZmlsZSBpbnB1dAogICAgIC8vIG9yIHRoZSBwYWdlIHByZXZlbnRlZCBkZWZhdWx0 IG9uIGBkcmFnb3ZlcmAsIGJ1dCB3aXRob3V0IHRoaXMsIGRyb3BwaW5nIGludG8gYSBub3JtYWwg ZWRpdGFibGUgYXJlYXMgd2lsbCBmYWlsIGR1ZSB0bwogICAgIC8vIGl0ZW0gcHJvdmlkZXJzIG5v dCBsb2FkaW5nIGFueSBkYXRhLgogICAgIFJldGFpblB0cjxXS0NvbnRlbnRWaWV3PiByZXRhaW5l ZFNlbGYoc2VsZik7CiAgICAgW1tXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIHNoYXJlZEluc3Rh bmNlXSBkb0FmdGVyTG9hZGluZ1Byb3ZpZGVkQ29udGVudEludG9GaWxlVVJMczpbcmV0YWluZWRT ZWxmLCBjYXB0dXJlZERyYWdEYXRhID0gV1RGTW92ZShkcmFnRGF0YSksIHNob3VsZFNuYXBzaG90 Vmlld10gKE5TQXJyYXkgKmZpbGVVUkxzKSBtdXRhYmxlIHsKLSAgICAgICAgTlNMb2coQCJMb2Fk ZWQgZGF0YSBpbnRvICV0dSBmaWxlcyIsIGZpbGVVUkxzLmNvdW50KTsKKyAgICAgICAgUkVMRUFT RV9MT0coRHJhZ0FuZERyb3AsICJMb2FkZWQgZGF0YSBpbnRvICV0dSBmaWxlcyIsIGZpbGVVUkxz LmNvdW50KTsKICAgICAgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzOwogICAgICAgICBmb3Ig KE5TVVJMICpmaWxlVVJMIGluIGZpbGVVUkxzKQogICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVu ZChbZmlsZVVSTCBwYXRoXSk7CkBAIC03OTM1LDcgKzc5MzUsNyBAQCAtICh2b2lkKV9kcm9wSW50 ZXJhY3Rpb246KFVJRHJvcEludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gZGVsYXllZFByZXZpZXdQ cm92aWRlcgogCiAtICh2b2lkKWRyb3BJbnRlcmFjdGlvbjooVUlEcm9wSW50ZXJhY3Rpb24gKilp bnRlcmFjdGlvbiBzZXNzaW9uRGlkRW5kOihpZCA8VUlEcm9wU2Vzc2lvbj4pc2Vzc2lvbgogewot ICAgIE5TTG9nKEAiRHJvcCBzZXNzaW9uIGVuZGVkOiAlcCAocGVyZm9ybWluZyBvcGVyYXRpb246 ICVkLCBiZWdhbiBkcmFnZ2luZzogJWQpIiwgc2Vzc2lvbiwgX2RyYWdEcm9wSW50ZXJhY3Rpb25T dGF0ZS5pc1BlcmZvcm1pbmdEcm9wKCksIF9kcmFnRHJvcEludGVyYWN0aW9uU3RhdGUuZGlkQmVn aW5EcmFnZ2luZygpKTsKKyAgICBSRUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyb3Agc2Vzc2lv biBlbmRlZDogJXAgKHBlcmZvcm1pbmcgb3BlcmF0aW9uOiAlZCwgYmVnYW4gZHJhZ2dpbmc6ICVk KSIsIHNlc3Npb24sIF9kcmFnRHJvcEludGVyYWN0aW9uU3RhdGUuaXNQZXJmb3JtaW5nRHJvcCgp LCBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0YXRlLmRpZEJlZ2luRHJhZ2dpbmcoKSk7CiAgICAgaWYg KF9kcmFnRHJvcEludGVyYWN0aW9uU3RhdGUuaXNQZXJmb3JtaW5nRHJvcCgpKSB7CiAgICAgICAg IC8vIEluIHRoZSBjYXNlIHdoZXJlIHdlIGFyZSBwZXJmb3JtaW5nIGEgZHJvcCwgd2FpdCB1bnRp bCBhZnRlciB0aGUgZHJvcCBpcyBoYW5kbGVkIGluIHRoZSB3ZWIgcHJvY2VzcyB0byByZXNldCBk cmFnIGFuZCBkcm9wIGludGVyYWN0aW9uIHN0YXRlLgogICAgICAgICByZXR1cm47CmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDE1ZjFlNjE4NTcx YjRhYmRlNDcxYzJlMjQ1MmZjMzBiNTU3Yzc1Mi4uMTU5MmU5MjhjOTQyYzVkZWQ1ZmI4ZWVhNWY2 ZWFiNmZkYmFmNThkZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTA0ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBldmVuIG1vcmUgbG9nZ2luZyB0byB0 cnkgYW5kIGRpYWdub3NlIDx3ZWJraXQub3JnL2IvMjA5Njg1PgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMDA4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBvbGQgbG9nZ2luZyB3aXRoIG5l dyBsb2dnaW5nIChpbiBkaWZmZXJlbnQgcGxhY2VzKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9TLm1tOgorICAgICAgICAoLVtEcmFnQW5kRHJv cFNpbXVsYXRvciBydW5Gcm9tOnRvOmFkZGl0aW9uYWxJdGVtUmVxdWVzdExvY2F0aW9uczpdKToK KyAgICAgICAgKC1bRHJhZ0FuZERyb3BTaW11bGF0b3IgX2FkdmFuY2VQcm9ncmVzc10pOgorICAg ICAgICAoLVtEcmFnQW5kRHJvcFNpbXVsYXRvciBfd2ViVmlldzphZGp1c3RlZERhdGFJbnRlcmFj dGlvbkl0ZW1Qcm92aWRlcnNGb3JJdGVtUHJvdmlkZXI6cmVwcmVzZW50aW5nT2JqZWN0czphZGRp dGlvbmFsRGF0YTpdKToKKworICAgICAgICBSdWxlIG91dCB0aGUgcG9zc2liaWxpdHkgdGhhdCB0 aGUgV2ViS2l0IGNsaWVudCAoaW4gdGhpcyBjYXNlLCB0aGUgZHJhZyBhbmQgZHJvcCBzaW11bGF0 b3IpIGlzIG92ZXJyaWRpbmcgdGhlCisgICAgICAgIGxpc3Qgb2YgZHJhZyBpdGVtcyBieSBsb2dn aW5nIHRoZSBnaXZlbiBOU0l0ZW1Qcm92aWRlciB0aGF0IHdpbGwgYmUgdXNlZCB0byBzdGFydCB0 aGUgZHJhZy4KKwogMjAyMC0wNC0wMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBTUEkgdG8gbWFrZSBXS1VzZXJTY3JpcHRzIHdhaXQg Zm9yIGEgbm90aWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9E cmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdB bmREcm9wU2ltdWxhdG9ySU9TLm1tCmluZGV4IDQ1MzJhMTA0MGNhMThhMWE3Y2FjYmViYTRiYWMw MGEzZmVjZjg3MmQuLjYyNjBhZTk5ZWE0Y2EyZjc0OTMwMzZlMDllZjk4MTY3OTZlZWQzYTMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9T Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9T Lm1tCkBAIC00NTUsOSArNDU1LDcgQEAgLSAodm9pZClydW5Gcm9tOihDR1BvaW50KXN0YXJ0TG9j YXRpb24gdG86KENHUG9pbnQpZW5kTG9jYXRpb24gYWRkaXRpb25hbEl0ZW1SZXEKICAgICB9IGVs c2UgewogICAgICAgICBfZHJhZ1Nlc3Npb24gPSBhZG9wdE5TKFtbTW9ja0RyYWdTZXNzaW9uIGFs bG9jXSBpbml0V2l0aFdpbmRvdzpbX3dlYlZpZXcgd2luZG93XSBhbGxvd01vdmU6c2VsZi5zaG91 bGRBbGxvd01vdmVPcGVyYXRpb25dKTsKICAgICAgICAgW19kcmFnU2Vzc2lvbiBzZXRNb2NrTG9j YXRpb25JbldpbmRvdzpfc3RhcnRMb2NhdGlvbl07Ci0gICAgICAgIE5TTG9nKEAiJXMgLSBwcmVw YXJpbmcgZm9yIGRyYWcgc2Vzc2lvbiIsIF9fUFJFVFRZX0ZVTkNUSU9OX18pOwogICAgICAgICBb KGlkIDxVSURyYWdJbnRlcmFjdGlvbkRlbGVnYXRlX0ZvcldlYktpdE9ubHk+KVtfd2ViVmlldyBk cmFnSW50ZXJhY3Rpb25EZWxlZ2F0ZV0gX2RyYWdJbnRlcmFjdGlvbjpbX3dlYlZpZXcgZHJhZ0lu dGVyYWN0aW9uXSBwcmVwYXJlRm9yU2Vzc2lvbjpfZHJhZ1Nlc3Npb24uZ2V0KCkgY29tcGxldGlv bjpbc3Ryb25nU2VsZiA9IHJldGFpblB0cihzZWxmKV0gewotICAgICAgICAgICAgTlNMb2coQCIl cyAtIGRvbmUgcHJlcGFyaW5nIGZvciBkcmFnIHNlc3Npb24gd2l0aCBwaGFzZTogJWxkIiwgX19Q UkVUVFlfRlVOQ1RJT05fXywgc3Ryb25nU2VsZi0+X3BoYXNlKTsKICAgICAgICAgICAgIGlmIChz dHJvbmdTZWxmLT5fcGhhc2UgPT0gRHJhZ0FuZERyb3BQaGFzZUNhbmNlbGxlZCkKICAgICAgICAg ICAgICAgICByZXR1cm47CiAKQEAgLTYwNCwxMiArNjAyLDEyIEBAIC0gKHZvaWQpX2FkdmFuY2VQ cm9ncmVzcwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTlNMb2coQCIlcyAtIHBoYXNl OiAlbGQiLCBfX1BSRVRUWV9GVU5DVElPTl9fLCBfcGhhc2UpOwogICAgIHN3aXRjaCAoX3BoYXNl KSB7CiAgICAgY2FzZSBEcmFnQW5kRHJvcFBoYXNlQmVnaW5uaW5nOiB7CiAgICAgICAgIE5TTXV0 YWJsZUFycmF5PE5TSXRlbVByb3ZpZGVyICo+ICppdGVtUHJvdmlkZXJzID0gW05TTXV0YWJsZUFy cmF5IGFycmF5XTsKICAgICAgICAgTlNBcnJheSAqaXRlbXMgPSBbW193ZWJWaWV3IGRyYWdJbnRl cmFjdGlvbkRlbGVnYXRlXSBkcmFnSW50ZXJhY3Rpb246W193ZWJWaWV3IGRyYWdJbnRlcmFjdGlv bl0gaXRlbXNGb3JCZWdpbm5pbmdTZXNzaW9uOl9kcmFnU2Vzc2lvbi5nZXQoKV07CiAgICAgICAg IGlmICghaXRlbXMuY291bnQpIHsKKyAgICAgICAgICAgIE5TTG9nKEAiJXMgKGZvdW5kIG5vIGRy YWcgaXRlbXMgd2hlbiBiZWdpbm5pbmcgc2Vzc2lvbikiLCBfX1BSRVRUWV9GVU5DVElPTl9fKTsK ICAgICAgICAgICAgIF9waGFzZSA9IERyYWdBbmREcm9wUGhhc2VDYW5jZWxsZWQ7CiAgICAgICAg ICAgICBfY3VycmVudFByb2dyZXNzID0gMTsKICAgICAgICAgICAgIF9pc0RvbmVXaXRoQ3VycmVu dFJ1biA9IHRydWU7CkBAIC05MDAsNiArODk4LDcgQEAgLSAoVUlEcm9wUHJvcG9zYWwgKilfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyB3aWxsVXBkYXRlRHJvcFByb3Bvc2FsVG9Qcm9wb3MK IAogLSAoTlNBcnJheSAqKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGFkanVzdGVkRGF0 YUludGVyYWN0aW9uSXRlbVByb3ZpZGVyc0Zvckl0ZW1Qcm92aWRlcjooTlNJdGVtUHJvdmlkZXIg KilpdGVtUHJvdmlkZXIgcmVwcmVzZW50aW5nT2JqZWN0czooTlNBcnJheSAqKXJlcHJlc2VudGlu Z09iamVjdHMgYWRkaXRpb25hbERhdGE6KE5TRGljdGlvbmFyeSAqKWFkZGl0aW9uYWxEYXRhCiB7 CisgICAgTlNMb2coQCIlcyAtIHNlbGYuY29udmVydEl0ZW1Qcm92aWRlcnNCbG9jayA6PSAlcDsg aXRlbVByb3ZpZGVyLnJlZ2lzdGVyZWRUeXBlSWRlbnRpZmllcnMgOj0gJUAiLCBfX1BSRVRUWV9G VU5DVElPTl9fLCBzZWxmLmNvbnZlcnRJdGVtUHJvdmlkZXJzQmxvY2ssIGl0ZW1Qcm92aWRlci5y ZWdpc3RlcmVkVHlwZUlkZW50aWZpZXJzKTsKICAgICByZXR1cm4gc2VsZi5jb252ZXJ0SXRlbVBy b3ZpZGVyc0Jsb2NrID8gc2VsZi5jb252ZXJ0SXRlbVByb3ZpZGVyc0Jsb2NrKGl0ZW1Qcm92aWRl ciwgcmVwcmVzZW50aW5nT2JqZWN0cywgYWRkaXRpb25hbERhdGEpIDogQFsgaXRlbVByb3ZpZGVy IF07CiB9CiAK