107088 2013-01-16 20:29:12 -0800 Make debug-safari --target-web-process work again 2013-01-16 20:59:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam dbates webkit.review.bot oldest_to_newest 809022 0 sam 2013-01-16 20:29:12 -0800 Make debug-safari --target-web-process work again 809028 1 183107 sam 2013-01-16 20:37:34 -0800 Created attachment 183107 Patch 809043 2 sam 2013-01-16 20:59:30 -0800 Committed r139961: <http://trac.webkit.org/changeset/139961> 183107 2013-01-16 20:37:34 -0800 2013-01-16 20:55:03 -0800 Patch bug-107088-20130116203435.patch text/plain 11699 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzOTk1OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTE2ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBkZWJ1Zy1zYWZhcmkgLS10YXJn ZXQtd2ViLXByb2Nlc3Mgd29yayBhZ2FpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgLS10YXJnZXQtd2ViLXByb2Nlc3Mgd2FzIG1hZGUgaGFyZGVyIHRv IHVzZSBkdXJpbmcgcmVjZW50IHJlZmFjdG9yaW5nCisgICAgICAgIGJ5IHJlcXVpcmluZyB1c2Vy cyB0byBwYXNzIGEgLXVpLXByb2Nlc3MtbmFtZSBwYXJhbWV0ZXIgaW4gYWRkaXRpb24gdG8KKyAg ICAgICAgdGhlIC1jbGllbnQtZXhlY3V0YWJsZS4gSW5zdGVhZCwgd2Ugc2hvdWxkIGNvbmp1cmUg dXAgdGhhdCBuYW1lIGZyb20KKyAgICAgICAgdGhlIGluZm9ybWF0aW9uIHdlIGFscmVhZHkgaGF2 ZSBhdCBvdXIgZGlzcG9zYWwuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNz TWFpbk1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW5EZWxlZ2F0ZTo6Z2V0 Q29ubmVjdGlvbklkZW50aWZpZXIpOgorICAgICAgICBTaW1wbGlmeSBieSBtYWtpbmcgdGhlIG5v bi1jbGllbnQtZXhlY3V0YWJsZSBwYXRoIHVzZSB0aGUgYmFzZQorICAgICAgICBjbGFzcyBpbXBs ZW1lbnRhdGlvbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzTWFpbkRlbGVnYXRlOjpn ZXRDbGllbnRJZGVudGlmaWVyKToKKyAgICAgICAgRGl0dG8uCisKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc01haW5EZWxlZ2F0ZTo6Z2V0Q2xpZW50UHJvY2Vzc05hbWUpOgorICAgICAgICBB ZGRlZC4gQ3JlYXRlIGEgY2xpZW50IHByb2Nlc3MgbmFtZSAoaXRzIGFjdHVhbGx5IG5vdCB0b28g aW1wb3J0YW50IHdoYXQgaXQgaXMsIGFzIGl0CisgICAgICAgIGlzIG9ubHkgdXNlZCB0byBzaG93 IGEgbmFtZSBpbiBBY3Rpdml0eSBNb25pdG9yKSBmcm9tIHRoZSBwYXNzZWQgaW4gY2xpZW50IGV4 ZWN1dGFibGUKKyAgICAgICAgcGF0aC4KKwogMjAxMy0wMS0xNiAgU2FtIFdlaW5pZyAgPHNhbUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBPd25lcnMgZmlsZS4KSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWluTWFjLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWluTWFjLm1tCShyZXZp c2lvbiAxMzk5NDYpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNz TWFpbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjAsNjggKzYwLDU4IEBAIHB1YmxpYzoKIAog ICAgIHZpcnR1YWwgYm9vbCBnZXRDb25uZWN0aW9uSWRlbnRpZmllcihDb3JlSVBDOjpDb25uZWN0 aW9uOjpJZGVudGlmaWVyJiBpZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgU3RyaW5nIHNlcnZp Y2VOYW1lID0gbV9jb21tYW5kTGluZVsic2VydmljZW5hbWUiXTsKICAgICAgICAgU3RyaW5nIGNs aWVudEV4ZWN1dGFibGUgPSBtX2NvbW1hbmRMaW5lWyJjbGllbnQtZXhlY3V0YWJsZSJdOwotICAg ICAgICBpZiAoc2VydmljZU5hbWUuaXNFbXB0eSgpICYmIGNsaWVudEV4ZWN1dGFibGUuaXNFbXB0 eSgpKQorICAgICAgICBpZiAoY2xpZW50RXhlY3V0YWJsZS5pc0VtcHR5KCkpCisgICAgICAgICAg ICByZXR1cm4gQ2hpbGRQcm9jZXNzTWFpbkRlbGVnYXRlOjpnZXRDb25uZWN0aW9uSWRlbnRpZmll cihpZGVudGlmaWVyKTsKKworICAgICAgICBtYWNoX3BvcnRfbmFtZV90IHB1Ymxpc2hlZFNlcnZp Y2U7CisgICAgICAgIG1hY2hfcG9ydF9hbGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCBNQUNIX1BP UlRfUklHSFRfUkVDRUlWRSwgJnB1Ymxpc2hlZFNlcnZpY2UpOworICAgICAgICBtYWNoX3BvcnRf aW5zZXJ0X3JpZ2h0KG1hY2hfdGFza19zZWxmKCksIHB1Ymxpc2hlZFNlcnZpY2UsIHB1Ymxpc2hl ZFNlcnZpY2UsIE1BQ0hfTVNHX1RZUEVfTUFLRV9TRU5EKTsKKyAgICAgICAgLy8gTWFrZSBpdCBw b3NzaWJsZSB0byBsb29rIHVwLgorICAgICAgICBTdHJpbmcgc2VydmljZU5hbWUgPSBTdHJpbmc6 OmZvcm1hdCgiY29tLmFwcGxlLldlYktpdC5XZWJQcm9jZXNzLSVkIiwgZ2V0cGlkKCkpOworICAg ICAgICBpZiAoa2Vybl9yZXR1cm5fdCBrciA9IGJvb3RzdHJhcF9yZWdpc3RlcjIoYm9vdHN0cmFw X3BvcnQsIGNvbnN0X2Nhc3Q8Y2hhcio+KHNlcnZpY2VOYW1lLnV0ZjgoKS5kYXRhKCkpLCBwdWJs aXNoZWRTZXJ2aWNlLCAwKSkgeworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJGYWlsZWQgdG8g cmVnaXN0ZXIgc2VydmljZSBuYW1lIFwiJXNcIi4gJXMgKCV4KVxuIiwgc2VydmljZU5hbWUudXRm OCgpLmRhdGEoKSwgbWFjaF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIH0KKworICAgICAgICBDU3RyaW5nIGNvbW1hbmQgPSBjbGllbnRF eGVjdXRhYmxlLnV0ZjgoKTsKKyAgICAgICAgY29uc3QgY2hhciogYXJnc1tdID0geyBjb21tYW5k LmRhdGEoKSwgMCB9OworCisgICAgICAgIEVudmlyb25tZW50VmFyaWFibGVzIGVudmlyb25tZW50 VmFyaWFibGVzOworICAgICAgICBlbnZpcm9ubWVudFZhcmlhYmxlcy5zZXQoRW52aXJvbm1lbnRW YXJpYWJsZXM6OnByZWV4aXN0aW5nUHJvY2Vzc1NlcnZpY2VOYW1lS2V5KCksIHNlcnZpY2VOYW1l LnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBlbnZpcm9ubWVudFZhcmlhYmxlcy5zZXQoRW52aXJv bm1lbnRWYXJpYWJsZXM6OnByZWV4aXN0aW5nUHJvY2Vzc1R5cGVLZXkoKSwgbV9jb21tYW5kTGlu ZVsidHlwZSJdLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIHBvc2l4X3NwYXduX2ZpbGVfYWN0 aW9uc190IGZpbGVBY3Rpb25zOworICAgICAgICBwb3NpeF9zcGF3bl9maWxlX2FjdGlvbnNfaW5p dCgmZmlsZUFjdGlvbnMpOworICAgICAgICBwb3NpeF9zcGF3bl9maWxlX2FjdGlvbnNfYWRkaW5o ZXJpdF9ucCgmZmlsZUFjdGlvbnMsIFNURElOX0ZJTEVOTyk7CisgICAgICAgIHBvc2l4X3NwYXdu X2ZpbGVfYWN0aW9uc19hZGRpbmhlcml0X25wKCZmaWxlQWN0aW9ucywgU1RET1VUX0ZJTEVOTyk7 CisgICAgICAgIHBvc2l4X3NwYXduX2ZpbGVfYWN0aW9uc19hZGRpbmhlcml0X25wKCZmaWxlQWN0 aW9ucywgU1RERVJSX0ZJTEVOTyk7CisKKyAgICAgICAgcG9zaXhfc3Bhd25hdHRyX3QgYXR0cmli dXRlczsKKyAgICAgICAgcG9zaXhfc3Bhd25hdHRyX2luaXQoJmF0dHJpYnV0ZXMpOworICAgICAg ICBwb3NpeF9zcGF3bmF0dHJfc2V0ZmxhZ3MoJmF0dHJpYnV0ZXMsIFBPU0lYX1NQQVdOX0NMT0VY RUNfREVGQVVMVCB8IFBPU0lYX1NQQVdOX1NFVFBHUk9VUCk7CiAKLSAgICAgICAgbWFjaF9wb3J0 X3Qgc2VydmVyUG9ydDsKLSAgICAgICAgaWYgKGNsaWVudEV4ZWN1dGFibGUuaXNFbXB0eSgpKSB7 Ci0gICAgICAgICAgICBrZXJuX3JldHVybl90IGtyID0gYm9vdHN0cmFwX2xvb2tfdXAoYm9vdHN0 cmFwX3BvcnQsIHNlcnZpY2VOYW1lLnV0ZjgoKS5kYXRhKCksICZzZXJ2ZXJQb3J0KTsKLSAgICAg ICAgICAgIGlmIChrcikgewotICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiYm9vdHN0cmFw X2xvb2tfdXAgcmVzdWx0OiAlcyAoJXgpXG4iLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsK LSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICBtYWNoX3BvcnRfbmFtZV90IHB1Ymxpc2hlZFNlcnZpY2U7Ci0g ICAgICAgICAgICBtYWNoX3BvcnRfYWxsb2NhdGUobWFjaF90YXNrX3NlbGYoKSwgTUFDSF9QT1JU X1JJR0hUX1JFQ0VJVkUsICZwdWJsaXNoZWRTZXJ2aWNlKTsKLSAgICAgICAgICAgIG1hY2hfcG9y dF9pbnNlcnRfcmlnaHQobWFjaF90YXNrX3NlbGYoKSwgcHVibGlzaGVkU2VydmljZSwgcHVibGlz aGVkU2VydmljZSwgTUFDSF9NU0dfVFlQRV9NQUtFX1NFTkQpOwotICAgICAgICAgICAgLy8gTWFr ZSBpdCBwb3NzaWJsZSB0byBsb29rIHVwLgotICAgICAgICAgICAgc2VydmljZU5hbWUgPSBTdHJp bmc6OmZvcm1hdCgiY29tLmFwcGxlLldlYktpdC5XZWJQcm9jZXNzLSVkIiwgZ2V0cGlkKCkpOwot ICAgICAgICAgICAgaWYgKGtlcm5fcmV0dXJuX3Qga3IgPSBib290c3RyYXBfcmVnaXN0ZXIyKGJv b3RzdHJhcF9wb3J0LCBjb25zdF9jYXN0PGNoYXIqPihzZXJ2aWNlTmFtZS51dGY4KCkuZGF0YSgp KSwgcHVibGlzaGVkU2VydmljZSwgMCkpIHsKLSAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMo IkZhaWxlZCB0byByZWdpc3RlciBzZXJ2aWNlIG5hbWUgXCIlc1wiLiAlcyAoJXgpXG4iLCBzZXJ2 aWNlTmFtZS51dGY4KCkuZGF0YSgpLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKLSAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIENT dHJpbmcgY29tbWFuZCA9IGNsaWVudEV4ZWN1dGFibGUudXRmOCgpOwotICAgICAgICAgICAgY29u c3QgY2hhciogYXJnc1tdID0geyBjb21tYW5kLmRhdGEoKSwgMCB9OwotCi0gICAgICAgICAgICBF bnZpcm9ubWVudFZhcmlhYmxlcyBlbnZpcm9ubWVudFZhcmlhYmxlczsKLSAgICAgICAgICAgIGVu dmlyb25tZW50VmFyaWFibGVzLnNldChFbnZpcm9ubWVudFZhcmlhYmxlczo6cHJlZXhpc3RpbmdQ cm9jZXNzU2VydmljZU5hbWVLZXkoKSwgc2VydmljZU5hbWUudXRmOCgpLmRhdGEoKSk7Ci0gICAg ICAgICAgICBlbnZpcm9ubWVudFZhcmlhYmxlcy5zZXQoRW52aXJvbm1lbnRWYXJpYWJsZXM6OnBy ZWV4aXN0aW5nUHJvY2Vzc1R5cGVLZXkoKSwgbV9jb21tYW5kTGluZVsidHlwZSJdLnV0ZjgoKS5k YXRhKCkpOwotCi0gICAgICAgICAgICBwb3NpeF9zcGF3bl9maWxlX2FjdGlvbnNfdCBmaWxlQWN0 aW9uczsKLSAgICAgICAgICAgIHBvc2l4X3NwYXduX2ZpbGVfYWN0aW9uc19pbml0KCZmaWxlQWN0 aW9ucyk7Ci0gICAgICAgICAgICBwb3NpeF9zcGF3bl9maWxlX2FjdGlvbnNfYWRkaW5oZXJpdF9u cCgmZmlsZUFjdGlvbnMsIFNURElOX0ZJTEVOTyk7Ci0gICAgICAgICAgICBwb3NpeF9zcGF3bl9m aWxlX2FjdGlvbnNfYWRkaW5oZXJpdF9ucCgmZmlsZUFjdGlvbnMsIFNURE9VVF9GSUxFTk8pOwot ICAgICAgICAgICAgcG9zaXhfc3Bhd25fZmlsZV9hY3Rpb25zX2FkZGluaGVyaXRfbnAoJmZpbGVB Y3Rpb25zLCBTVERFUlJfRklMRU5PKTsKLQotICAgICAgICAgICAgcG9zaXhfc3Bhd25hdHRyX3Qg YXR0cmlidXRlczsKLSAgICAgICAgICAgIHBvc2l4X3NwYXduYXR0cl9pbml0KCZhdHRyaWJ1dGVz KTsKLSAgICAgICAgICAgIHBvc2l4X3NwYXduYXR0cl9zZXRmbGFncygmYXR0cmlidXRlcywgUE9T SVhfU1BBV05fQ0xPRVhFQ19ERUZBVUxUIHwgUE9TSVhfU1BBV05fU0VUUEdST1VQKTsKLQotICAg ICAgICAgICAgaW50IHNwYXduUmVzdWx0ID0gcG9zaXhfc3Bhd24oMCwgY29tbWFuZC5kYXRhKCks ICZmaWxlQWN0aW9ucywgJmF0dHJpYnV0ZXMsIGNvbnN0X2Nhc3Q8Y2hhcioqPihhcmdzKSwgZW52 aXJvbm1lbnRWYXJpYWJsZXMuZW52aXJvbm1lbnRQb2ludGVyKCkpOwotCi0gICAgICAgICAgICBw b3NpeF9zcGF3bmF0dHJfZGVzdHJveSgmYXR0cmlidXRlcyk7Ci0gICAgICAgICAgICBwb3NpeF9z cGF3bl9maWxlX2FjdGlvbnNfZGVzdHJveSgmZmlsZUFjdGlvbnMpOwotCi0gICAgICAgICAgICBp ZiAoc3Bhd25SZXN1bHQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAg ICAgICBtYWNoX21zZ19lbXB0eV9yY3ZfdCBtZXNzYWdlOwotICAgICAgICAgICAgaWYgKGtlcm5f cmV0dXJuX3Qga3IgPSBtYWNoX21zZygmbWVzc2FnZS5oZWFkZXIsIE1BQ0hfUkNWX01TRywgMCwg c2l6ZW9mKG1lc3NhZ2UpLCBwdWJsaXNoZWRTZXJ2aWNlLCBNQUNIX01TR19USU1FT1VUX05PTkUs IE1BQ0hfUE9SVF9OVUxMKSkgewotICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRmFpbGVk IHRvIHJlY2VpdmUgcG9ydCBmcm9tIHRoZSBVSSBwcm9jZXNzLiAlcyAoJXgpXG4iLCBtYWNoX2Vy cm9yX3N0cmluZyhrciksIGtyKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1hY2hfcG9ydF9tb2RfcmVmcyhtYWNoX3Rhc2tfc2Vs ZigpLCBwdWJsaXNoZWRTZXJ2aWNlLCBNQUNIX1BPUlRfUklHSFRfUkVDRUlWRSwgLTEpOwotICAg ICAgICAgICAgc2VydmVyUG9ydCA9IG1lc3NhZ2UuaGVhZGVyLm1zZ2hfcmVtb3RlX3BvcnQ7Ci0g ICAgICAgICAgICBtYWNoX3BvcnRfdHlwZV90IHBvcnRUeXBlOwotICAgICAgICAgICAga2Vybl9y ZXR1cm5fdCBrciA9IG1hY2hfcG9ydF90eXBlKG1hY2hfdGFza19zZWxmKCksIHNlcnZlclBvcnQs ICZwb3J0VHlwZSk7Ci0gICAgICAgICAgICBpZiAoa3IgfHwgIShwb3J0VHlwZSAmIE1BQ0hfUE9S VF9UWVBFX1NFTkQpKSB7Ci0gICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJGYWlsZWQgdG8g b2J0YWluIHNlbmQgcmlnaHQgZm9yIHBvcnQgcmVjZWl2ZWQgZnJvbSB0aGUgVUkgcHJvY2Vzcy5c biIpOwotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KKyAgICAg ICAgaW50IHNwYXduUmVzdWx0ID0gcG9zaXhfc3Bhd24oMCwgY29tbWFuZC5kYXRhKCksICZmaWxl QWN0aW9ucywgJmF0dHJpYnV0ZXMsIGNvbnN0X2Nhc3Q8Y2hhcioqPihhcmdzKSwgZW52aXJvbm1l bnRWYXJpYWJsZXMuZW52aXJvbm1lbnRQb2ludGVyKCkpOworCisgICAgICAgIHBvc2l4X3NwYXdu YXR0cl9kZXN0cm95KCZhdHRyaWJ1dGVzKTsKKyAgICAgICAgcG9zaXhfc3Bhd25fZmlsZV9hY3Rp b25zX2Rlc3Ryb3koJmZpbGVBY3Rpb25zKTsKKworICAgICAgICBpZiAoc3Bhd25SZXN1bHQpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgbWFjaF9tc2dfZW1wdHlfcmN2X3Qg bWVzc2FnZTsKKyAgICAgICAgaWYgKGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21zZygmbWVzc2Fn ZS5oZWFkZXIsIE1BQ0hfUkNWX01TRywgMCwgc2l6ZW9mKG1lc3NhZ2UpLCBwdWJsaXNoZWRTZXJ2 aWNlLCBNQUNIX01TR19USU1FT1VUX05PTkUsIE1BQ0hfUE9SVF9OVUxMKSkgeworICAgICAgICAg ICAgV1RGTG9nQWx3YXlzKCJGYWlsZWQgdG8gcmVjZWl2ZSBwb3J0IGZyb20gdGhlIFVJIHByb2Nl c3MuICVzICgleClcbiIsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICB9CisKKyAgICAgICAgbWFjaF9wb3J0X21vZF9yZWZzKG1h Y2hfdGFza19zZWxmKCksIHB1Ymxpc2hlZFNlcnZpY2UsIE1BQ0hfUE9SVF9SSUdIVF9SRUNFSVZF LCAtMSk7CisgICAgICAgIG1hY2hfcG9ydF90IHNlcnZlclBvcnQgPSBtZXNzYWdlLmhlYWRlci5t c2doX3JlbW90ZV9wb3J0OworICAgICAgICBtYWNoX3BvcnRfdHlwZV90IHBvcnRUeXBlOworICAg ICAgICBrZXJuX3JldHVybl90IGtyID0gbWFjaF9wb3J0X3R5cGUobWFjaF90YXNrX3NlbGYoKSwg c2VydmVyUG9ydCwgJnBvcnRUeXBlKTsKKyAgICAgICAgaWYgKGtyIHx8ICEocG9ydFR5cGUgJiBN QUNIX1BPUlRfVFlQRV9TRU5EKSkgeworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJGYWlsZWQg dG8gb2J0YWluIHNlbmQgcmlnaHQgZm9yIHBvcnQgcmVjZWl2ZWQgZnJvbSB0aGUgVUkgcHJvY2Vz cy5cbiIpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKICAgICAgICAg aWRlbnRpZmllciA9IHNlcnZlclBvcnQ7CkBAIC0xMzEsMjAgKzEyMSwzMiBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBib29sIGdldENsaWVudElkZW50aWZpZXIoU3RyaW5nJiBjbGllbnRJZGVudGlm aWVyKQogICAgIHsKICAgICAgICAgU3RyaW5nIGNsaWVudEV4ZWN1dGFibGUgPSBtX2NvbW1hbmRM aW5lWyJjbGllbnQtZXhlY3V0YWJsZSJdOwotCiAgICAgICAgIGlmIChjbGllbnRFeGVjdXRhYmxl LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGNsaWVudElkZW50aWZpZXIgPSBtX2NvbW1hbmRMaW5l WyJjbGllbnQtaWRlbnRpZmllciJdOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIFJldGFp blB0cjxOU1VSTD4gY2xpZW50RXhlY3V0YWJsZVVSTCA9IGFkb3B0TlMoW1tOU1VSTCBhbGxvY10g aW5pdEZpbGVVUkxXaXRoUGF0aDpuc1N0cmluZ0Zyb21XZWJDb3JlU3RyaW5nKGNsaWVudEV4ZWN1 dGFibGUpXSk7Ci0gICAgICAgICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGNsaWVudEJ1bmRsZVVS TCA9IGFkb3B0Q0YoV0tDb3B5QnVuZGxlVVJMRm9yRXhlY3V0YWJsZVVSTCgoQ0ZVUkxSZWYpY2xp ZW50RXhlY3V0YWJsZVVSTC5nZXQoKSkpOwotICAgICAgICAgICAgUmV0YWluUHRyPE5TQnVuZGxl PiBjbGllbnRCdW5kbGUgPSBhZG9wdE5TKFtbTlNCdW5kbGUgYWxsb2NdIGluaXRXaXRoVVJMOihO U1VSTCAqKWNsaWVudEJ1bmRsZVVSTC5nZXQoKV0pOwotICAgICAgICAgICAgY2xpZW50SWRlbnRp ZmllciA9IFtjbGllbnRCdW5kbGUuZ2V0KCkgYnVuZGxlSWRlbnRpZmllcl07Ci0gICAgICAgIH0K KyAgICAgICAgICAgIHJldHVybiBDaGlsZFByb2Nlc3NNYWluRGVsZWdhdGU6OmdldENsaWVudElk ZW50aWZpZXIoY2xpZW50SWRlbnRpZmllcik7CiAKKyAgICAgICAgUmV0YWluUHRyPE5TVVJMPiBj bGllbnRFeGVjdXRhYmxlVVJMID0gYWRvcHROUyhbW05TVVJMIGFsbG9jXSBpbml0RmlsZVVSTFdp dGhQYXRoOm5zU3RyaW5nRnJvbVdlYkNvcmVTdHJpbmcoY2xpZW50RXhlY3V0YWJsZSldKTsKKyAg ICAgICAgUmV0YWluUHRyPENGVVJMUmVmPiBjbGllbnRCdW5kbGVVUkwgPSBhZG9wdENGKFdLQ29w eUJ1bmRsZVVSTEZvckV4ZWN1dGFibGVVUkwoKENGVVJMUmVmKWNsaWVudEV4ZWN1dGFibGVVUkwu Z2V0KCkpKTsKKyAgICAgICAgUmV0YWluUHRyPE5TQnVuZGxlPiBjbGllbnRCdW5kbGUgPSBhZG9w dE5TKFtbTlNCdW5kbGUgYWxsb2NdIGluaXRXaXRoVVJMOihOU1VSTCAqKWNsaWVudEJ1bmRsZVVS TC5nZXQoKV0pOworICAgICAgICBjbGllbnRJZGVudGlmaWVyID0gW2NsaWVudEJ1bmRsZS5nZXQo KSBidW5kbGVJZGVudGlmaWVyXTsKICAgICAgICAgaWYgKGNsaWVudElkZW50aWZpZXIuaXNFbXB0 eSgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CisKKyAgICB2aXJ0dWFsIGJvb2wgZ2V0Q2xpZW50UHJvY2Vzc05hbWUoU3RyaW5nJiBjbGll bnRQcm9jZXNzTmFtZSkKKyAgICB7CisgICAgICAgIFN0cmluZyBjbGllbnRFeGVjdXRhYmxlID0g bV9jb21tYW5kTGluZVsiY2xpZW50LWV4ZWN1dGFibGUiXTsKKyAgICAgICAgaWYgKGNsaWVudEV4 ZWN1dGFibGUuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIENoaWxkUHJvY2Vzc01haW5E ZWxlZ2F0ZTo6Z2V0Q2xpZW50UHJvY2Vzc05hbWUoY2xpZW50UHJvY2Vzc05hbWUpOworCisgICAg ICAgIC8vIENvbmp1cmUgdXAgYSBwcm9jZXNzIG5hbWUgYnkgdXNpbmcgZXZlcnl0aGluZyBhZnRl ciB0aGUgbGFzdCBzbGFzaCBmcm9tIHRoZSBjbGllbnQtZXhlY3V0YWJsZSwKKyAgICAgICAgLy8g ZS5nLiAvQXBwbGljYXRpb25zL1NhZmFyaS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJpIGJlY29t ZXMgU2FmYXJpLgorICAgICAgICBzaXplX3QgbGFzdFNsYXNoID0gY2xpZW50RXhlY3V0YWJsZS5y ZXZlcnNlRmluZCgnLycpOworICAgICAgICBjbGllbnRQcm9jZXNzTmFtZSA9IGNsaWVudEV4ZWN1 dGFibGUuc3Vic3RyaW5nKGxhc3RTbGFzaCArIDEpOworICAgICAgICBpZiAoY2xpZW50UHJvY2Vz c05hbWUuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CiB9OwogCiBpbnQgV2ViUHJvY2Vzc01haW4oY29uc3QgQ29tbWFuZExp bmUmIGNvbW1hbmRMaW5lKQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTM5OTU4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDEtMTYgIFNhbSBXZWluaWcgIDxzYW1A d2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIGRlYnVnLXNhZmFyaSAtLXRhcmdldC13ZWItcHJv Y2VzcyB3b3JrIGFnYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDcwODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGV4ZWNNYWNXZWJLaXRB cHBGb3JEZWJ1Z2dpbmcpOgorICAgICAgICBUaGUgc2hpbSBpcyBub3cgY2FsbGVkIFNlY0l0ZW1T aGltLgorCiAyMDEzLTAxLTE2ICBBbGFuIEN1dHRlciAgPGFsYW5jdXR0ZXJAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIEdDRSBidWlsZCBzY3JpcHRzIGRvbid0IHRha2Ugd29ya2luZyBkaXJlY3Rv cnkgaW50byBhY2NvdW50IHdoZW4gY2FsbGluZyBmaW5kem9uZS5zaApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQkocmV2aXNpb24gMTM5OTMzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3 b3JraW5nIGNvcHkpCkBAIC0yNjg1LDcgKzI2ODUsNyBAQCBzdWIgZXhlY01hY1dlYktpdEFwcEZv ckRlYnVnZ2luZygkKQogICAgICAgICAgICAgZGllICJUYXJnZXR0aW5nIHRoZSBXZWIgUHJvY2Vz cyBpcyBub3QgY29tcGF0aWJsZSB3aXRoIHVzaW5nIGFuIFhQQyBTZXJ2aWNlIGZvciB0aGUgV2Vi IFByb2Nlc3MgYXQgdGhpcyB0aW1lLiI7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIG15 ICR3ZWJQcm9jZXNzU2hpbVBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcm9kdWN0RGlyLCAi V2ViUHJvY2Vzc1NoaW0uZHlsaWIiKTsKKyAgICAgICAgbXkgJHdlYlByb2Nlc3NTaGltUGF0aCA9 IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHByb2R1Y3REaXIsICJTZWNJdGVtU2hpbS5keWxpYiIpOwog ICAgICAgICBteSAkd2ViUHJvY2Vzc1BhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoJHByb2R1Y3RE aXIsICJXZWJQcm9jZXNzLmFwcCIpOwogICAgICAgICBteSAkd2ViS2l0MkV4ZWN1dGFibGVQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJvZHVjdERpciwgIldlYktpdDIuZnJhbWV3b3JrIiwg IldlYktpdDIiKTsKIAo=