134855 2014-07-12 10:25:55 -0700 [Cocoa] Client is not notified of same-document navigations 2014-07-12 13:40:49 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz andersca sam thorton oldest_to_newest 1021978 0 mitz 2014-07-12 10:25:55 -0700 [Cocoa] Client is not notified of same-document navigations 1021979 1 234804 mitz 2014-07-12 10:35:17 -0700 Created attachment 234804 Add -_webView:navigation:didSameDocumentNavigation: 1021990 2 mitz 2014-07-12 13:40:49 -0700 Fixed in <http://trac.webkit.org/r171027>. 234804 2014-07-12 10:35:17 -0700 2014-07-12 12:21:02 -0700 Add -_webView:navigation:didSameDocumentNavigation: bug-134855-20140712103459.patch text/plain 18641 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTAyMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTA3LTEyICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBDbGllbnQgaXMgbm90 IG5vdGlmaWVkIG9mIHNhbWUtZG9jdW1lbnQgbmF2aWdhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDg1NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElMb2FkZXJD bGllbnQuaDoKKyAgICAgICAgKEFQSTo6TG9hZGVyQ2xpZW50OjpkaWRTYW1lRG9jdW1lbnROYXZp Z2F0aW9uRm9yRnJhbWUpOiBBZGRlZCBuYXZpZ2F0aW9uSUQgcGFyYW1ldGVyLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlTG9h ZGVyQ2xpZW50KTogRGl0dG8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2 aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oOiBBZGRlZCBuZXcgZW51bSBhbmQgZGVsZWdhdGUgbWV0 aG9kLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOiBEZWNs YXJlIG92ZXJyaWRlIG9mCisgICAgICAgIEFQSTo6TG9hZGVyQ2xpZW50OjpkaWRTYW1lRG9jdW1l bnROYXZpZ2F0aW9uRm9yRnJhbWUuIEFkZGVkIGZsYWcgaW4KKyAgICAgICAgbV9uYXZpZ2F0aW9u RGVsZWdhdGVNZXRob2RzIHN0cnVjdC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OnNldE5hdmln YXRpb25EZWxlZ2F0ZSk6IEluaXRpYWxpemUgbmV3IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9k cworICAgICAgICBmbGFnLgorICAgICAgICAoV2ViS2l0Ojp0b1dLU2FtZURvY3VtZW50TmF2aWdh dGlvblR5cGUpOiBBZGRlZCB0aGlzIGhlbHBlciB0byBjb252ZXJ0IGZyb20gaW50ZXJuYWwgdG8g QVBJCisgICAgICAgIHZhbHVlcy4KKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpM b2FkZXJDbGllbnQ6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6IE92ZXJyaWRl IHRvIGNhbGwKKyAgICAgICAgdGhlIGRlbGVnYXRlIG1ldGhvZCwgaWYgaW1wbGVtZW50ZWQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUpOiBBZGRlZCBu YXZpZ2F0aW9uSUQgcGFyYW1ldGVyLAorICAgICAgICB3aGljaCBpcyBmb3J3YXJkZWQgdG8gdGhl IGNsaWVudC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6IEFkZGVkIG5hdmln YXRpb25JRCBwYXJhbWV0ZXIuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbjogRGl0dG8uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKTogU2VuZCB0aGUgbmF2 aWdhdGlvbiBJRC4KKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGlkUHVzaFN0YXRlV2l0aGluUGFnZSk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKTogRGl0 dG8uCisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFBv cFN0YXRlV2l0aGluUGFnZSk6IERpdHRvLgorCiAyMDE0LTA3LTExICBFbnJpY2EgQ2FzdWNjaSAg PGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHRleHRTdHlsaW5nQXRQb3Np dGlvbiBpbiBXSzIuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkocmV2aXNpb24gMTcxMDIwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2ODMsNyArMjY4Myw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKHUKICAgICBtX2xvYWRlckNsaWVudC0+ZGlk RmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZSh0aGlzLCBmcmFtZSwgbmF2aWdhdGlvbklELCBlcnJv ciwgdXNlckRhdGEuZ2V0KCkpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU2FtZURvY3Vt ZW50TmF2aWdhdGlvbkZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90IG9wYXF1ZVNh bWVEb2N1bWVudE5hdmlnYXRpb25UeXBlLCBjb25zdCBTdHJpbmcmIHVybCwgSVBDOjpNZXNzYWdl RGVjb2RlciYgZGVjb2RlcikKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZp Z2F0aW9uRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCB1 aW50MzJfdCBvcGFxdWVTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgY29uc3QgU3RyaW5nJiB1 cmwsIElQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7CiAgICAgUmVmUHRyPEFQSTo6T2Jq ZWN0PiB1c2VyRGF0YTsKICAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VE ZWNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpOwpAQCAtMjcwMyw3ICsyNzAzLDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYQogICAgIGZyYW1lLT5kaWRTYW1lRG9j dW1lbnROYXZpZ2F0aW9uKHVybCk7CiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdl cygpOwotICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJh bWUodGhpcywgZnJhbWUsIHN0YXRpY19jYXN0PFNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlPihv cGFxdWVTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSksIHVzZXJEYXRhLmdldCgpKTsKKyAgICBt X2xvYWRlckNsaWVudC0+ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKHRoaXMsIGZy YW1lLCBuYXZpZ2F0aW9uSUQsIHN0YXRpY19jYXN0PFNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBl PihvcGFxdWVTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSksIHVzZXJEYXRhLmdldCgpKTsKIH0K IAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIGNvbnN0IFN0cmluZyYgdGl0bGUsIElQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAx NzEwMjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTk0Myw3ICs5NDMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlv bklELCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJh bWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBJUEM6Ok1lc3NhZ2VE ZWNvZGVyJik7CiAgICAgdm9pZCBkaWRGYWlsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIElQ Qzo6TWVzc2FnZURlY29kZXImKTsKLSAgICB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25G b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50MzJfdCBzYW1lRG9jdW1lbnROYXZpZ2F0aW9u VHlwZSwgY29uc3QgU3RyaW5nJiwgSVBDOjpNZXNzYWdlRGVjb2RlciYpOworICAgIHZvaWQgZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCwgdWludDMyX3Qgc2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUsIGNvbnN0 IFN0cmluZyYsIElQQzo6TWVzc2FnZURlY29kZXImKTsKICAgICB2b2lkIGRpZFJlY2VpdmVUaXRs ZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYsIElQQzo6TWVzc2FnZURl Y29kZXImKTsKICAgICB2b2lkIGRpZEZpcnN0TGF5b3V0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgSVBDOjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgZGlkRmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgSVBDOjpNZXNzYWdlRGVjb2RlciYp OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5p bgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCShyZXZpc2lvbiAxNzEwMjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNyArMTQxLDcg QEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBEaWREaXNwbGF5SW5zZWN1cmVDb250 ZW50Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJN ZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBEaWRSdW5JbnNlY3VyZUNvbnRl bnRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1l c3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZERldGVjdFhTU0ZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29k ZXIgdXNlckRhdGEpIFZhcmlhZGljCi0gICAgRGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90IHR5cGUsIFN0cmluZyB1cmwsIFdlYktpdDo6 SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCisgICAg RGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgdWludDMyX3QgdHlwZSwgU3RyaW5nIHVybCwgV2ViS2l0OjpJbmpl Y3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBEaWRE ZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiAKICAgICBGcmFtZURpZEJl Y29tZUZyYW1lU2V0KHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgdmFsdWUpCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDE3 MTAyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJLaXQ6OldlYlBhZ2VQcm94eSosIFdl YktpdDo6V2ViRnJhbWVQcm94eSosIHVpbnQ2NF90LCBBUEk6Ok9iamVjdCopIHsgfQogICAgIHZp cnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBX ZWJLaXQ6OldlYkZyYW1lUHJveHkqLCB1aW50NjRfdCwgQVBJOjpPYmplY3QqKSB7IH0KICAgICB2 aXJ0dWFsIHZvaWQgZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZShXZWJLaXQ6OldlYlBhZ2VQ cm94eSosIFdlYktpdDo6V2ViRnJhbWVQcm94eSosIHVpbnQ2NF90LCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yJiwgQVBJOjpPYmplY3QqKSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlkU2Ft ZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0 OjpXZWJGcmFtZVByb3h5KiwgV2ViS2l0OjpTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgQVBJ OjpPYmplY3QqKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlv bkZvckZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5Kiwg dWludDY0X3QsIFdlYktpdDo6U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUsIEFQSTo6T2JqZWN0 KikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdlYktpdDo6 V2ViUGFnZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcmLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkq LCBBUEk6Ok9iamVjdCopIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRGaXJzdExheW91dEZvckZy YW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgQVBJOjpP YmplY3QqKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRGVzdHJveU5hdmlnYXRpb24oV2ViS2l0 OjpXZWJQYWdlUHJveHkqLCB1aW50NjRfdCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMTcxMDIwKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzNSw3ICs4 MzUsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQoV0tQYWdlUmVmCiAgICAgICAg ICAgICBtX2NsaWVudC5kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0 b0FQSShmcmFtZSksIHRvQVBJKGVycm9yKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNl LmNsaWVudEluZm8pOwogICAgICAgICB9CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJv eHkqIGZyYW1lLCBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSB0eXBlLCBBUEk6Ok9iamVjdCog dXNlckRhdGEpIG92ZXJyaWRlCisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRTYW1lRG9jdW1lbnRO YXZpZ2F0aW9uRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFt ZSwgdWludDY0X3QsIFNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlIHR5cGUsIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSkgb3ZlcnJpZGUKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFtX2NsaWVu dC5kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRp b25EZWxlZ2F0ZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCShyZXZpc2lvbiAxNzEw MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRl bGVnYXRlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCwxMyBAQCBzdGF0aWMg Y29uc3QgV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5IF9XCiAKIHN0YXRpYyBjb25zdCBXS05hdmln YXRpb25SZXNwb25zZVBvbGljeSBfV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lCZWNvbWVEb3du bG9hZCA9IChXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSkoV0tOYXZpZ2F0aW9uUmVzcG9uc2VQ b2xpY3lBbGxvdyArIDEpOwogCit0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tTYW1lRG9j dW1lbnROYXZpZ2F0aW9uVHlwZSkgeworICAgIF9XS1NhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBl QW5jaG9yTmF2aWdhdGlvbiwKKyAgICBfV0tTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZVNlc3Np b25TdGF0ZVB1c2gsCisgICAgX1dLU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGVTZXNzaW9uU3Rh dGVSZXBsYWNlLAorICAgIF9XS1NhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlU2Vzc2lvblN0YXRl UG9wLAorfSBXS19BVkFJTEFCTEUoMTBfMTAsIDhfMCk7CisKIEBwcm90b2NvbCBXS05hdmlnYXRp b25EZWxlZ2F0ZVByaXZhdGUgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPgogCiBAb3B0aW9uYWwKQEAg LTQxLDYgKzQ4LDcgQEAgc3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IAog LSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBuYXZpZ2F0aW9uOihXS05hdmln YXRpb24gKiluYXZpZ2F0aW9uIGRpZEZhaWxQcm92aXNpb25hbExvYWRJblN1YmZyYW1lOihXS0Zy YW1lSW5mbyAqKXN1YmZyYW1lIHdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yOwogCiAtICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IG5hdmlnYXRpb25EaWRGaW5pc2hEb2N1bWVu dExvYWQ6KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb247CistICh2b2lkKV93ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IG5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24gZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbjooX1dLU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpbmF2 aWdhdGlvblR5cGU7CiAKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVu ZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6KF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzKXByb2dy ZXNzRXZlbnRzOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5oCShyZXZpc2lvbiAxNzEwMjApCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2 ICsxMDIsNyBAQCBwcml2YXRlOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6OldlYkZyYW1lUHJv eHkqLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIEFQSTo6T2JqZWN0Kikgb3ZlcnJpZGU7CiAgICAg ICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiwgV2Vi RnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgQVBJOjpPYmplY3QqKSBvdmVycmlk ZTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2Vi UGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIEFQSTo6T2JqZWN0Kikgb3ZlcnJpZGU7CisgICAgICAg IHZpcnR1YWwgdm9pZCBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUoV2ViUGFnZVBy b3h5KiwgV2ViRnJhbWVQcm94eSosIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU2FtZURvY3VtZW50 TmF2aWdhdGlvblR5cGUsIEFQSTo6T2JqZWN0Kikgb3ZlcnJpZGU7CiAgICAgICAgIHZpcnR1YWwg dm9pZCBkaWREZXN0cm95TmF2aWdhdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSosIHVpbnQ2NF90 IG5hdmlnYXRpb25JRCkgb3ZlcnJpZGU7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRMYXlvdXQo V2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJDb3JlOjpMYXlvdXRNaWxlc3RvbmVzLCBBUEk6Ok9i amVjdCopIG92ZXJyaWRlOwogICAgICAgICB2aXJ0dWFsIGJvb2wgY2FuQXV0aGVudGljYXRlQWdh aW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6 OldlYkZyYW1lUHJveHkqLCBXZWJLaXQ6OldlYlByb3RlY3Rpb25TcGFjZSopIG92ZXJyaWRlOwpA QCAtMTQ5LDYgKzE1MCw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgd2ViVmlld05hdmlnYXRp b25EaWRGaW5pc2hEb2N1bWVudExvYWQgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRGaW5p c2hOYXZpZ2F0aW9uIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25X aXRoRXJyb3IgOiAxOworICAgICAgICBib29sIHdlYlZpZXdOYXZpZ2F0aW9uRGlkU2FtZURvY3Vt ZW50TmF2aWdhdGlvbiA6IDE7CiAKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVuZGVyaW5nUHJvZ3Jl c3NEaWRDaGFuZ2UgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA6IDE7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHJldmlzaW9uIDE3 MTAyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUu bW0JKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2ICsxMzAsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0 ZTo6c2V0TmF2aWdhdGlvbkRlbGVnCiAKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMu d2ViVmlld05hdmlnYXRpb25EaWRGYWlsUHJvdmlzaW9uYWxMb2FkSW5TdWJmcmFtZVdpdGhFcnJv ciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3Om5hdmln YXRpb246ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEluU3ViZnJhbWU6d2l0aEVycm9yOildOwogICAg IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3TmF2aWdhdGlvbkRpZEZpbmlzaERv Y3VtZW50TG9hZCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3Om5hdmlnYXRpb25EaWRGaW5pc2hEb2N1bWVudExvYWQ6KV07CisgICAgbV9uYXZpZ2F0aW9u RGVsZWdhdGVNZXRob2RzLndlYlZpZXdOYXZpZ2F0aW9uRGlkU2FtZURvY3VtZW50TmF2aWdhdGlv biA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3Om5hdmln YXRpb246ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbjopXTsKICAgICBtX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlID0gW2RlbGVnYXRl IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVuZGVyaW5nUHJvZ3Jlc3NE aWRDaGFuZ2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRS ZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0 ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkUmVjZWl2ZUF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1fbmF2aWdhdGlvbkRl bGVnYXRlTWV0aG9kcy53ZWJWaWV3Q2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFj ZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmNhbkF1 dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2U6KV07CkBAIC01NjgsNiArNTY5LDQzIEBA IHZvaWQgTmF2aWdhdGlvblN0YXRlOjpMb2FkZXJDbGllbnQ6OmRpZEYKICAgICBbbmF2aWdhdGlv bkRlbGVnYXRlIHdlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRpZEZhaWxOYXZp Z2F0aW9uOm5hdmlnYXRpb24gd2l0aEVycm9yOmVycm9yV2l0aFJlY292ZXJ5QXR0ZW1wdGVyLmdl dCgpXTsKIH0KIAorc3RhdGljIF9XS1NhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlIHRvV0tTYW1l RG9jdW1lbnROYXZpZ2F0aW9uVHlwZShTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0 aW9uVHlwZSkKK3sKKyAgICBzd2l0Y2ggKG5hdmlnYXRpb25UeXBlKSB7CisgICAgY2FzZSBTYW1l RG9jdW1lbnROYXZpZ2F0aW9uQW5jaG9yTmF2aWdhdGlvbjoKKyAgICAgICAgcmV0dXJuIF9XS1Nh bWVEb2N1bWVudE5hdmlnYXRpb25UeXBlQW5jaG9yTmF2aWdhdGlvbjsKKyAgICBjYXNlIFNhbWVE b2N1bWVudE5hdmlnYXRpb25TZXNzaW9uU3RhdGVQdXNoOgorICAgICAgICByZXR1cm4gX1dLU2Ft ZURvY3VtZW50TmF2aWdhdGlvblR5cGVTZXNzaW9uU3RhdGVQdXNoOworICAgIGNhc2UgU2FtZURv Y3VtZW50TmF2aWdhdGlvblNlc3Npb25TdGF0ZVJlcGxhY2U6CisgICAgICAgIHJldHVybiBfV0tT YW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZVNlc3Npb25TdGF0ZVJlcGxhY2U7CisgICAgY2FzZSBT YW1lRG9jdW1lbnROYXZpZ2F0aW9uU2Vzc2lvblN0YXRlUG9wOgorICAgICAgICByZXR1cm4gX1dL U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGVTZXNzaW9uU3RhdGVQb3A7CisgICAgfQorCisgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIF9XS1NhbWVEb2N1bWVudE5hdmlnYXRp b25UeXBlQW5jaG9yTmF2aWdhdGlvbjsKK30KKwordm9pZCBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRl ckNsaWVudDo6ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdlYlBhZ2VQcm94eSos IFdlYkZyYW1lUHJveHkqIHdlYkZyYW1lUHJveHksIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU2Ft ZURvY3VtZW50TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIEFQSTo6T2JqZWN0KikKK3sK KyAgICBpZiAoIXdlYkZyYW1lUHJveHktPmlzTWFpbkZyYW1lKCkpCisgICAgICAgIHJldHVybjsK KworICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2Rz LndlYlZpZXdOYXZpZ2F0aW9uRGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbikKKyAgICAgICAgcmV0 dXJuOworCisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBtX25hdmlnYXRpb25TdGF0ZS5t X25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAoIW5hdmlnYXRpb25EZWxlZ2F0ZSkK KyAgICAgICAgcmV0dXJuOworCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhc3NlcnQgdGhhdCBu YXZpZ2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9y IHNvbWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KKyAgICBXS05hdmlnYXRp b24gKm5hdmlnYXRpb24gPSBuaWw7CisgICAgaWYgKG5hdmlnYXRpb25JRCkKKyAgICAgICAgbmF2 aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbnMuZ2V0KG5hdmlnYXRpb25J RCkuZ2V0KCk7CisKKyAgICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJp dmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3Rh dGUubV93ZWJWaWV3IG5hdmlnYXRpb246bmF2aWdhdGlvbiBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uOnRvV0tTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZShuYXZpZ2F0aW9uVHlwZSldOworfQor CiB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TG9hZGVyQ2xpZW50OjpkaWREZXN0cm95TmF2aWdhdGlv bihXZWJQYWdlUHJveHkqLCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiB7CiAgICAgbV9uYXZpZ2F0 aW9uU3RhdGUubV9uYXZpZ2F0aW9ucy5yZW1vdmUobmF2aWdhdGlvbklEKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAxNzEwMjApCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzI4LDcgKzMyOCw4IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkQ2gKICAgICB3ZWJQYWdlLT5pbmplY3RlZEJ1bmRsZUxvYWRlckNs aWVudCgpLmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh3ZWJQYWdlLCBtX2ZyYW1l LCBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uQW5jaG9yTmF2aWdhdGlvbiwgdXNlckRhdGEpOwogCiAg ICAgLy8gTm90aWZ5IHRoZSBVSVByb2Nlc3MuCi0gICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUobV9mcmFtZS0+ ZnJhbWVJRCgpLCBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uQW5jaG9yTmF2aWdhdGlvbiwgbV9mcmFt ZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpLnN0cmluZygpLCBJbmplY3RlZEJ1bmRs ZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkpKTsKKyAgICBXZWJEb2N1bWVudExv YWRlciYgZG9jdW1lbnRMb2FkZXIgPSBzdGF0aWNfY2FzdDxXZWJEb2N1bWVudExvYWRlciY+KCpt X2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSk7CisgICAgd2Vi UGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBkb2N1bWVudExvYWRlci5uYXZpZ2F0aW9u SUQoKSwgU2FtZURvY3VtZW50TmF2aWdhdGlvbkFuY2hvck5hdmlnYXRpb24sIG1fZnJhbWUtPmNv cmVGcmFtZSgpLT5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmcoKSwgSW5qZWN0ZWRCdW5kbGVVc2Vy TWVzc2FnZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkUHVzaFN0YXRlV2l0aGluUGFnZSgpCkBAIC0zNDMsNyArMzQ0 LDggQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRQdQogICAgIHdlYlBh Z2UtPmluamVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KCkuZGlkU2FtZURvY3VtZW50TmF2aWdhdGlv bkZvckZyYW1lKHdlYlBhZ2UsIG1fZnJhbWUsIFNhbWVEb2N1bWVudE5hdmlnYXRpb25TZXNzaW9u U3RhdGVQdXNoLCB1c2VyRGF0YSk7CiAKICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KLSAg ICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFNhbWVEb2N1bWVudE5h dmlnYXRpb25Gb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCksIFNhbWVEb2N1bWVudE5hdmlnYXRp b25TZXNzaW9uU3RhdGVQdXNoLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJs KCkuc3RyaW5nKCksIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLmdl dCgpKSkpOworICAgIFdlYkRvY3VtZW50TG9hZGVyJiBkb2N1bWVudExvYWRlciA9IHN0YXRpY19j YXN0PFdlYkRvY3VtZW50TG9hZGVyJj4oKm1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5k b2N1bWVudExvYWRlcigpKTsKKyAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCks IGRvY3VtZW50TG9hZGVyLm5hdmlnYXRpb25JRCgpLCBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uU2Vz c2lvblN0YXRlUHVzaCwgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpLnN0 cmluZygpLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkp KTsKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3Rh dGVXaXRoaW5QYWdlKCkKQEAgLTM1OCw3ICszNjAsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZFJlCiAgICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGll bnQoKS5kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUod2ViUGFnZSwgbV9mcmFtZSwg U2FtZURvY3VtZW50TmF2aWdhdGlvblNlc3Npb25TdGF0ZVJlcGxhY2UsIHVzZXJEYXRhKTsKIAog ICAgIC8vIE5vdGlmeSB0aGUgVUlQcm9jZXNzLgotICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKG1fZnJhbWUt PmZyYW1lSUQoKSwgU2FtZURvY3VtZW50TmF2aWdhdGlvblNlc3Npb25TdGF0ZVJlcGxhY2UsIG1f ZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmcoKSwgSW5qZWN0ZWRC dW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7CisgICAgV2ViRG9jdW1l bnRMb2FkZXImIGRvY3VtZW50TG9hZGVyID0gc3RhdGljX2Nhc3Q8V2ViRG9jdW1lbnRMb2FkZXIm PigqbV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpOworICAg IHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQoKSwgZG9jdW1lbnRMb2FkZXIubmF2aWdh dGlvbklEKCksIFNhbWVEb2N1bWVudE5hdmlnYXRpb25TZXNzaW9uU3RhdGVSZXBsYWNlLCBtX2Zy YW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCksIEluamVjdGVkQnVu ZGxlVXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLmdldCgpKSkpOwogfQogCiB2b2lkIFdlYkZy YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGluUGFnZSgpCkBAIC0zNzMs NyArMzc2LDggQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRQbwogICAg IHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KCkuZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lKHdlYlBhZ2UsIG1fZnJhbWUsIFNhbWVEb2N1bWVudE5hdmlnYXRpb25T ZXNzaW9uU3RhdGVQb3AsIHVzZXJEYXRhKTsKIAogICAgIC8vIE5vdGlmeSB0aGUgVUlQcm9jZXNz LgotICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkU2FtZURvY3Vt ZW50TmF2aWdhdGlvbkZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQoKSwgU2FtZURvY3VtZW50TmF2 aWdhdGlvblNlc3Npb25TdGF0ZVBvcCwgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCkt PnVybCgpLnN0cmluZygpLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0 YS5nZXQoKSkpKTsKKyAgICBXZWJEb2N1bWVudExvYWRlciYgZG9jdW1lbnRMb2FkZXIgPSBzdGF0 aWNfY2FzdDxXZWJEb2N1bWVudExvYWRlciY+KCptX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVy KCkuZG9jdW1lbnRMb2FkZXIoKSk7CisgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJ RCgpLCBkb2N1bWVudExvYWRlci5uYXZpZ2F0aW9uSUQoKSwgU2FtZURvY3VtZW50TmF2aWdhdGlv blNlc3Npb25TdGF0ZVBvcCwgbV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnVybCgp LnN0cmluZygpLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQo KSkpKTsKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsQ2xvc2Uo KQo=