142961 2015-03-23 00:59:22 -0700 Add a share item to the link action menu 2015-03-23 11:40:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin oldest_to_newest 1079237 0 thorton 2015-03-23 00:59:22 -0700 Add a share item to the link action menu 1079238 1 249224 thorton 2015-03-23 01:00:05 -0700 Created attachment 249224 Patch 1079319 2 thorton 2015-03-23 11:40:05 -0700 http://trac.webkit.org/changeset/181858 249224 2015-03-23 01:00:05 -0700 2015-03-23 10:49:57 -0700 Patch bug-142961-20150323005930.patch text/plain 17668 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTA0OWMwYThiYzZhMTdh YzUxMTQ5ZGZjOTQ5NDdkMmUxZjdkOTcyYS4uY2JjMDRjYmNiOGNiZWY1YmVjMDM1ZjAxZjU3OWYx NTlhMjQ3MDIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAzLTIzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHNoYXJl IGl0ZW0gdG8gdGhlIGxpbmsgYWN0aW9uIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mjk2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkx OTgzNzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBFbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6CisgICAgICAgIFJlbW92ZSBzb21l IG5vdy11bnVzZWQgc3RyaW5ncy4KKworICAgICAgICAqIHBsYXRmb3JtL3NwaS9tYWMvTlNNZW51 U1BJLmg6CisgICAgICAgIEFkZCBzb21lIFNQSS4KKwogMjAxNS0wMy0yMiAgRXJpYyBDYXJsc29u ICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBFbmFibGUgV0lSRUxF U1NfUExBWUJBQ0tfVEFSR0VUIGZvciBXSzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAxNzNjZWVhMWU2 MjgzMzFlNDYzMjJkNjdiNzkyN2VlYWM1YWFjNDcwLi44ZjgxODJjMWJjZjBmOTcxYThiM2ZlNWNi Y2I5MmNjYjdlNjY4ZmRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTUt MDMtMjMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAg QWRkIGEgc2hhcmUgaXRlbSB0byB0aGUgbGluayBhY3Rpb24gbWVudQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyOTYxCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xOTE5ODM3ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAg ICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9ySW1hZ2VdKToK KyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JW aWRlb10pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRlQWN0aW9u TWVudUl0ZW1Gb3JUYWc6XSk6CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9j cmVhdGVTaGFyZUFjdGlvbk1lbnVJdGVtRm9yVGFnOndpdGhJdGVtczpdKToKKyAgICAgICAgQWRv cHQgLVtOU01lbnVJdGVtIHN0YW5kYXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtc10uCisgICAgICAg IEFsbCBvZiB0aGUgbnVsbC1jaGVja2luZyBpcyB1bm5lY2Vzc2FyeSBhcyBpdCdzIGltcG9zc2li bGUgdG8gZW50ZXIKKyAgICAgICAgdGhlc2UgZnVuY3Rpb25zIHdpdGggYSBudWxsIGltYWdlL2V0 Yy4KKyAgICAgICAgQWxzbywgcmVtb3ZlIGEgZHVwbGljYXRlIGlzRG93bmxvYWRhYmxlTWVkaWEg Y2hlY2sgZm9yIHRoZSAnc2F2ZSB0byBkb3dubG9hZHMnIGl0ZW0uCisKKyAgICAgICAgKC1bV2Vi QWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5rXSk6CisgICAgICAg ICogV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oOgorICAgICAgICBBZGQgYSAnU2hhcmUn IGl0ZW0gdG8gdGhlIGxpbmsgbWVudS4KKwogMjAxNS0wMy0yMiAgRXJpYyBDYXJsc29uICA8ZXJp Yy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBFbmFibGUgV0lSRUxFU1NfUExB WUJBQ0tfVEFSR0VUIGZvciBXSzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3M2UyOWU0NTJlNDA0OTMzYjAyNzMx MzZhMWYwYTY1NzIwYzY4ZTFlLi42OGYwMDcwYjU3ZjU2OWQ2MzliMWVjMTQyYzk3OTM4MDNiN2Yy MWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTUtMDMtMjMgIFRpbSBIb3J0b24g IDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgc2hhcmUgaXRlbSB0 byB0aGUgbGluayBhY3Rpb24gbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQyOTYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTE5ODM3ND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25N ZW51Q29udHJvbGxlciBfaGl0TGlua1VSTF0pOgorICAgICAgICBGYWN0b3Igb3V0IF9oaXRMaW5r VVJMIGZyb20gdmFyaW91cyBwbGFjZXMuCisKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJv bGxlciBfb3BlblVSTEZyb21BY3Rpb25NZW51Ol0pOgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVD b250cm9sbGVyIF9hZGRUb1JlYWRpbmdMaXN0RnJvbUFjdGlvbk1lbnU6XSk6CisgICAgICAgICgt W1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JWaWRlb10pOgorICAg ICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9ySW1hZ2Vd KToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRlQWN0aW9uTWVudUl0 ZW1Gb3JUYWc6XSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2NyZWF0ZVNo YXJlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6d2l0aEl0ZW1zOl0pOgorICAgICAgICBBZG9wdCAtW05T TWVudUl0ZW0gc3RhbmRhcmRTaGFyZU1lbnVJdGVtV2l0aEl0ZW1zXS4KKyAgICAgICAgQWxsIG9m IHRoZSBudWxsLWNoZWNraW5nIGlzIHVubmVjZXNzYXJ5IGFzIGl0J3MgaW1wb3NzaWJsZSB0byBl bnRlcgorICAgICAgICB0aGVzZSBmdW5jdGlvbnMgd2l0aCBhIG51bGwgaW1hZ2UvZXRjLgorCisg ICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5r XSk6CisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLQWN0aW9uTWVudUl0ZW1UeXBlcy5oOgorICAg ICAgICBBZGQgYSAnU2hhcmUnIGl0ZW0gdG8gdGhlIGxpbmsgbWVudS4KKwogMjAxNS0wMy0yMiAg RXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBF bmFibGUgV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUIGZvciBXSzEKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwppbmRleCAxOTU3NDZjMzYyODBh NzU3MTRmZWRmMjMzYTk4YmNkYzkzMWY1YjE0Li43NDc0ZGMzMjlkNzYzNTJhNjIxMWY0OTgwNTUx YzdiZmU2YmFkMjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xv Y2FsaXphYmxlLnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9Mb2Nh bGl6YWJsZS5zdHJpbmdzCkBAIC0xMDkzLDkgKzEwOTMsNiBAQAogLyogIlNhdmUgdG8gRG93bmxv YWRzIiBhY3Rpb24gbWVudSBpdGVtIGluIGltYWdlIG1lbnUgKi8KICJTYXZlIHRvIERvd25sb2Fk cyAoaW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSkiID0gIlNhdmUgdG8gRG93bmxvYWRzIjsKIAotLyog IlNoYXJlIiBhY3Rpb24gbWVudSBpdGVtIGluIGltYWdlIG1lbnUgKi8KLSJTaGFyZSAoaW1hZ2Ug YWN0aW9uIG1lbnUgaXRlbSkiID0gIlNoYXJlIjsKLQogLyogIkNvcHkiIGFjdGlvbiBtZW51IGl0 ZW0gaW4gdGV4dCBtZW51ICovCiAiQ29weSAodGV4dCBhY3Rpb24gbWVudSBpdGVtKSIgPSAiQ29w eSI7CiAKQEAgLTExMTEsOCArMTEwOCw1IEBACiAvKiAiQ29weSIgYWN0aW9uIG1lbnUgaXRlbSBp biB2aWRlbyBtZW51ICovCiAiQ29weSAodmlkZW8gYWN0aW9uIG1lbnUgaXRlbSkiID0gIkNvcHki OwogCi0vKiAiU2hhcmUiIGFjdGlvbiBtZW51IGl0ZW0gaW4gdmlkZW8gbWVudSAqLwotIlNoYXJl ICh2aWRlbyBhY3Rpb24gbWVudSBpdGVtKSIgPSAiU2hhcmUiOwotCiAvKiAiU2F2ZSB0byBEb3du bG9hZHMiIGFjdGlvbiBtZW51IGl0ZW0gaW4gdmlkZW8gbWVudSAqLwogIlNhdmUgdG8gRG93bmxv YWRzICh2aWRlbyBhY3Rpb24gbWVudSBpdGVtKSIgPSAiU2F2ZSB0byBEb3dubG9hZHMiOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL21hYy9OU01lbnVTUEkuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9tYWMvTlNNZW51U1BJLmgKaW5kZXggNzU3ZWE0ZDE3 ZDVlMzdmZWU4MDJmYTQ3NGI3ODJlOGQ1Yjg5MTY1Ny4uOWEwMmE2YTUyYjRlM2VmYTQ5MWNmZjdk NDEyZDdiOGNhODU5MGVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3Bp L21hYy9OU01lbnVTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvbWFjL05T TWVudVNQSS5oCkBAIC0zOSw0ICszOSw1IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIE5T TWVudVR5cGUpIHsKIAogQGludGVyZmFjZSBOU01lbnVJdGVtIChQcml2YXRlKQogKyAoUUxQcmV2 aWV3TWVudUl0ZW0gKilzdGFuZGFyZFF1aWNrTG9va01lbnVJdGVtOworKyAoTlNNZW51SXRlbSAq KXN0YW5kYXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtczooTlNBcnJheSAqKWl0ZW1zOwogQGVuZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJv bGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xs ZXIubW0KaW5kZXggNzVjOWI3YTkyYWNjY2U3NTIwMWVkNWJiNDQ4Mjk2ODg0Y2RiYjI2MS4uMmEz NGQ2NTAxNjdhNzk5NGRiMmJhM2ZmMGQ4NmU0NDEzOTU4MGRiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1tCkBAIC0yNjYs NyArMjY2LDEwIEBAIHN0YXRpYyBJbnRSZWN0IGVsZW1lbnRCb3VuZGluZ0JveEluV2luZG93Q29v cmRpbmF0ZXNGcm9tTm9kZShOb2RlKiBub2RlKQogICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBv cGVuTGlua0l0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9u TWVudUl0ZW1UYWdPcGVuTGlua0luRGVmYXVsdEJyb3dzZXJdOwogICAgIFJldGFpblB0cjxOU01l bnVJdGVtPiByZWFkaW5nTGlzdEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JU YWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdBZGRMaW5rVG9TYWZhcmlSZWFkaW5nTGlzdF07CiAKLSAg ICByZXR1cm4gQFsgb3BlbkxpbmtJdGVtLmdldCgpLCBbTlNNZW51SXRlbSBzZXBhcmF0b3JJdGVt XSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRpbmdMaXN0SXRlbS5nZXQoKSBdOwor ICAgIE5TVVJMICp1cmwgPSBfaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKTsKKyAgICBS ZXRhaW5QdHI8TlNNZW51SXRlbT4gc2hhcmVJdGVtID0gW3NlbGYgX2NyZWF0ZVNoYXJlQWN0aW9u TWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUxpbmsgd2l0aEl0ZW1zOkBb IHVybCBdXTsKKworICAgIHJldHVybiBAWyBvcGVuTGlua0l0ZW0uZ2V0KCksIHNoYXJlSXRlbS5n ZXQoKSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRpbmdMaXN0SXRlbS5nZXQoKSBd OwogfQogCiAjcHJhZ21hIG1hcmsgbWFpbHRvOiBhbmQgdGVsOiBMaW5rIGFjdGlvbnMKQEAgLTMw NiwxOCArMzA5LDkgQEAgc3RhdGljIEludFJlY3QgZWxlbWVudEJvdW5kaW5nQm94SW5XaW5kb3dD b29yZGluYXRlc0Zyb21Ob2RlKE5vZGUqIG5vZGUpCiAgICAgaWYgKCFfd2ViVmlldy5kb3dubG9h ZERlbGVnYXRlKQogICAgICAgICBbc2F2ZVRvRG93bmxvYWRzSXRlbSBzZXRFbmFibGVkOk5PXTsK IAotICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0 aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUltYWdlXTsKLSAgICBp ZiAoSW1hZ2UqIGltYWdlID0gX2hpdFRlc3RSZXN1bHQuaW1hZ2UoKSkgewotICAgICAgICBSZWZQ dHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBpbWFnZS0+ZGF0YSgpOwotICAgICAgICBpZiAoYnVm ZmVyKSB7Ci0gICAgICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBuc0RhdGEgPSBbTlNEYXRhIGRh dGFXaXRoQnl0ZXM6YnVmZmVyLT5kYXRhKCkgbGVuZ3RoOmJ1ZmZlci0+c2l6ZSgpXTsKLSAgICAg ICAgICAgIFJldGFpblB0cjxOU0ltYWdlPiBuc0ltYWdlID0gYWRvcHROUyhbW05TSW1hZ2UgYWxs b2NdIGluaXRXaXRoRGF0YTpuc0RhdGEuZ2V0KCldKTsKLSAgICAgICAgICAgIF9zaGFyaW5nU2Vy dmljZVBpY2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0 V2l0aEl0ZW1zOkBbIG5zSW1hZ2UuZ2V0KCkgXV0pOwotICAgICAgICAgICAgW19zaGFyaW5nU2Vy dmljZVBpY2tlciBzZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICAgICAgICAgIFtzaGFyZUl0ZW0gc2V0 U3VibWVudTpbX3NoYXJpbmdTZXJ2aWNlUGlja2VyIG1lbnVdXTsKLSAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICBbc2hhcmVJdGVtIHNldEVuYWJsZWQ6Tk9dOwotICAgIH0KKyAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBfaGl0VGVzdFJlc3VsdC5pbWFnZSgpLT5kYXRhKCk7Cisg ICAgUmV0YWluUHRyPE5TSW1hZ2U+IG5zSW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10g aW5pdFdpdGhEYXRhOltOU0RhdGEgZGF0YVdpdGhCeXRlczpidWZmZXItPmRhdGEoKSBsZW5ndGg6 YnVmZmVyLT5zaXplKCldXSk7CisgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IHNoYXJlSXRlbSA9 IFtzZWxmIF9jcmVhdGVTaGFyZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVt VGFnU2hhcmVJbWFnZSB3aXRoSXRlbXM6QFsgbnNJbWFnZS5nZXQoKSBdXTsKIAogICAgIHJldHVy biBAWyBjb3B5SW1hZ2VJdGVtLmdldCgpLCBhZGRUb1Bob3Rvc0l0ZW0uZ2V0KCksIHNhdmVUb0Rv d25sb2Fkc0l0ZW0uZ2V0KCksIHNoYXJlSXRlbS5nZXQoKSBdOwogfQpAQCAtNDI4LDE1ICs0MjIs OCBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0 ZWRGaWxlbmFtZSkKICAgICBpZiAoIV9oaXRUZXN0UmVzdWx0LmlzRG93bmxvYWRhYmxlTWVkaWEo KSB8fCAhX3dlYlZpZXcuZG93bmxvYWREZWxlZ2F0ZSkKICAgICAgICAgW3NhdmVUb0Rvd25sb2Fk c0l0ZW0gc2V0RW5hYmxlZDpOT107CiAKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gc2hhcmVJ dGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVt VGFnU2hhcmVWaWRlb107Ci0gICAgTlNTdHJpbmcgKnVybFRvU2hhcmUgPSBfaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZU1lZGlhVVJMKCk7Ci0gICAgaWYgKCFfaGl0VGVzdFJlc3VsdC5pc0Rvd25sb2Fk YWJsZU1lZGlhKCkpIHsKLSAgICAgICAgW3NhdmVUb0Rvd25sb2Fkc0l0ZW0gc2V0RW5hYmxlZDpO T107Ci0gICAgICAgIHVybFRvU2hhcmUgPSBbX3dlYlZpZXcgbWFpbkZyYW1lVVJMXTsKLSAgICB9 Ci0gICAgX3NoYXJpbmdTZXJ2aWNlUGlja2VyID0gYWRvcHROUyhbW05TU2hhcmluZ1NlcnZpY2VQ aWNrZXIgYWxsb2NdIGluaXRXaXRoSXRlbXM6QFsgdXJsVG9TaGFyZSBdXSk7Ci0gICAgW19zaGFy aW5nU2VydmljZVBpY2tlciBzZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICBbc2hhcmVJdGVtIHNldFN1 Ym1lbnU6W19zaGFyaW5nU2VydmljZVBpY2tlciBtZW51XV07CisgICAgU3RyaW5nIHVybFRvU2hh cmUgPSBfaGl0VGVzdFJlc3VsdC5pc0Rvd25sb2FkYWJsZU1lZGlhKCkgPyBfaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZU1lZGlhVVJMKCkgOiBbX3dlYlZpZXcgbWFpbkZyYW1lVVJMXTsKKyAgICBSZXRh aW5QdHI8TlNNZW51SXRlbT4gc2hhcmVJdGVtID0gW3NlbGYgX2NyZWF0ZVNoYXJlQWN0aW9uTWVu dUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUltYWdlIHdpdGhJdGVtczpAWyB1 cmxUb1NoYXJlIF1dOwogCiAgICAgcmV0dXJuIEBbIGNvcHlWaWRlb1VSTEl0ZW0uZ2V0KCksIFtO U01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCBzYXZlVG9Eb3dubG9hZHNJdGVtLmdldCgpLCBzaGFy ZUl0ZW0uZ2V0KCkgXTsKIH0KQEAgLTcwMSwxMSArNjg4LDYgQEAgc3RhdGljIE5TU3RyaW5nICpw YXRoVG9QaG90b09uRGlzayhOU1N0cmluZyAqc3VnZ2VzdGVkRmlsZW5hbWUpCiAgICAgICAgIGlt YWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVudVNhdmVUb0Rvd25sb2FkcyJd OwogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgV2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUlt YWdlOgotICAgICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdfS0VZKCJTaGFyZSAoaW1hZ2UgYWN0 aW9uIG1lbnUgaXRlbSkiLCAiU2hhcmUgKGltYWdlIGFjdGlvbiBtZW51IGl0ZW0pIiwgImltYWdl IGFjdGlvbiBtZW51IGl0ZW0iKTsKLSAgICAgICAgaW1hZ2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVk OkAiTlNBY3Rpb25NZW51U2hhcmUiXTsKLSAgICAgICAgYnJlYWs7Ci0KICAgICBjYXNlIFdlYkFj dGlvbk1lbnVJdGVtVGFnQ29weVZpZGVvVVJMOgogICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3Rv cihfY29weVZpZGVvVVJMOik7CiAgICAgICAgIHRpdGxlID0gV0VCX1VJX1NUUklOR19LRVkoIkNv cHkiLCAiQ29weSAodmlkZW8gYWN0aW9uIG1lbnUgaXRlbSkiLCAidmlkZW8gYWN0aW9uIG1lbnUg aXRlbSIpOwpAQCAtNzE4LDExICs3MDAsNiBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3Rv T25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRGaWxlbmFtZSkKICAgICAgICAgaW1hZ2UgPSBbTlNJ bWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51U2F2ZVRvRG93bmxvYWRzIl07CiAgICAgICAg IGJyZWFrOwogCi0gICAgY2FzZSBXZWJBY3Rpb25NZW51SXRlbVRhZ1NoYXJlVmlkZW86Ci0gICAg ICAgIHRpdGxlID0gV0VCX1VJX1NUUklOR19LRVkoIlNoYXJlIiwgIlNoYXJlICh2aWRlbyBhY3Rp b24gbWVudSBpdGVtKSIsICJ2aWRlbyBhY3Rpb24gbWVudSBpdGVtIik7Ci0gICAgICAgIGltYWdl ID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVudVNoYXJlIl07Ci0gICAgICAgIGJy ZWFrOwotCiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIHJldHVybiBuaWw7CkBAIC03MzYsNiArNzEzLDE3IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0 aFRvUGhvdG9PbkRpc2soTlNTdHJpbmcgKnN1Z2dlc3RlZEZpbGVuYW1lKQogICAgIHJldHVybiBp dGVtOwogfQogCistIChSZXRhaW5QdHI8TlNNZW51SXRlbT4pX2NyZWF0ZVNoYXJlQWN0aW9uTWVu dUl0ZW1Gb3JUYWc6KHVpbnQzMl90KXRhZyB3aXRoSXRlbXM6KE5TQXJyYXkgKilpdGVtcworewor ICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0ZW0gPSBbTlNNZW51SXRlbSBzdGFuZGFy ZFNoYXJlTWVudUl0ZW1XaXRoSXRlbXM6aXRlbXNdOworICAgIFtzaGFyZUl0ZW0gc2V0VGFnOnRh Z107CisKKyAgICBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyICpzaGFyaW5nU2VydmljZVBpY2tlciA9 IFtzaGFyZUl0ZW0gcmVwcmVzZW50ZWRPYmplY3RdOworICAgIHNoYXJpbmdTZXJ2aWNlUGlja2Vy LmRlbGVnYXRlID0gc2VsZjsKKworICAgIHJldHVybiBzaGFyZUl0ZW07Cit9CisKIC0gKE5TQXJy YXkgKilfZGVmYXVsdE1lbnVJdGVtcwogewogICAgIE5TVVJMICp1cmwgPSBfaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZUxpbmtVUkwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi VUlEZWxlZ2F0ZVByaXZhdGUuaAppbmRleCBjZjY1YTg4NGQ0YzMwMjQ2MmVjYjczOGFjZWE5Yjli YTY4MGI2ZWJmLi42NjdhNzg5MWZlYWU0MzA0Yzk5NWQxZGM5NmU1NDlmM2I0ODdhYzNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCkBA IC0xMjcsNyArMTI3LDggQEAgZW51bSB7CiAgICAgV2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUlt YWdlLAogICAgIFdlYkFjdGlvbk1lbnVJdGVtVGFnQ29weVZpZGVvVVJMLAogICAgIFdlYkFjdGlv bk1lbnVJdGVtVGFnU2F2ZVZpZGVvVG9Eb3dubG9hZHMsCi0gICAgV2ViQWN0aW9uTWVudUl0ZW1U YWdTaGFyZVZpZGVvCisgICAgV2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZVZpZGVvLAorICAgIFdl YkFjdGlvbk1lbnVJdGVtVGFnU2hhcmVMaW5rCiB9OwogCiB0eXBlZGVmIGVudW0gewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLQWN0aW9uTWVudUl0ZW1UeXBlcy5o IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLQWN0aW9uTWVudUl0ZW1UeXBlcy5oCmlu ZGV4IGMyOGRmNTJkMzg4N2QzZDczNGExOWExNTBiMTFlNDg0ZmUzN2Q2YjguLjNiYWQyMzU2Nzgw Y2JiZjIwYjEwNTU4YTNkOWZiY2QxMzk2MTUyZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvYy9XS0FjdGlvbk1lbnVJdGVtVHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJL2MvV0tBY3Rpb25NZW51SXRlbVR5cGVzLmgKQEAgLTQ3LDcgKzQ3LDggQEAg ZW51bSB7CiAgICAga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdUZXh0U3VnZ2VzdGlvbnMsCiAgICAg a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VmlkZW9VUkwsCiAgICAga1dLQ29udGV4dEFjdGlv bkl0ZW1UYWdTYXZlVmlkZW9Ub0Rvd25sb2FkcywKLSAgICBrV0tDb250ZXh0QWN0aW9uSXRlbVRh Z1NoYXJlVmlkZW8KKyAgICBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ1NoYXJlVmlkZW8sCisgICAg a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdTaGFyZUxpbmsKIH07CiAKICNpZmRlZiBfX2NwbHVzcGx1 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVD b250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVD b250cm9sbGVyLm1tCmluZGV4IDJkZThkYWRiMzgyNDg1MDY2ZGMwNjFiOTdjNzYwODdlNThkNmE3 MGUuLmMwYTU1NGQ0ZDZiOWYwOTdiY2MwZWEzZWEyNWMzNTYzMGRjNGQxNTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIu bW0KQEAgLTE4MCwyNSArMTgwLDMwIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKICNwcmFn bWEgbWFyayBMaW5rIGFjdGlvbnMKIAorLSAoTlNVUkwgKilfaGl0TGlua1VSTAoreworICAgIFJl ZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX3dlYkhpdFRlc3RS ZXN1bHRdOworICAgIHJldHVybiBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RS ZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXTsKK30KKwogLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVu dUl0ZW1zRm9yTGluawogewogICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBvcGVuTGlua0l0ZW0g PSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1U YWdPcGVuTGlua0luRGVmYXVsdEJyb3dzZXJdOwogICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBy ZWFkaW5nTGlzdEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29u dGV4dEFjdGlvbkl0ZW1UYWdBZGRMaW5rVG9TYWZhcmlSZWFkaW5nTGlzdF07CisgICAgUmV0YWlu UHRyPE5TTWVudUl0ZW0+IHNoYXJlSXRlbSA9IFtzZWxmIF9jcmVhdGVTaGFyZUFjdGlvbk1lbnVJ dGVtRm9yVGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFnU2hhcmVMaW5rIHdpdGhJdGVtczpAWyBb c2VsZiBfaGl0TGlua1VSTF0gXV07CiAKLSAgICByZXR1cm4gQFsgb3BlbkxpbmtJdGVtLmdldCgp LCBbTlNNZW51SXRlbSBzZXBhcmF0b3JJdGVtXSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0s IHJlYWRpbmdMaXN0SXRlbS5nZXQoKSBdOworICAgIHJldHVybiBAWyBvcGVuTGlua0l0ZW0uZ2V0 KCksIHNoYXJlSXRlbS5nZXQoKSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRpbmdM aXN0SXRlbS5nZXQoKSBdOwogfQogCiAtICh2b2lkKV9vcGVuVVJMRnJvbUFjdGlvbk1lbnU6KGlk KXNlbmRlcgogewotICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0g W3NlbGYgX3dlYkhpdFRlc3RSZXN1bHRdOwotICAgIFtbTlNXb3Jrc3BhY2Ugc2hhcmVkV29ya3Nw YWNlXSBvcGVuVVJMOltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6aGl0VGVzdFJlc3VsdC0+ YWJzb2x1dGVMaW5rVVJMKCldXTsKKyAgICBbW05TV29ya3NwYWNlIHNoYXJlZFdvcmtzcGFjZV0g b3BlblVSTDpbc2VsZiBfaGl0TGlua1VSTF1dOwogfQogCiAtICh2b2lkKV9hZGRUb1JlYWRpbmdM aXN0RnJvbUFjdGlvbk1lbnU6KGlkKXNlbmRlcgogewotICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVz dWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX3dlYkhpdFRlc3RSZXN1bHRdOwogICAgIE5TU2hh cmluZ1NlcnZpY2UgKnNlcnZpY2UgPSBbTlNTaGFyaW5nU2VydmljZSBzaGFyaW5nU2VydmljZU5h bWVkOk5TU2hhcmluZ1NlcnZpY2VOYW1lQWRkVG9TYWZhcmlSZWFkaW5nTGlzdF07Ci0gICAgW3Nl cnZpY2UgcGVyZm9ybVdpdGhJdGVtczpAWyBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhp dFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXSBdXTsKKyAgICBbc2VydmljZSBwZXJmb3Jt V2l0aEl0ZW1zOkBbIFtzZWxmIF9oaXRMaW5rVVJMXSBdXTsKIH0KIAogI3ByYWdtYSBtYXJrIFZp ZGVvIGFjdGlvbnMKQEAgLTIwNiwyMiArMjExLDExIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7 CiAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXNGb3JWaWRlbwogewogICAgIFJldGFpblB0 cjxOU01lbnVJdGVtPiBjb3B5VmlkZW9VUkxJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJ dGVtRm9yVGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weVZpZGVvVVJMXTsKLQotICAgIFJl ZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX3dlYkhpdFRlc3RS ZXN1bHRdOwogICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzYXZlVG9Eb3dubG9hZHNJdGVtID0g W3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFn U2F2ZVZpZGVvVG9Eb3dubG9hZHNdOwotICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0 ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0 ZW1UYWdTaGFyZVZpZGVvXTsKLQotICAgIFN0cmluZyB1cmxUb1NoYXJlID0gaGl0VGVzdFJlc3Vs dC0+YWJzb2x1dGVNZWRpYVVSTCgpOwotICAgIGlmICghaGl0VGVzdFJlc3VsdC0+aXNEb3dubG9h ZGFibGVNZWRpYSgpKSB7Ci0gICAgICAgIFtzYXZlVG9Eb3dubG9hZHNJdGVtIHNldEVuYWJsZWQ6 Tk9dOwotICAgICAgICB1cmxUb1NoYXJlID0gX3BhZ2UtPm1haW5GcmFtZSgpLT51cmwoKTsKLSAg ICB9CiAKLSAgICBpZiAoIXVybFRvU2hhcmUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIF9zaGFyaW5n U2VydmljZVBpY2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBp bml0V2l0aEl0ZW1zOkBbIHVybFRvU2hhcmUgXV0pOwotICAgICAgICBbX3NoYXJpbmdTZXJ2aWNl UGlja2VyIHNldERlbGVnYXRlOnNlbGZdOwotICAgICAgICBbc2hhcmVJdGVtIHNldFN1Ym1lbnU6 W19zaGFyaW5nU2VydmljZVBpY2tlciBtZW51XV07Ci0gICAgfQorICAgIFJlZlB0cjxXZWJIaXRU ZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0gW3NlbGYgX3dlYkhpdFRlc3RSZXN1bHRdOworICAg IFN0cmluZyB1cmxUb1NoYXJlID0gaGl0VGVzdFJlc3VsdC0+aXNEb3dubG9hZGFibGVNZWRpYSgp ID8gaGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVNZWRpYVVSTCgpIDogX3BhZ2UtPm1haW5GcmFtZSgp LT51cmwoKTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gc2hhcmVJdGVtID0gW3NlbGYgX2Ny ZWF0ZVNoYXJlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdTaGFy ZVZpZGVvIHdpdGhJdGVtczpAWyB1cmxUb1NoYXJlIF1dOwogCiAgICAgcmV0dXJuIEBbIGNvcHlW aWRlb1VSTEl0ZW0uZ2V0KCksIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCBzYXZlVG9Eb3du bG9hZHNJdGVtLmdldCgpLCBzaGFyZUl0ZW0uZ2V0KCkgXTsKIH0KQEAgLTI2NCwxMyArMjU4LDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKICAgICBlbHNlCiAgICAgICAgIGFkZFRvUGhvdG9z SXRlbSA9IFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dOwogICAgIFJldGFpblB0cjxOU01lbnVJ dGVtPiBzYXZlVG9Eb3dubG9hZHNJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9y VGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFnU2F2ZUltYWdlVG9Eb3dubG9hZHNdOwotICAgIFJl dGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0 ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdTaGFyZUltYWdlXTsKLQotICAgIGlmIChS ZXRhaW5QdHI8TlNJbWFnZT4gaW1hZ2UgPSBbc2VsZiBfaGl0VGVzdFJlc3VsdEltYWdlXSkgewot ICAgICAgICBfc2hhcmluZ1NlcnZpY2VQaWNrZXIgPSBhZG9wdE5TKFtbTlNTaGFyaW5nU2Vydmlj ZVBpY2tlciBhbGxvY10gaW5pdFdpdGhJdGVtczpAWyBpbWFnZS5nZXQoKSBdXSk7Ci0gICAgICAg IFtfc2hhcmluZ1NlcnZpY2VQaWNrZXIgc2V0RGVsZWdhdGU6c2VsZl07Ci0gICAgICAgIFtzaGFy ZUl0ZW0gc2V0U3VibWVudTpbX3NoYXJpbmdTZXJ2aWNlUGlja2VyIG1lbnVdXTsKLSAgICB9Cisg ICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IHNoYXJlSXRlbSA9IFtzZWxmIF9jcmVhdGVTaGFyZUFj dGlvbk1lbnVJdGVtRm9yVGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFnU2hhcmVJbWFnZSB3aXRo SXRlbXM6QFsgW3NlbGYgX2hpdFRlc3RSZXN1bHRJbWFnZV0gXV07CiAKICAgICByZXR1cm4gQFsg Y29weUltYWdlSXRlbS5nZXQoKSwgYWRkVG9QaG90b3NJdGVtLmdldCgpLCBzYXZlVG9Eb3dubG9h ZHNJdGVtLmdldCgpLCBzaGFyZUl0ZW0uZ2V0KCkgXTsKIH0KQEAgLTYwNCwxMSArNTkyLDYgQEAg c3RhdGljIE5TU3RyaW5nICpwYXRoVG9QaG90b09uRGlzayhOU1N0cmluZyAqc3VnZ2VzdGVkRmls ZW5hbWUpCiAgICAgICAgIGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVu dVNhdmVUb0Rvd25sb2FkcyJdOwogICAgICAgICBicmVhazsKIAotICAgIGNhc2Uga1dLQ29udGV4 dEFjdGlvbkl0ZW1UYWdTaGFyZUltYWdlOgotICAgICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdf S0VZKCJTaGFyZSAoaW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSkiLCAiU2hhcmUgKGltYWdlIGFjdGlv biBtZW51IGl0ZW0pIiwgImltYWdlIGFjdGlvbiBtZW51IGl0ZW0iKTsKLSAgICAgICAgaW1hZ2Ug PSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51U2hhcmUiXTsKLSAgICAgICAgYnJl YWs7Ci0KICAgICBjYXNlIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weVRleHQ6CiAgICAgICAg IHNlbGVjdG9yID0gQHNlbGVjdG9yKF9jb3B5U2VsZWN0aW9uOik7CiAgICAgICAgIHRpdGxlID0g V0VCX1VJX1NUUklOR19LRVkoIkNvcHkiLCAiQ29weSAodGV4dCBhY3Rpb24gbWVudSBpdGVtKSIs ICJ0ZXh0IGFjdGlvbiBtZW51IGl0ZW0iKTsKQEAgLTYzOSwxMSArNjIyLDYgQEAgc3RhdGljIE5T U3RyaW5nICpwYXRoVG9QaG90b09uRGlzayhOU1N0cmluZyAqc3VnZ2VzdGVkRmlsZW5hbWUpCiAg ICAgICAgIGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVudVNhdmVUb0Rv d25sb2FkcyJdOwogICAgICAgICBicmVhazsKIAotICAgIGNhc2Uga1dLQ29udGV4dEFjdGlvbkl0 ZW1UYWdTaGFyZVZpZGVvOgotICAgICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdfS0VZKCJTaGFy ZSIsICJTaGFyZSAodmlkZW8gYWN0aW9uIG1lbnUgaXRlbSkiLCAidmlkZW8gYWN0aW9uIG1lbnUg aXRlbSIpOwotICAgICAgICBpbWFnZSA9IFtOU0ltYWdlIGltYWdlTmFtZWQ6QCJOU0FjdGlvbk1l bnVTaGFyZSJdOwotICAgICAgICBicmVhazsKLQogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gbmlsOwpAQCAtNjU3LDYgKzYzNSwxNyBA QCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRG aWxlbmFtZSkKICAgICByZXR1cm4gaXRlbTsKIH0KIAorLSAoUmV0YWluUHRyPE5TTWVudUl0ZW0+ KV9jcmVhdGVTaGFyZUFjdGlvbk1lbnVJdGVtRm9yVGFnOih1aW50MzJfdCl0YWcgd2l0aEl0ZW1z OihOU0FycmF5ICopaXRlbXMKK3sKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gc2hhcmVJdGVt ID0gW05TTWVudUl0ZW0gc3RhbmRhcmRTaGFyZU1lbnVJdGVtV2l0aEl0ZW1zOml0ZW1zXTsKKyAg ICBbc2hhcmVJdGVtIHNldFRhZzp0YWddOworCisgICAgTlNTaGFyaW5nU2VydmljZVBpY2tlciAq c2hhcmluZ1NlcnZpY2VQaWNrZXIgPSBbc2hhcmVJdGVtIHJlcHJlc2VudGVkT2JqZWN0XTsKKyAg ICBzaGFyaW5nU2VydmljZVBpY2tlci5kZWxlZ2F0ZSA9IHNlbGY7CisKKyAgICByZXR1cm4gc2hh cmVJdGVtOworfQorCiAtIChQYXNzUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+KV93ZWJIaXRUZXN0 UmVzdWx0CiB7CiAgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQ7Cg==