129594 2014-03-02 17:42:02 -0800 [iOS WebKit2] Keyboard deadlock when accepting/dismissing autocorrection 2014-03-02 18:01:59 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 986218 0 enrica 2014-03-02 17:42:02 -0800 The keyboard code locks the main thread in some circumstance when it wants to flush the task queue. Having the main thread locked prevents us from receiving the response from the WebProcess. this happens typically when the autocorrection bubble is visible and the keybaord is dismissed or the focus changed to another field. <rdar://problem/16053643> 986221 1 225620 enrica 2014-03-02 17:46:50 -0800 Created attachment 225620 Patch 986225 2 enrica 2014-03-02 18:01:59 -0800 Committed revision 164963. 225620 2014-03-02 17:46:50 -0800 2014-03-02 17:59:53 -0800 Patch kbdeadlock.txt text/plain 9099 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDk1OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAzLTAyICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXZWJLaXQyXSBLZXli b2FyZCBkZWFkbG9jayB3aGVuIGFjY2VwdGluZy9kaXNtaXNzaW5nIGF1dG9jb3JyZWN0aW9uLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NTk0Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjE2ODk3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcyBhIHRlbXBvcmFyeSBmaXgsIHdlIGFyZSB1c2lu ZyBhIHN5bmNocm9ub3VzCisgICAgICAgIG1lc3NhZ2UgdG8gYWNjZXB0IGF1dG9jb3JyZWN0aW9u IHVudGlsIHdlIGltcGxlbWVudAorICAgICAgICBhIHNvbHV0aW9uIHRoYXQgcHJvY2Vzc2VzIHRo ZXNlIHJlcXVlc3Qgb24gYSB0aHJlYWQgdGhhdAorICAgICAgICBpcyBub3QgdGhlIG1haW4gdGhy ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IGFwcGx5QXV0b2NvcnJlY3Rpb246dG9TdHJpbmc6d2l0aENvbXBsZXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHJlcXVlc3RBdXRvY29ycmVjdGlvbkNv bnRleHRXaXRoQ29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwbHlB dXRvY29ycmVjdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzeW5jQXBwbHlBdXRvY29ycmVjdGlvbik6CisKIDIwMTQtMDMtMDIgIERhbiBCZXJuc3Rl aW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBUcnkgdG8gZml4IHRoZSAzMi1iaXQgYnVp bGQuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lv biAxNjQ5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2OSw2ICs0NjksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBleHRlbmRT ZWxlY3Rpb24oV2ViQ29yZTo6VGV4dEdyYW51bGFyaXR5KTsKICAgICB2b2lkIHJlcXVlc3RBdXRv Y29ycmVjdGlvbkRhdGEoY29uc3QgU3RyaW5nJiB0ZXh0Rm9yQXV0b2NvcnJlY3Rpb24sIFBhc3NS ZWZQdHI8QXV0b2NvcnJlY3Rpb25EYXRhQ2FsbGJhY2s+KTsKICAgICB2b2lkIGFwcGx5QXV0b2Nv cnJlY3Rpb24oY29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpbmFs VGV4dCwgUGFzc1JlZlB0cjxTdHJpbmdDYWxsYmFjaz4pOworICAgIGJvb2wgYXBwbHlBdXRvY29y cmVjdGlvbihjb25zdCBTdHJpbmcmIGNvcnJlY3Rpb24sIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxU ZXh0KTsKICAgICB2b2lkIHJlcXVlc3RBdXRvY29ycmVjdGlvbkNvbnRleHQoUGFzc1JlZlB0cjxB dXRvY29ycmVjdGlvbkNvbnRleHRDYWxsYmFjaz4pOwogICAgIHZvaWQgZ2V0QXV0b2NvcnJlY3Rp b25Db250ZXh0KFN0cmluZyYgY29udGV4dEJlZm9yZSwgU3RyaW5nJiBtYXJrZWRUZXh0LCBTdHJp bmcmIHNlbGVjdGVkVGV4dCwgU3RyaW5nJiBjb250ZXh0QWZ0ZXIsIHVpbnQ2NF90JiBsb2NhdGlv biwgdWludDY0X3QmIGxlbmd0aCk7CiAgICAgdm9pZCBkaWRSZWNlaXZlUG9zaXRpb25JbmZvcm1h dGlvbihjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYpOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE2NDk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMjM0 LDYgKzEyMzQsMTMgQEAgLSAoQ0dSZWN0KXRleHRMYXN0UmVjdAogLy8gVGhlIGNvbXBsZXRpb24g aGFuZGxlciBzaG91bGQgcGFzcyB0aGUgcmVjdCBvZiB0aGUgY29ycmVjdGlvbiB0ZXh0IGFmdGVy IHJlcGxhY2luZyB0aGUgaW5wdXQgdGV4dCwgb3IgbmlsIGlmIHRoZSByZXBsYWNlbWVudCBjb3Vs ZCBub3QgYmUgcGVyZm9ybWVkLgogLSAodm9pZClhcHBseUF1dG9jb3JyZWN0aW9uOihOU1N0cmlu ZyAqKWNvcnJlY3Rpb24gdG9TdHJpbmc6KE5TU3RyaW5nICopaW5wdXQgd2l0aENvbXBsZXRpb25I YW5kbGVyOih2b2lkICheKShVSVdLQXV0b2NvcnJlY3Rpb25SZWN0cyAqcmVjdHNGb3JDb3JyZWN0 aW9uKSljb21wbGV0aW9uSGFuZGxlcgogeworICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIHN5bmNo cm9ub3VzIGNhbGwgd2hlbiA8cmRhcjovL3Byb2JsZW0vMTYyMDcwMDI+IGlzIGZpeGVkLgorICAg IGNvbnN0IGJvb2wgdXNlU3luY1JlcXVlc3QgPSB0cnVlOworCisgICAgaWYgKHVzZVN5bmNSZXF1 ZXN0KSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKF9wYWdlLT5hcHBseUF1dG9jb3JyZWN0 aW9uKGNvcnJlY3Rpb24sIGlucHV0KSA/IFtXS0F1dG9jb3JyZWN0aW9uUmVjdHMgYXV0b2NvcnJl Y3Rpb25SZWN0c1dpdGhSZWN0czpfYXV0b2NvcnJlY3Rpb25EYXRhLnRleHRGaXJzdFJlY3QgbGFz dFJlY3Q6X2F1dG9jb3JyZWN0aW9uRGF0YS50ZXh0TGFzdFJlY3RdIDogbmlsKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KICAgICBfYXV0b2NvcnJlY3Rpb25EYXRhLmF1dG9jb3JyZWN0aW9uSGFu ZGxlciA9IFtjb21wbGV0aW9uSGFuZGxlciBjb3B5XTsKICAgICBfcGFnZS0+YXBwbHlBdXRvY29y cmVjdGlvbihjb3JyZWN0aW9uLCBpbnB1dCwgU3RyaW5nQ2FsbGJhY2s6OmNyZWF0ZShbc2VsZl0o Ym9vbCAvKmVycm9yKi8sIFN0cmluZ0ltcGwqIHN0cmluZykgewogICAgICAgICBfYXV0b2NvcnJl Y3Rpb25EYXRhLmF1dG9jb3JyZWN0aW9uSGFuZGxlcihzdHJpbmcgPyBbV0tBdXRvY29ycmVjdGlv blJlY3RzIGF1dG9jb3JyZWN0aW9uUmVjdHNXaXRoUmVjdHM6X2F1dG9jb3JyZWN0aW9uRGF0YS50 ZXh0Rmlyc3RSZWN0IGxhc3RSZWN0Ol9hdXRvY29ycmVjdGlvbkRhdGEudGV4dExhc3RSZWN0XSA6 IG5pbCk7CkBAIC0xMjQ0LDcgKzEyNTEsNyBAQCAtICh2b2lkKWFwcGx5QXV0b2NvcnJlY3Rpb246 KE5TU3RyaW5nICopCiAKIC0gKHZvaWQpcmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29udGV4dFdpdGhD b21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoVUlXS0F1dG9jb3JyZWN0aW9uQ29udGV4dCAqYXV0 b2NvcnJlY3Rpb25Db250ZXh0KSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIC8vIEZJWE1FOiBS ZW1vdmUgdGhlIHN5bmNocm9ub3VzIGNhbGwgYXMgc29vbiBhcyBLZXlib2FyZCByZW1vdmVzIGxv Y2tpbmcgb2YgdGhlIG1haW4gdGhyZWFkLgorICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIHN5bmNo cm9ub3VzIGNhbGwgd2hlbiA8cmRhcjovL3Byb2JsZW0vMTYyMDcwMDI+IGlzIGZpeGVkLgogICAg IGNvbnN0IGJvb2wgdXNlU3luY1JlcXVlc3QgPSB0cnVlOwogCiAgICAgaWYgKHVzZVN5bmNSZXF1 ZXN0KSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlP Uy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbQkocmV2aXNpb24gMTY0OTU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XZWJQYWdlUHJveHlJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTMwMSw2ICszMDEsMTMg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmFwcGx5QXV0b2NvcnJlY3Rpb24oYwogICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6QXBwbHlBdXRvY29ycmVjdGlvbihjb3JyZWN0aW9u LCBvcmlnaW5hbFRleHQsIGNhbGxiYWNrSUQpLCBtX3BhZ2VJRCk7CiB9CiAKK2Jvb2wgV2ViUGFn ZVByb3h5OjphcHBseUF1dG9jb3JyZWN0aW9uKGNvbnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29u c3QgU3RyaW5nJiBvcmlnaW5hbFRleHQpCit7CisgICAgYm9vbCBhdXRvY29ycmVjdGlvbkFwcGxp ZWQgPSBmYWxzZTsKKyAgICBtX3Byb2Nlc3MtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpT eW5jQXBwbHlBdXRvY29ycmVjdGlvbihjb3JyZWN0aW9uLCBvcmlnaW5hbFRleHQpLCBNZXNzYWdl czo6V2ViUGFnZTo6U3luY0FwcGx5QXV0b2NvcnJlY3Rpb246OlJlcGx5KGF1dG9jb3JyZWN0aW9u QXBwbGllZCksIG1fcGFnZUlEKTsKKyAgICByZXR1cm4gYXV0b2NvcnJlY3Rpb25BcHBsaWVkOwor fQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29udGV4dChQYXNz UmVmUHRyPEF1dG9jb3JyZWN0aW9uQ29udGV4dENhbGxiYWNrPiBjYWxsYmFjaykKIHsKICAgICBp ZiAoIWlzVmFsaWQoKSkgewpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCShyZXZpc2lvbiAxNjQ5NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NTUsNiArNDU1LDcgQEAg cHVibGljOgogICAgIHZvaWQgZWxlbWVudERpZEJsdXIoV2ViQ29yZTo6Tm9kZSopOwogICAgIHZv aWQgcmVxdWVzdEF1dG9jb3JyZWN0aW9uRGF0YShjb25zdCBTdHJpbmcmIHRleHRGb3JBdXRvY29y cmVjdGlvbiwgdWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBhcHBseUF1dG9jb3JyZWN0 aW9uKGNvbnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFRleHQs IHVpbnQ2NF90IGNhbGxiYWNrSUQpOworICAgIHZvaWQgc3luY0FwcGx5QXV0b2NvcnJlY3Rpb24o Y29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpbmFsVGV4dCwgYm9v bCYgY29ycmVjdGlvbkFwcGxpZWQpOwogICAgIHZvaWQgcmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29u dGV4dCh1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGdldEF1dG9jb3JyZWN0aW9uQ29u dGV4dChTdHJpbmcmIGJlZm9yZVRleHQsIFN0cmluZyYgbWFya2VkVGV4dCwgU3RyaW5nJiBzZWxl Y3RlZFRleHQsIFN0cmluZyYgYWZ0ZXJUZXh0LCB1aW50NjRfdCYgbG9jYXRpb24sIHVpbnQ2NF90 JiBsZW5ndGgpOwogICAgIHZvaWQgaW5zZXJ0VGV4dChjb25zdCBTdHJpbmcmIHRleHQsIHVpbnQ2 NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0X3QgcmVwbGFjZW1lbnRSYW5nZUVuZCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTY0OTU1KQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTUz LDYgKzUzLDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgRXh0 ZW5kU2VsZWN0aW9uKHVpbnQzMl90IGdyYW51bGFyaXR5KQogICAgIFJlcXVlc3RBdXRvY29ycmVj dGlvbkRhdGEoU3RyaW5nIHRleHRGb3JBdXRvY29ycmVjdGlvbiwgdWludDY0X3QgY2FsbGJhY2tJ RCkKICAgICBBcHBseUF1dG9jb3JyZWN0aW9uKFN0cmluZyBjb3JyZWN0aW9uLCBTdHJpbmcgb3Jp Z2luYWxUZXh0LCB1aW50NjRfdCBjYWxsYmFja0lEKQorICAgIFN5bmNBcHBseUF1dG9jb3JyZWN0 aW9uKFN0cmluZyBjb3JyZWN0aW9uLCBTdHJpbmcgb3JpZ2luYWxUZXh0KSAtPiAoYm9vbCBhdXRv Y29ycmVjdGlvbkFwcGxpZWQpCiAgICAgUmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29udGV4dCh1aW50 NjRfdCBjYWxsYmFja0lEKQogICAgIEdldEF1dG9jb3JyZWN0aW9uQ29udGV4dCgpIC0+IChTdHJp bmcgYmVmb3JlQ29udGV4dCwgU3RyaW5nIG1hcmtlZFRleHQsIFN0cmluZyBzZWxlY3RlZFRleHQs IFN0cmluZyBhZnRlckNvbnRleHQsIHVpbnQ2NF90IGxvY2F0aW9uLCB1aW50NjRfdCBsZW5ndGgp IAogICAgIEluc2VydFRleHQoU3RyaW5nIHRleHQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VT dGFydCwgdWludDY0X3QgcmVwbGFjZW1lbnRSYW5nZUVuZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9u IDE2NDk1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI4NywxMSArMTI4NywyMCBAQCB2b2lkIFdlYlBh Z2U6OnJlcXVlc3RBdXRvY29ycmVjdGlvbkRhdGEoCiAKIHZvaWQgV2ViUGFnZTo6YXBwbHlBdXRv Y29ycmVjdGlvbihjb25zdCBTdHJpbmcmIGNvcnJlY3Rpb24sIGNvbnN0IFN0cmluZyYgb3JpZ2lu YWxUZXh0LCB1aW50NjRfdCBjYWxsYmFja0lEKQogeworICAgIGJvb2wgY29ycmVjdGlvbkFwcGxp ZWQ7CisgICAgc3luY0FwcGx5QXV0b2NvcnJlY3Rpb24oY29ycmVjdGlvbiwgb3JpZ2luYWxUZXh0 LCBjb3JyZWN0aW9uQXBwbGllZCk7CisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpT dHJpbmdDYWxsYmFjayhjb3JyZWN0aW9uQXBwbGllZCA/IGNvcnJlY3Rpb24gOiBTdHJpbmcoKSwg Y2FsbGJhY2tJRCkpOworfQorCit2b2lkIFdlYlBhZ2U6OnN5bmNBcHBseUF1dG9jb3JyZWN0aW9u KGNvbnN0IFN0cmluZyYgY29ycmVjdGlvbiwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFRleHQsIGJv b2wmIGNvcnJlY3Rpb25BcHBsaWVkKQorewogICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2U7CisgICAg Y29ycmVjdGlvbkFwcGxpZWQgPSBmYWxzZTsKICAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwotICAgIEFTU0VSVChmcmFtZS5z ZWxlY3Rpb24oKS5pc0NhcmV0KCkpOworICAgIGlmICghZnJhbWUuc2VsZWN0aW9uKCkuaXNDYXJl dCgpKQorICAgICAgICByZXR1cm47CiAgICAgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gZnJh bWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkuc3RhcnQoKTsKLQorICAgIAogICAgIHJhbmdlID0g d29yZFJhbmdlRnJvbVBvc2l0aW9uKHBvc2l0aW9uKTsKICAgICBTdHJpbmcgdGV4dEZvclJhbmdl ID0gcGxhaW5UZXh0KHJhbmdlLmdldCgpKTsKICAgICBpZiAodGV4dEZvclJhbmdlICE9IG9yaWdp bmFsVGV4dCkgewpAQCAtMTMxNSwxNyArMTMyNCwxNiBAQCB2b2lkIFdlYlBhZ2U6OmFwcGx5QXV0 b2NvcnJlY3Rpb24oY29uc3QgCiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKHRleHRGb3JSYW5n ZSAhPSBvcmlnaW5hbFRleHQpIHsKLSAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpTdHJpbmdDYWxsYmFjayhTdHJpbmcoKSwgY2FsbGJhY2tJRCkpOworICAgICAgICBjb3JyZWN0 aW9uQXBwbGllZCA9IGZhbHNlOwogICAgICAgICByZXR1cm47CiAgICAgfQotCisgICAgCiAgICAg ZnJhbWUuc2VsZWN0aW9uKCkuc2V0U2VsZWN0ZWRSYW5nZShyYW5nZS5nZXQoKSwgVVBTVFJFQU0s IHRydWUpOwogICAgIGlmIChjb3JyZWN0aW9uLmxlbmd0aCgpKQogICAgICAgICBmcmFtZS5lZGl0 b3IoKS5pbnNlcnRUZXh0KGNvcnJlY3Rpb24sIDApOwogICAgIGVsc2UKICAgICAgICAgZnJhbWUu ZWRpdG9yKCkuZGVsZXRlV2l0aERpcmVjdGlvbihEaXJlY3Rpb25CYWNrd2FyZCwgQ2hhcmFjdGVy R3JhbnVsYXJpdHksIGZhbHNlLCB0cnVlKTsKLQotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6U3RyaW5nQ2FsbGJhY2soY29ycmVjdGlvbiwgY2FsbGJhY2tJRCkpOworICAgIGNvcnJl Y3Rpb25BcHBsaWVkID0gdHJ1ZTsKIH0KIAogc3RhdGljIHZvaWQgY29tcHV0ZUF1dG9jb3JyZWN0 aW9uQ29udGV4dChGcmFtZSYgZnJhbWUsIFN0cmluZyYgY29udGV4dEJlZm9yZSwgU3RyaW5nJiBt YXJrZWRUZXh0LCBTdHJpbmcmIHNlbGVjdGVkVGV4dCwgU3RyaW5nJiBjb250ZXh0QWZ0ZXIsIHVp bnQ2NF90JiBsb2NhdGlvbiwgdWludDY0X3QmIGxlbmd0aCkK