198681 2019-06-07 14:59:06 -0700 Extend quirks to emulate bold/italic/underline in hidden editable areas 2019-06-07 17:48:49 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin commit-queue thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1542957 0 megan_gardner 2019-06-07 14:59:06 -0700 Extend quirks to emulate bold/italic/underline in hidden editable areas 1542963 1 371614 megan_gardner 2019-06-07 15:03:15 -0700 Created attachment 371614 Patch 1542971 2 371614 wenson_hsieh 2019-06-07 15:15:20 -0700 Comment on attachment 371614 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371614&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3125 > +static bool shouldSynthezieKeyEvents(WKContentView *contentView) > +{ > + if (contentView.focusedElementInformation.shouldSynthesizeKeyEventsForEditing && contentView.hasHiddenContentEditable) > + return true; > + return false; > +} It seems like this could just be a method like so: - (BOOL)shouldSynthesizeKeyEvents { return _focusedElementInformation.shouldSynthesizeKeyEventsForEditing && self.hasHiddenContentEditable; } > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3145 > + if (shouldSynthezieKeyEvents(self)) "Synthezie" 1542985 3 371619 megan_gardner 2019-06-07 15:51:36 -0700 Created attachment 371619 Patch 1543012 4 371632 megan_gardner 2019-06-07 16:54:51 -0700 Created attachment 371632 Patch for landing 1543013 5 megan_gardner 2019-06-07 16:55:32 -0700 <rdar://problem/46430520> 1543025 6 commit-queue 2019-06-07 17:48:00 -0700 The commit-queue encountered the following flaky tests while processing attachment 371632: resize-observer/element-leak.html bug 198666 The commit-queue is continuing to process your patch. 1543026 7 371632 commit-queue 2019-06-07 17:48:48 -0700 Comment on attachment 371632 Patch for landing Clearing flags on attachment: 371632 Committed r246226: <https://trac.webkit.org/changeset/246226> 1543027 8 commit-queue 2019-06-07 17:48:49 -0700 All reviewed patches have been landed. Closing bug. 371614 2019-06-07 15:03:15 -0700 2019-06-07 16:54:48 -0700 Patch bug-198681-20190607150315.patch text/plain 12562 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThkMDk5MzY1YjEwYzkx OGQ1Y2NhYzM2ODQwMWRkYTAxOTUzOTQ3Yi4uYjFlZjhiZDJjNjE1YTczMDdhNTY3YzI5NWYxNzE3 ZDM5NWViZTgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSArMSwxOSBAQAorMjAxOS0wNi0wNyAgTWVnYW4g R2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4dGVuZCBxdWly a3MgdG8gZW11bGF0ZSBib2xkL2l0YWxpYy91bmRlcmxpbmUgaW4gaGlkZGVuIGVkaXRhYmxlIGFy ZWFzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg2 ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgb25seS4KKworICAgICAgICBSZW5hbWUgcXVpcmtzIHRvIGJlIG1vcmUgYWNjdXJhdGUgZm9y IG5ldyBleHRlbmRlZCB1c2UuCisKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpzaG91bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVu RWRpdGFibGVBcmVhc0Zvckhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjpzaG91bGRF bXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhcyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRFbXVsYXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRh YmxlQXJlYXNGb3JIb3N0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlF1aXJrczo6c2hv dWxkRW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJsZUFyZWFzIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBwYWdlL1F1aXJrcy5oOgorCiA9PSBSb2xsZWQgb3ZlciB0byBDaGFuZ2VMb2ct MjAxOS0wNi0wNSA9PQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBmODdjMmFhZjY3OWExOTIyNzI4MGU4YzZhZjc4Y2U5 ZWQ3ZjQyNmQzLi5jOTc0N2I0ZmE1YjQ5ODk4YjNiZGE3NDdmYWQ5YzIwNDE4ZGM4YmQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA2LTA3ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5f Z2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRXh0ZW5kIHF1aXJrcyB0byBlbXVsYXRlIGJv bGQvaXRhbGljL3VuZGVybGluZSBpbiBoaWRkZW4gZWRpdGFibGUgYXJlYXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODY4MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL0ZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudElu Zm9ybWF0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLmg6CisgICAgICAgICogU2hhcmVkL1N5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyB1bmRvTWFuYWdlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoc2hvdWxkU3ludGhlemllS2V5RXZl bnRzKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB0b2dnbGVCb2xkZmFjZUZvcldlYlZpZXc6 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgdG9nZ2xlSXRhbGljc0ZvcldlYlZpZXc6XSk6 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgdG9nZ2xlVW5kZXJsaW5lRm9yV2ViVmlldzpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZWxlbWVudERpZEJsdXJdKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OmdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpnZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKToKKwogMjAxOS0wNi0wNSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGxvZ1Np dGVJZGVudGlmaWVyIGZyb20gVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6 OnJlcXVlc3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcApp bmRleCAyYWFhMDcxMTNhMWJlYmIwYjVkMzI3YzAzNDJiYTBhNDg3ZWYxNDFiLi5hNDJkMjJhMTBj ZjBiZjZkNDc0NGI2MjIwNzU1NmE0NDA3YThiOTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1F1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCkBA IC0yMzgsNyArMjM4LDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkU3VwcHJlc3NBdXRvY29ycmVjdGlv bkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlkZGVuRWRpdGFibGVBcmUKICNlbmRpZgogfQogCi1z dGF0aWMgYm9vbCBzaG91bGRFbXVsYXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRhYmxlQXJlYXNGb3JI b3N0KGNvbnN0IFN0cmluZ1ZpZXcmIGhvc3QpCitzdGF0aWMgYm9vbCBzaG91bGRFbXVsYXRlRWRp dGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QoY29uc3Qg U3RyaW5nVmlldyYgaG9zdCkKIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHJldHVy biBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAiZG9jcy5nb29nbGUuY29tIik7 CkBAIC0yNjYsMTIgKzI2NiwxMiBAQCBib29sIFF1aXJrczo6c2hvdWxkRGlzcGF0Y2hTeW50aGV0 aWNNb3VzZUV2ZW50c1doZW5Nb2RpZnlpbmdTZWxlY3Rpb24oKSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBRdWlya3M6OnNob3VsZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRp dGFibGVBcmVhcygpIGNvbnN0Citib29sIFF1aXJrczo6c2hvdWxkRW11bGF0ZUVkaXRpbmdCdXR0 b25zQW5kR2VzdHVyZXNJbkhpZGRlbkVkaXRhYmxlQXJlYXMoKSBjb25zdAogewogICAgIGlmICgh bmVlZHNRdWlya3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHNob3Vs ZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QobV9kb2N1bWVudC0+ dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCkpOworICAgIHJldHVybiBzaG91bGRFbXVsYXRlRWRp dGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QobV9kb2N1 bWVudC0+dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCkpOwogfQogCiBib29sIFF1aXJrczo6c2hv dWxkU3VwcHJlc3NBdXRvY29ycmVjdGlvbkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlkZGVuRWRp dGFibGVBcmVhcygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr cy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAppbmRleCA2YjFmMWJiOTUzN2E1ZDAz M2Q5NTdlODUxZTliNGMxNWYzZjFiMTk0Li4zYTZiYTFiZDg1ZGM4N2Y4YzkzYmQ1MmEyNzYyZTk3 NDdhZGE2MGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzaG91bGREaXNwYXRjaFN5bnRoZXRpY01vdXNlRXZl bnRzV2hlbk1vZGlmeWluZ1NlbGVjdGlvbigpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgc2hvdWxkU3VwcHJlc3NBdXRvY29ycmVjdGlvbkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlk ZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0OwotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hvdWxk RW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJsZUFyZWFzKCkgY29uc3Q7CisgICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBzaG91bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlk ZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNUb3Vj aEJhclVwZGF0ZVN1cHJlc3NlZEZvckhpZGRlbkNvbnRlbnRFZGl0YWJsZSgpIGNvbnN0OwogICAg IFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNOZXZlclJpY2hseUVkaXRhYmxlRm9yVG91Y2hCYXIoKSBj b25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJ bmZvcm1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLmNwcAppbmRleCBjZGVmMWEyNGJlNTVjZTJmNGIzZTdlMzg1ODM2MGQwMjRiMTk4MWY4 Li40OGZiMzI0MjNkNTU4YjIwZGJlN2Q5ZWIxMGM4ZTg3MDcyYjE0MGRiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcApAQCAtMTA0 LDcgKzEwNCw3IEBAIHZvaWQgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbjo6ZW5jb2RlKElQQzo6 RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHN1Z2dlc3RlZENvbG9yczsK ICNlbmRpZgogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yVW5kb0FuZFJlZG87CisgICAgZW5jb2RlciA8PCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yRWRpdGluZzsKIH0KIAogYm9vbCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjpkZWNvZGUo SVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJiByZXN1bHQp CkBAIC0yMjMsNyArMjIzLDcgQEAgYm9vbCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjpkZWNv ZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBGb2N1c2VkRWxlbWVudEluZm8KICAgICAgICAgcmV0 dXJuIGZhbHNlOwogI2VuZGlmCiAjZW5kaWYKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzRm9yVW5kb0FuZFJlZG8pKQorICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0LnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JFZGl0aW5nKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmggYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmgKaW5kZXggYjM5MDBjZWIz Y2IyYWRlMDUyZDQ5YzU4ZmY3OTQyMzk0YjE0NzdjYS4uOGQwM2FlMmU1YjU0MThmNjBlN2QyNmM5 ZDkyZjdjYzMyNGFhOGQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNl ZEVsZW1lbnRJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uaApAQCAtMTM2LDcgKzEzNiw3IEBAIHN0cnVjdCBGb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uIHsKICAgICBWZWN0b3I8V2ViQ29yZTo6Q29sb3I+IHN1Z2dlc3RlZENv bG9yczsKICNlbmRpZgogI2VuZGlmCi0gICAgYm9vbCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yVW5kb0FuZFJlZG8geyBmYWxzZSB9OworICAgIGJvb2wgc2hvdWxkU3ludGhlc2l6ZUtleUV2 ZW50c0ZvckVkaXRpbmcgeyBmYWxzZSB9OwogCiAgICAgRm9jdXNlZEVsZW1lbnRJZGVudGlmaWVy IGZvY3VzZWRFbGVtZW50SWRlbnRpZmllciB7IDAgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlLmggYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9TeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUuaAppbmRleCA3ZTM4MWU0N2QwYzkx NWVlMmY0YjI5YTQ3ZjM1OWJkNjkzODIyMDBhLi5mNzgxNGQzZGQxOTM2NmM3YjQzN2ViMDc3MWEy MDcyYjhiOGFiMWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TeW50aGV0aWNF ZGl0aW5nQ29tbWFuZFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TeW50aGV0aWNF ZGl0aW5nQ29tbWFuZFR5cGUuaApAQCAtMjksNyArMjksMTAgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAgICAgCiBlbnVtIGNsYXNzIFN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZSA6IHVpbnQ4X3Qg IHsKICAgICBVbmRvLAotICAgIFJlZG8KKyAgICBSZWRvLAorICAgIFRvZ2dsZUJvbGRmYWNlLAor ICAgIFRvZ2dsZUl0YWxpYywKKyAgICBUb2dnbGVVbmRlcmxpbmUKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApAQCAtNDAsNyArNDMsMTAgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0 czxXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZT4gewogICAgIHVzaW5nIHZhbHVl cyA9IEVudW1WYWx1ZXMgPAogICAgIFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBl LAogICAgIFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpVbmRvLAotICAgIFdl YktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpSZWRvCisgICAgV2ViS2l0OjpTeW50 aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlJlZG8sCisgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0 aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZUJvbGRmYWNlLAorICAgIFdlYktpdDo6U3ludGhldGljRWRp dGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVJdGFsaWMsCisgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0 aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZVVuZGVybGluZQogICAgID47CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDU2YjQ1NjJjNzk2YTcx NGI5YTA5MzdkNjY4MjgxMzdiODhiNDY5MjMuLjMxNWM3YjlhMzFlMTBhNzllYTViZWQyNmVmMGRl ZjJlZDI0MWZhOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3Lm1tCkBAIC00NDMsNyArNDQzLDcgQEAgLSAodm9pZClkaWRab29tVG9TY2FsZTooQ0dGbG9h dClzY2FsZQogCiAtIChOU1VuZG9NYW5hZ2VyICopdW5kb01hbmFnZXIKIHsKLSAgICBpZiAoc2Vs Zi5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JV bmRvQW5kUmVkbyAmJiBzZWxmLmhhc0hpZGRlbkNvbnRlbnRFZGl0YWJsZSkgeworICAgIGlmIChz ZWxmLmZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0Zv ckVkaXRpbmcgJiYgc2VsZi5oYXNIaWRkZW5Db250ZW50RWRpdGFibGUpIHsKICAgICAgICAgaWYg KCFfcXVpcmt5VW5kb01hbmFnZXIpCiAgICAgICAgICAgICBfcXVpcmt5VW5kb01hbmFnZXIgPSBh ZG9wdE5TKFtbV0tRdWlya3lOU1VuZG9NYW5hZ2VyIGFsbG9jXSBpbml0V2l0aENvbnRlbnRWaWV3 OnNlbGZdKTsKICAgICAgICAgcmV0dXJuIF9xdWlya3lVbmRvTWFuYWdlci5nZXQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCmluZGV4IDlhNmQyMTRlNGJjOThlYWYyYWQzYzMwZGRhOGQ4YzkyYTdmZTU1NWMuLjQ4 ZDc0NTk4MmE2OTI2NTA0ZTM2MWJkMDcxMzc2NmZjNzZhMzQ0ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpA QCAtMzExNywxMiArMzExNywyMiBAQCAtICh2b2lkKXNlbGVjdEFsbEZvcldlYlZpZXc6KGlkKXNl bmRlcgogICAgIF9wYWdlLT5zZWxlY3RBbGwoKTsKIH0KIAorc3RhdGljIGJvb2wgc2hvdWxkU3lu dGhlemllS2V5RXZlbnRzKFdLQ29udGVudFZpZXcgKmNvbnRlbnRWaWV3KQoreworICAgIGlmIChj b250ZW50Vmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlF dmVudHNGb3JFZGl0aW5nICYmIGNvbnRlbnRWaWV3Lmhhc0hpZGRlbkNvbnRlbnRFZGl0YWJsZSkK KyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiAtICh2b2lkKXRv Z2dsZUJvbGRmYWNlRm9yV2ViVmlldzooaWQpc2VuZGVyCiB7CiAgICAgaWYgKCFfcGFnZS0+ZWRp dG9yU3RhdGUoKS5pc0NvbnRlbnRSaWNobHlFZGl0YWJsZSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgW3NlbGYgZXhlY3V0ZUVkaXRDb21tYW5kV2l0aENhbGxiYWNrOkAidG9nZ2xlQm9sZCJdOwor CisgICAgaWYgKHNob3VsZFN5bnRoZXppZUtleUV2ZW50cyhzZWxmKSkKKyAgICAgICAgX3BhZ2Ut PmdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5n Q29tbWFuZFR5cGU6OlRvZ2dsZUJvbGRmYWNlKTsKIH0KIAogLSAodm9pZCl0b2dnbGVJdGFsaWNz Rm9yV2ViVmlldzooaWQpc2VuZGVyCkBAIC0zMTMxLDYgKzMxNDEsOSBAQCAtICh2b2lkKXRvZ2ds ZUl0YWxpY3NGb3JXZWJWaWV3OihpZClzZW5kZXIKICAgICAgICAgcmV0dXJuOwogCiAgICAgW3Nl bGYgZXhlY3V0ZUVkaXRDb21tYW5kV2l0aENhbGxiYWNrOkAidG9nZ2xlSXRhbGljIl07CisKKyAg ICBpZiAoc2hvdWxkU3ludGhlemllS2V5RXZlbnRzKHNlbGYpKQorICAgICAgICBfcGFnZS0+Z2Vu ZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21t YW5kVHlwZTo6VG9nZ2xlSXRhbGljKTsKIH0KIAogLSAodm9pZCl0b2dnbGVVbmRlcmxpbmVGb3JX ZWJWaWV3OihpZClzZW5kZXIKQEAgLTMxMzksNiArMzE1Miw5IEBAIC0gKHZvaWQpdG9nZ2xlVW5k ZXJsaW5lRm9yV2ViVmlldzooaWQpc2VuZGVyCiAgICAgICAgIHJldHVybjsKIAogICAgIFtzZWxm IGV4ZWN1dGVFZGl0Q29tbWFuZFdpdGhDYWxsYmFjazpAInRvZ2dsZVVuZGVybGluZSJdOworCisg ICAgaWYgKHNob3VsZFN5bnRoZXppZUtleUV2ZW50cyhzZWxmKSkKKyAgICAgICAgX3BhZ2UtPmdl bmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29t bWFuZFR5cGU6OlRvZ2dsZVVuZGVybGluZSk7CiB9CiAKIC0gKHZvaWQpX3Nob3dUZXh0U3R5bGVP cHRpb25zRm9yV2ViVmlldzooaWQpc2VuZGVyCkBAIC01MjE5LDcgKzUyMzUsNyBAQCAtICh2b2lk KV9lbGVtZW50RGlkQmx1cgogICAgIEJPT0wgZWRpdGFibGVDaGFuZ2VkID0gW3NlbGYgc2V0SXNF ZGl0YWJsZTpOT107CiAKICAgICBfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlw ZSA9IFdlYktpdDo6SW5wdXRUeXBlOjpOb25lOwotICAgIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JVbmRvQW5kUmVkbyA9IGZhbHNlOworICAg IF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JF ZGl0aW5nID0gZmFsc2U7CiAgICAgX2lucHV0UGVyaXBoZXJhbCA9IG5pbDsKICAgICBfZm9jdXNS ZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IE5POwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IGY0MjEyYjAw M2Q5Y2EwMDEwMjIyMGJjYjY3Y2JjZDljNGRkNmYxZjkuLjM4YmY4ZmU1Zjc3YThjMTZkNjYxMGIw YTE1OTZiYjcxZWFhZjdhNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC02MTUsNiArNjE1LDM2IEBAIHZvaWQgV2ViUGFn ZTo6Z2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChTeW50aGV0aWNFZGl0aW5nQ29tbWFu ZFR5cGUgY29tbWFuCiAjZW5kaWYKICAgICAgICAgQCJVKzAwNTkiLCA4OSwgZmFsc2UsIGZhbHNl LCBmYWxzZSwgbW9kaWZpZXJzLCBXYWxsVGltZTo6bm93KCkpOwogICAgICAgICBicmVhazsKKyAg ICBjYXNlIFN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZTo6VG9nZ2xlQm9sZGZhY2U6CisgICAg ICAgIGtleUV2ZW50ID0gUGxhdGZvcm1LZXlib2FyZEV2ZW50KFBsYXRmb3JtRXZlbnQ6OktleURv d24sICJiIiwgImIiLAorI2lmIEVOQUJMRShLRVlCT0FSRF9LRVlfQVRUUklCVVRFKQorICAgICAg ICAiYiIsCisjZW5kaWYKKyNpZiBFTkFCTEUoS0VZQk9BUkRfQ09ERV9BVFRSSUJVVEUpCisgICAg ICAgICJLZXlCIl9zLAorI2VuZGlmCisgICAgICAgIEAiVSswMDQyIiwgNjYsIGZhbHNlLCBmYWxz ZSwgZmFsc2UsIG1vZGlmaWVycywgV2FsbFRpbWU6Om5vdygpKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZUl0YWxpYzoKKyAgICAg ICAga2V5RXZlbnQgPSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQoUGxhdGZvcm1FdmVudDo6S2V5RG93 biwgImkiLCAiaSIsCisjaWYgRU5BQkxFKEtFWUJPQVJEX0tFWV9BVFRSSUJVVEUpCisgICAgICAg ICJpIiwKKyNlbmRpZgorI2lmIEVOQUJMRShLRVlCT0FSRF9DT0RFX0FUVFJJQlVURSkKKyAgICAg ICAgIktleUkiX3MsCisjZW5kaWYKKyAgICAgICAgQCJVKzAwNDkiLCA3MywgZmFsc2UsIGZhbHNl LCBmYWxzZSwgbW9kaWZpZXJzLCBXYWxsVGltZTo6bm93KCkpOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIFN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZTo6VG9nZ2xlVW5kZXJsaW5lOgorICAg ICAgICBrZXlFdmVudCA9IFBsYXRmb3JtS2V5Ym9hcmRFdmVudChQbGF0Zm9ybUV2ZW50OjpLZXlE b3duLCAidSIsICJ1IiwKKyNpZiBFTkFCTEUoS0VZQk9BUkRfS0VZX0FUVFJJQlVURSkKKyAgICAg ICAgInUiLAorI2VuZGlmCisjaWYgRU5BQkxFKEtFWUJPQVJEX0NPREVfQVRUUklCVVRFKQorICAg ICAgICAiS2V5VSJfcywKKyNlbmRpZgorICAgICAgICBAIlUrMDA1NSIsIDg1LCBmYWxzZSwgZmFs c2UsIGZhbHNlLCBtb2RpZmllcnMsIFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIGJyZWFrOwog ICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTI4NzcsNyArMjkwNyw3IEBA IHZvaWQgV2ViUGFnZTo6Z2V0Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbihGb2N1c2VkRWxlbWVu dEluZm9ybWF0aW9uJiBpbmZvcm1hdGlvCiAgICAgICAgICAgICBpbmZvcm1hdGlvbi5pc0F1dG9j b3JyZWN0ID0gZm9jdXNlZEVsZW1lbnQuc2hvdWxkQXV0b2NvcnJlY3QoKTsKICAgICAgICAgICAg IGluZm9ybWF0aW9uLmF1dG9jYXBpdGFsaXplVHlwZSA9IGZvY3VzZWRFbGVtZW50LmF1dG9jYXBp dGFsaXplVHlwZSgpOwogICAgICAgICAgICAgaW5mb3JtYXRpb24uaW5wdXRNb2RlID0gZm9jdXNl ZEVsZW1lbnQuY2Fub25pY2FsSW5wdXRNb2RlKCk7Ci0gICAgICAgICAgICBpbmZvcm1hdGlvbi5z aG91bGRTeW50aGVzaXplS2V5RXZlbnRzRm9yVW5kb0FuZFJlZG8gPSBmb2N1c2VkRWxlbWVudC5k b2N1bWVudCgpLnF1aXJrcygpLnNob3VsZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRpdGFibGVB cmVhcygpOworICAgICAgICAgICAgaW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50 c0ZvckVkaXRpbmcgPSBmb2N1c2VkRWxlbWVudC5kb2N1bWVudCgpLnF1aXJrcygpLnNob3VsZEVt dWxhdGVFZGl0aW5nQnV0dG9uc0FuZEdlc3R1cmVzSW5IaWRkZW5FZGl0YWJsZUFyZWFzKCk7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpbmZvcm1hdGlvbi5pc0F1dG9jb3JyZWN0ID0g dHJ1ZTsKICAgICAgICAgICAgIGluZm9ybWF0aW9uLmF1dG9jYXBpdGFsaXplVHlwZSA9IEF1dG9j YXBpdGFsaXplVHlwZURlZmF1bHQ7Cg== 371619 2019-06-07 15:51:36 -0700 2019-06-07 16:54:49 -0700 Patch bug-198681-20190607155135.patch text/plain 12513 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThkMDk5MzY1YjEwYzkx OGQ1Y2NhYzM2ODQwMWRkYTAxOTUzOTQ3Yi4uYjFlZjhiZDJjNjE1YTczMDdhNTY3YzI5NWYxNzE3 ZDM5NWViZTgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSArMSwxOSBAQAorMjAxOS0wNi0wNyAgTWVnYW4g R2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4dGVuZCBxdWly a3MgdG8gZW11bGF0ZSBib2xkL2l0YWxpYy91bmRlcmxpbmUgaW4gaGlkZGVuIGVkaXRhYmxlIGFy ZWFzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg2 ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgb25seS4KKworICAgICAgICBSZW5hbWUgcXVpcmtzIHRvIGJlIG1vcmUgYWNjdXJhdGUgZm9y IG5ldyBleHRlbmRlZCB1c2UuCisKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpzaG91bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVu RWRpdGFibGVBcmVhc0Zvckhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6UXVpcmtzOjpzaG91bGRF bXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhcyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRFbXVsYXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRh YmxlQXJlYXNGb3JIb3N0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlF1aXJrczo6c2hv dWxkRW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJsZUFyZWFzIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBwYWdlL1F1aXJrcy5oOgorCiA9PSBSb2xsZWQgb3ZlciB0byBDaGFuZ2VMb2ct MjAxOS0wNi0wNSA9PQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBmODdjMmFhZjY3OWExOTIyNzI4MGU4YzZhZjc4Y2U5 ZWQ3ZjQyNmQzLi5jOTc0N2I0ZmE1YjQ5ODk4YjNiZGE3NDdmYWQ5YzIwNDE4ZGM4YmQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA2LTA3ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5f Z2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRXh0ZW5kIHF1aXJrcyB0byBlbXVsYXRlIGJv bGQvaXRhbGljL3VuZGVybGluZSBpbiBoaWRkZW4gZWRpdGFibGUgYXJlYXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODY4MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL0ZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxlbWVudElu Zm9ybWF0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLmg6CisgICAgICAgICogU2hhcmVkL1N5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyB1bmRvTWFuYWdlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoc2hvdWxkU3ludGhlemllS2V5RXZl bnRzKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB0b2dnbGVCb2xkZmFjZUZvcldlYlZpZXc6 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgdG9nZ2xlSXRhbGljc0ZvcldlYlZpZXc6XSk6 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgdG9nZ2xlVW5kZXJsaW5lRm9yV2ViVmlldzpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZWxlbWVudERpZEJsdXJdKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OmdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpnZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKToKKwogMjAxOS0wNi0wNSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGxvZ1Np dGVJZGVudGlmaWVyIGZyb20gVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6 OnJlcXVlc3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcApp bmRleCAyYWFhMDcxMTNhMWJlYmIwYjVkMzI3YzAzNDJiYTBhNDg3ZWYxNDFiLi5hNDJkMjJhMTBj ZjBiZjZkNDc0NGI2MjIwNzU1NmE0NDA3YThiOTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1F1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCkBA IC0yMzgsNyArMjM4LDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkU3VwcHJlc3NBdXRvY29ycmVjdGlv bkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlkZGVuRWRpdGFibGVBcmUKICNlbmRpZgogfQogCi1z dGF0aWMgYm9vbCBzaG91bGRFbXVsYXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRhYmxlQXJlYXNGb3JI b3N0KGNvbnN0IFN0cmluZ1ZpZXcmIGhvc3QpCitzdGF0aWMgYm9vbCBzaG91bGRFbXVsYXRlRWRp dGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QoY29uc3Qg U3RyaW5nVmlldyYgaG9zdCkKIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHJldHVy biBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShob3N0LCAiZG9jcy5nb29nbGUuY29tIik7 CkBAIC0yNjYsMTIgKzI2NiwxMiBAQCBib29sIFF1aXJrczo6c2hvdWxkRGlzcGF0Y2hTeW50aGV0 aWNNb3VzZUV2ZW50c1doZW5Nb2RpZnlpbmdTZWxlY3Rpb24oKSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBRdWlya3M6OnNob3VsZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRp dGFibGVBcmVhcygpIGNvbnN0Citib29sIFF1aXJrczo6c2hvdWxkRW11bGF0ZUVkaXRpbmdCdXR0 b25zQW5kR2VzdHVyZXNJbkhpZGRlbkVkaXRhYmxlQXJlYXMoKSBjb25zdAogewogICAgIGlmICgh bmVlZHNRdWlya3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHNob3Vs ZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QobV9kb2N1bWVudC0+ dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCkpOworICAgIHJldHVybiBzaG91bGRFbXVsYXRlRWRp dGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3QobV9kb2N1 bWVudC0+dG9wRG9jdW1lbnQoKS51cmwoKS5ob3N0KCkpOwogfQogCiBib29sIFF1aXJrczo6c2hv dWxkU3VwcHJlc3NBdXRvY29ycmVjdGlvbkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlkZGVuRWRp dGFibGVBcmVhcygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr cy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaAppbmRleCA2YjFmMWJiOTUzN2E1ZDAz M2Q5NTdlODUxZTliNGMxNWYzZjFiMTk0Li4zYTZiYTFiZDg1ZGM4N2Y4YzkzYmQ1MmEyNzYyZTk3 NDdhZGE2MGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzaG91bGREaXNwYXRjaFN5bnRoZXRpY01vdXNlRXZl bnRzV2hlbk1vZGlmeWluZ1NlbGVjdGlvbigpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgc2hvdWxkU3VwcHJlc3NBdXRvY29ycmVjdGlvbkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlk ZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0OwotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hvdWxk RW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJsZUFyZWFzKCkgY29uc3Q7CisgICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBzaG91bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlk ZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNUb3Vj aEJhclVwZGF0ZVN1cHJlc3NlZEZvckhpZGRlbkNvbnRlbnRFZGl0YWJsZSgpIGNvbnN0OwogICAg IFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNOZXZlclJpY2hseUVkaXRhYmxlRm9yVG91Y2hCYXIoKSBj b25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJ bmZvcm1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLmNwcAppbmRleCBjZGVmMWEyNGJlNTVjZTJmNGIzZTdlMzg1ODM2MGQwMjRiMTk4MWY4 Li40OGZiMzI0MjNkNTU4YjIwZGJlN2Q5ZWIxMGM4ZTg3MDcyYjE0MGRiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcApAQCAtMTA0 LDcgKzEwNCw3IEBAIHZvaWQgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbjo6ZW5jb2RlKElQQzo6 RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHN1Z2dlc3RlZENvbG9yczsK ICNlbmRpZgogI2VuZGlmCi0gICAgZW5jb2RlciA8PCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yVW5kb0FuZFJlZG87CisgICAgZW5jb2RlciA8PCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yRWRpdGluZzsKIH0KIAogYm9vbCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjpkZWNvZGUo SVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJiByZXN1bHQp CkBAIC0yMjMsNyArMjIzLDcgQEAgYm9vbCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjpkZWNv ZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBGb2N1c2VkRWxlbWVudEluZm8KICAgICAgICAgcmV0 dXJuIGZhbHNlOwogI2VuZGlmCiAjZW5kaWYKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzRm9yVW5kb0FuZFJlZG8pKQorICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0LnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JFZGl0aW5nKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmggYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmgKaW5kZXggYjM5MDBjZWIz Y2IyYWRlMDUyZDQ5YzU4ZmY3OTQyMzk0YjE0NzdjYS4uOGQwM2FlMmU1YjU0MThmNjBlN2QyNmM5 ZDkyZjdjYzMyNGFhOGQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNl ZEVsZW1lbnRJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uaApAQCAtMTM2LDcgKzEzNiw3IEBAIHN0cnVjdCBGb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uIHsKICAgICBWZWN0b3I8V2ViQ29yZTo6Q29sb3I+IHN1Z2dlc3RlZENv bG9yczsKICNlbmRpZgogI2VuZGlmCi0gICAgYm9vbCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yVW5kb0FuZFJlZG8geyBmYWxzZSB9OworICAgIGJvb2wgc2hvdWxkU3ludGhlc2l6ZUtleUV2 ZW50c0ZvckVkaXRpbmcgeyBmYWxzZSB9OwogCiAgICAgRm9jdXNlZEVsZW1lbnRJZGVudGlmaWVy IGZvY3VzZWRFbGVtZW50SWRlbnRpZmllciB7IDAgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlLmggYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9TeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUuaAppbmRleCA3ZTM4MWU0N2QwYzkx NWVlMmY0YjI5YTQ3ZjM1OWJkNjkzODIyMDBhLi5mNzgxNGQzZGQxOTM2NmM3YjQzN2ViMDc3MWEy MDcyYjhiOGFiMWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TeW50aGV0aWNF ZGl0aW5nQ29tbWFuZFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TeW50aGV0aWNF ZGl0aW5nQ29tbWFuZFR5cGUuaApAQCAtMjksNyArMjksMTAgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAgICAgCiBlbnVtIGNsYXNzIFN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZSA6IHVpbnQ4X3Qg IHsKICAgICBVbmRvLAotICAgIFJlZG8KKyAgICBSZWRvLAorICAgIFRvZ2dsZUJvbGRmYWNlLAor ICAgIFRvZ2dsZUl0YWxpYywKKyAgICBUb2dnbGVVbmRlcmxpbmUKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApAQCAtNDAsNyArNDMsMTAgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0 czxXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZT4gewogICAgIHVzaW5nIHZhbHVl cyA9IEVudW1WYWx1ZXMgPAogICAgIFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBl LAogICAgIFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpVbmRvLAotICAgIFdl YktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpSZWRvCisgICAgV2ViS2l0OjpTeW50 aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlJlZG8sCisgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0 aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZUJvbGRmYWNlLAorICAgIFdlYktpdDo6U3ludGhldGljRWRp dGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVJdGFsaWMsCisgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0 aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZVVuZGVybGluZQogICAgID47CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDU2YjQ1NjJjNzk2YTcx NGI5YTA5MzdkNjY4MjgxMzdiODhiNDY5MjMuLjMxNWM3YjlhMzFlMTBhNzllYTViZWQyNmVmMGRl ZjJlZDI0MWZhOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3Lm1tCkBAIC00NDMsNyArNDQzLDcgQEAgLSAodm9pZClkaWRab29tVG9TY2FsZTooQ0dGbG9h dClzY2FsZQogCiAtIChOU1VuZG9NYW5hZ2VyICopdW5kb01hbmFnZXIKIHsKLSAgICBpZiAoc2Vs Zi5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JV bmRvQW5kUmVkbyAmJiBzZWxmLmhhc0hpZGRlbkNvbnRlbnRFZGl0YWJsZSkgeworICAgIGlmIChz ZWxmLmZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0Zv ckVkaXRpbmcgJiYgc2VsZi5oYXNIaWRkZW5Db250ZW50RWRpdGFibGUpIHsKICAgICAgICAgaWYg KCFfcXVpcmt5VW5kb01hbmFnZXIpCiAgICAgICAgICAgICBfcXVpcmt5VW5kb01hbmFnZXIgPSBh ZG9wdE5TKFtbV0tRdWlya3lOU1VuZG9NYW5hZ2VyIGFsbG9jXSBpbml0V2l0aENvbnRlbnRWaWV3 OnNlbGZdKTsKICAgICAgICAgcmV0dXJuIF9xdWlya3lVbmRvTWFuYWdlci5nZXQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCmluZGV4IDlhNmQyMTRlNGJjOThlYWYyYWQzYzMwZGRhOGQ4YzkyYTdmZTU1NWMuLjQz M2M0ZTY0MGY0MmEyYzE5MTVjOTQ2OTI0ZWVlODIzNGQ2YmEyYzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpA QCAtMzExNywxMiArMzExNywyMiBAQCAtICh2b2lkKXNlbGVjdEFsbEZvcldlYlZpZXc6KGlkKXNl bmRlcgogICAgIF9wYWdlLT5zZWxlY3RBbGwoKTsKIH0KIAorLSAoQk9PTClzaG91bGRTeW50aGVz aXplS2V5RXZlbnRzCit7CisgICAgaWYgKF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNob3Vs ZFN5bnRoZXNpemVLZXlFdmVudHNGb3JFZGl0aW5nICYmIHNlbGYuaGFzSGlkZGVuQ29udGVudEVk aXRhYmxlKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIC0g KHZvaWQpdG9nZ2xlQm9sZGZhY2VGb3JXZWJWaWV3OihpZClzZW5kZXIKIHsKICAgICBpZiAoIV9w YWdlLT5lZGl0b3JTdGF0ZSgpLmlzQ29udGVudFJpY2hseUVkaXRhYmxlKQogICAgICAgICByZXR1 cm47CiAKICAgICBbc2VsZiBleGVjdXRlRWRpdENvbW1hbmRXaXRoQ2FsbGJhY2s6QCJ0b2dnbGVC b2xkIl07CisKKyAgICBpZiAoc2VsZi5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzKQorICAgICAg ICBfcGFnZS0+Z2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChXZWJLaXQ6OlN5bnRoZXRp Y0VkaXRpbmdDb21tYW5kVHlwZTo6VG9nZ2xlQm9sZGZhY2UpOwogfQogCiAtICh2b2lkKXRvZ2ds ZUl0YWxpY3NGb3JXZWJWaWV3OihpZClzZW5kZXIKQEAgLTMxMzEsNiArMzE0MSw5IEBAIC0gKHZv aWQpdG9nZ2xlSXRhbGljc0ZvcldlYlZpZXc6KGlkKXNlbmRlcgogICAgICAgICByZXR1cm47CiAK ICAgICBbc2VsZiBleGVjdXRlRWRpdENvbW1hbmRXaXRoQ2FsbGJhY2s6QCJ0b2dnbGVJdGFsaWMi XTsKKworICAgIGlmIChzZWxmLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHMpCisgICAgICAgIF9w YWdlLT5nZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKFdlYktpdDo6U3ludGhldGljRWRp dGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVJdGFsaWMpOwogfQogCiAtICh2b2lkKXRvZ2dsZVVuZGVy bGluZUZvcldlYlZpZXc6KGlkKXNlbmRlcgpAQCAtMzEzOSw2ICszMTUyLDkgQEAgLSAodm9pZCl0 b2dnbGVVbmRlcmxpbmVGb3JXZWJWaWV3OihpZClzZW5kZXIKICAgICAgICAgcmV0dXJuOwogCiAg ICAgW3NlbGYgZXhlY3V0ZUVkaXRDb21tYW5kV2l0aENhbGxiYWNrOkAidG9nZ2xlVW5kZXJsaW5l Il07CisKKyAgICBpZiAoc2VsZi5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzKQorICAgICAgICBf cGFnZS0+Z2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChXZWJLaXQ6OlN5bnRoZXRpY0Vk aXRpbmdDb21tYW5kVHlwZTo6VG9nZ2xlVW5kZXJsaW5lKTsKIH0KIAogLSAodm9pZClfc2hvd1Rl eHRTdHlsZU9wdGlvbnNGb3JXZWJWaWV3OihpZClzZW5kZXIKQEAgLTUyMTksNyArNTIzNSw3IEBA IC0gKHZvaWQpX2VsZW1lbnREaWRCbHVyCiAgICAgQk9PTCBlZGl0YWJsZUNoYW5nZWQgPSBbc2Vs ZiBzZXRJc0VkaXRhYmxlOk5PXTsKIAogICAgIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVs ZW1lbnRUeXBlID0gV2ViS2l0OjpJbnB1dFR5cGU6Ok5vbmU7Ci0gICAgX2ZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0ZvclVuZG9BbmRSZWRvID0gZmFs c2U7CisgICAgX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2 ZW50c0ZvckVkaXRpbmcgPSBmYWxzZTsKICAgICBfaW5wdXRQZXJpcGhlcmFsID0gbmlsOwogICAg IF9mb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0gTk87CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXgg ZjQyMTJiMDAzZDljYTAwMTAyMjIwYmNiNjdjYmNkOWM0ZGQ2ZjFmOS4uMzhiZjhmZTVmNzdhOGMx NmQ2NjEwYjBhMTU5NmJiNzFlYWFmN2E1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTYxNSw2ICs2MTUsMzYgQEAgdm9p ZCBXZWJQYWdlOjpnZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKFN5bnRoZXRpY0VkaXRp bmdDb21tYW5kVHlwZSBjb21tYW4KICNlbmRpZgogICAgICAgICBAIlUrMDA1OSIsIDg5LCBmYWxz ZSwgZmFsc2UsIGZhbHNlLCBtb2RpZmllcnMsIFdhbGxUaW1lOjpub3coKSk7CiAgICAgICAgIGJy ZWFrOworICAgIGNhc2UgU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVCb2xkZmFj ZToKKyAgICAgICAga2V5RXZlbnQgPSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQoUGxhdGZvcm1FdmVu dDo6S2V5RG93biwgImIiLCAiYiIsCisjaWYgRU5BQkxFKEtFWUJPQVJEX0tFWV9BVFRSSUJVVEUp CisgICAgICAgICJiIiwKKyNlbmRpZgorI2lmIEVOQUJMRShLRVlCT0FSRF9DT0RFX0FUVFJJQlVU RSkKKyAgICAgICAgIktleUIiX3MsCisjZW5kaWYKKyAgICAgICAgQCJVKzAwNDIiLCA2NiwgZmFs c2UsIGZhbHNlLCBmYWxzZSwgbW9kaWZpZXJzLCBXYWxsVGltZTo6bm93KCkpOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIFN5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZTo6VG9nZ2xlSXRhbGlj OgorICAgICAgICBrZXlFdmVudCA9IFBsYXRmb3JtS2V5Ym9hcmRFdmVudChQbGF0Zm9ybUV2ZW50 OjpLZXlEb3duLCAiaSIsICJpIiwKKyNpZiBFTkFCTEUoS0VZQk9BUkRfS0VZX0FUVFJJQlVURSkK KyAgICAgICAgImkiLAorI2VuZGlmCisjaWYgRU5BQkxFKEtFWUJPQVJEX0NPREVfQVRUUklCVVRF KQorICAgICAgICAiS2V5SSJfcywKKyNlbmRpZgorICAgICAgICBAIlUrMDA0OSIsIDczLCBmYWxz ZSwgZmFsc2UsIGZhbHNlLCBtb2RpZmllcnMsIFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVVbmRlcmxp bmU6CisgICAgICAgIGtleUV2ZW50ID0gUGxhdGZvcm1LZXlib2FyZEV2ZW50KFBsYXRmb3JtRXZl bnQ6OktleURvd24sICJ1IiwgInUiLAorI2lmIEVOQUJMRShLRVlCT0FSRF9LRVlfQVRUUklCVVRF KQorICAgICAgICAidSIsCisjZW5kaWYKKyNpZiBFTkFCTEUoS0VZQk9BUkRfQ09ERV9BVFRSSUJV VEUpCisgICAgICAgICJLZXlVIl9zLAorI2VuZGlmCisgICAgICAgIEAiVSswMDU1IiwgODUsIGZh bHNlLCBmYWxzZSwgZmFsc2UsIG1vZGlmaWVycywgV2FsbFRpbWU6Om5vdygpKTsKKyAgICAgICAg YnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtMjg3Nyw3ICsy OTA3LDcgQEAgdm9pZCBXZWJQYWdlOjpnZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKEZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb24mIGluZm9ybWF0aW8KICAgICAgICAgICAgIGluZm9ybWF0aW9u LmlzQXV0b2NvcnJlY3QgPSBmb2N1c2VkRWxlbWVudC5zaG91bGRBdXRvY29ycmVjdCgpOwogICAg ICAgICAgICAgaW5mb3JtYXRpb24uYXV0b2NhcGl0YWxpemVUeXBlID0gZm9jdXNlZEVsZW1lbnQu YXV0b2NhcGl0YWxpemVUeXBlKCk7CiAgICAgICAgICAgICBpbmZvcm1hdGlvbi5pbnB1dE1vZGUg PSBmb2N1c2VkRWxlbWVudC5jYW5vbmljYWxJbnB1dE1vZGUoKTsKLSAgICAgICAgICAgIGluZm9y bWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JVbmRvQW5kUmVkbyA9IGZvY3VzZWRF bGVtZW50LmRvY3VtZW50KCkucXVpcmtzKCkuc2hvdWxkRW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5F ZGl0YWJsZUFyZWFzKCk7CisgICAgICAgICAgICBpbmZvcm1hdGlvbi5zaG91bGRTeW50aGVzaXpl S2V5RXZlbnRzRm9yRWRpdGluZyA9IGZvY3VzZWRFbGVtZW50LmRvY3VtZW50KCkucXVpcmtzKCku c2hvdWxkRW11bGF0ZUVkaXRpbmdCdXR0b25zQW5kR2VzdHVyZXNJbkhpZGRlbkVkaXRhYmxlQXJl YXMoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGluZm9ybWF0aW9uLmlzQXV0b2Nv cnJlY3QgPSB0cnVlOwogICAgICAgICAgICAgaW5mb3JtYXRpb24uYXV0b2NhcGl0YWxpemVUeXBl ID0gQXV0b2NhcGl0YWxpemVUeXBlRGVmYXVsdDsK 371632 2019-06-07 16:54:51 -0700 2019-06-07 17:48:48 -0700 Patch for landing bug-198681-20190607165450.patch text/plain 12509 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZThkMDk5MzY1YjEwYzkx OGQ1Y2NhYzM2ODQwMWRkYTAxOTUzOTQ3Yi4uMmU2NmNiZGE4Y2I3YmZlNDRlOTRhMDJhY2M4YmQ5 ZDQ0YmU3MDhiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSArMSwxOSBAQAorMjAxOS0wNi0wNyAgTWVnYW4g R2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4dGVuZCBxdWly a3MgdG8gZW11bGF0ZSBib2xkL2l0YWxpYy91bmRlcmxpbmUgaW4gaGlkZGVuIGVkaXRhYmxlIGFy ZWFzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg2 ODEKKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgUmVuYW1l IG9ubHkuCisKKyAgICAgICAgUmVuYW1lIHF1aXJrcyB0byBiZSBtb3JlIGFjY3VyYXRlIGZvciBu ZXcgZXh0ZW5kZWQgdXNlLgorCisgICAgICAgICogcGFnZS9RdWlya3MuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c2hvdWxkRW11bGF0ZUVkaXRpbmdCdXR0b25zQW5kR2VzdHVyZXNJbkhpZGRlbkVk aXRhYmxlQXJlYXNGb3JIb3N0KToKKyAgICAgICAgKFdlYkNvcmU6OlF1aXJrczo6c2hvdWxkRW11 bGF0ZUVkaXRpbmdCdXR0b25zQW5kR2VzdHVyZXNJbkhpZGRlbkVkaXRhYmxlQXJlYXMgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJs ZUFyZWFzRm9ySG9zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpRdWlya3M6OnNob3Vs ZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRpdGFibGVBcmVhcyBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogcGFnZS9RdWlya3MuaDoKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIw MTktMDYtMDUgPT0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZjg3YzJhYWY2NzlhMTkyMjcyODBlOGM2YWY3OGNlOWVk N2Y0MjZkMy4uYTVlYWFmZTgzZThmNGJlMDA3YTBmYjMwZTBiZmRiMjRiZjk0MTIwYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNyBAQAorMjAxOS0wNi0wNyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dh cmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4dGVuZCBxdWlya3MgdG8gZW11bGF0ZSBib2xk L2l0YWxpYy91bmRlcmxpbmUgaW4gaGlkZGVuIGVkaXRhYmxlIGFyZWFzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg2ODEKKworICAgICAgICBSZXZp ZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBTaGFyZWQvRm9jdXNlZEVsZW1lbnRJ bmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b246OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3Jt YXRpb246OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b24uaDoKKyAgICAgICAgKiBTaGFyZWQvU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IHVuZG9NYW5hZ2VyXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgIChzaG91bGRTeW50aGV6aWVLZXlFdmVudHMp OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHRvZ2dsZUJvbGRmYWNlRm9yV2ViVmlldzpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyB0b2dnbGVJdGFsaWNzRm9yV2ViVmlldzpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyB0b2dnbGVVbmRlcmxpbmVGb3JXZWJWaWV3Ol0pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbGVtZW50RGlkQmx1cl0pOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6Z2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OmdldEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24pOgorCiAyMDE5LTA2LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbG9nU2l0ZUlk ZW50aWZpZXIgZnJvbSBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6cmVx dWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9RdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCmluZGV4 IDJhYWEwNzExM2ExYmViYjBiNWQzMjdjMDM0MmJhMGE0ODdlZjE0MWIuLmE0MmQyMmExMGNmMGJm NmQ0NzQ0YjYyMjA3NTU2YTQ0MDdhOGI5NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAKQEAgLTIz OCw3ICsyMzgsNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRTdXBwcmVzc0F1dG9jb3JyZWN0aW9uQW5k QXV0b2NhcHRpYWxpemF0aW9uSW5IaWRkZW5FZGl0YWJsZUFyZQogI2VuZGlmCiB9CiAKLXN0YXRp YyBib29sIHNob3VsZEVtdWxhdGVVbmRvUmVkb0luSGlkZGVuRWRpdGFibGVBcmVhc0Zvckhvc3Qo Y29uc3QgU3RyaW5nVmlldyYgaG9zdCkKK3N0YXRpYyBib29sIHNob3VsZEVtdWxhdGVFZGl0aW5n QnV0dG9uc0FuZEdlc3R1cmVzSW5IaWRkZW5FZGl0YWJsZUFyZWFzRm9ySG9zdChjb25zdCBTdHJp bmdWaWV3JiBob3N0KQogewogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgcmV0dXJuIGVx dWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGhvc3QsICJkb2NzLmdvb2dsZS5jb20iKTsKQEAg LTI2NiwxMiArMjY2LDEyIEBAIGJvb2wgUXVpcmtzOjpzaG91bGREaXNwYXRjaFN5bnRoZXRpY01v dXNlRXZlbnRzV2hlbk1vZGlmeWluZ1NlbGVjdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1ib29sIFF1aXJrczo6c2hvdWxkRW11bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJs ZUFyZWFzKCkgY29uc3QKK2Jvb2wgUXVpcmtzOjpzaG91bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNB bmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0CiB7CiAgICAgaWYgKCFuZWVk c1F1aXJrcygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gc2hvdWxkRW11 bGF0ZVVuZG9SZWRvSW5IaWRkZW5FZGl0YWJsZUFyZWFzRm9ySG9zdChtX2RvY3VtZW50LT50b3BE b2N1bWVudCgpLnVybCgpLmhvc3QoKSk7CisgICAgcmV0dXJuIHNob3VsZEVtdWxhdGVFZGl0aW5n QnV0dG9uc0FuZEdlc3R1cmVzSW5IaWRkZW5FZGl0YWJsZUFyZWFzRm9ySG9zdChtX2RvY3VtZW50 LT50b3BEb2N1bWVudCgpLnVybCgpLmhvc3QoKSk7CiB9CiAKIGJvb2wgUXVpcmtzOjpzaG91bGRT dXBwcmVzc0F1dG9jb3JyZWN0aW9uQW5kQXV0b2NhcHRpYWxpemF0aW9uSW5IaWRkZW5FZGl0YWJs ZUFyZWFzKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCmluZGV4IDZiMWYxYmI5NTM3YTVkMDMzZDk1 N2U4NTFlOWI0YzE1ZjNmMWIxOTQuLjNhNmJhMWJkODVkYzg3ZjhjOTNiZDUyYTI3NjJlOTc0N2Fk YTYwYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuaApAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiAKICAg ICBXRUJDT1JFX0VYUE9SVCBib29sIHNob3VsZERpc3BhdGNoU3ludGhldGljTW91c2VFdmVudHNX aGVuTW9kaWZ5aW5nU2VsZWN0aW9uKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBz aG91bGRTdXBwcmVzc0F1dG9jb3JyZWN0aW9uQW5kQXV0b2NhcHRpYWxpemF0aW9uSW5IaWRkZW5F ZGl0YWJsZUFyZWFzKCkgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzaG91bGRFbXVs YXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRhYmxlQXJlYXMoKSBjb25zdDsKKyAgICBXRUJDT1JFX0VY UE9SVCBib29sIHNob3VsZEVtdWxhdGVFZGl0aW5nQnV0dG9uc0FuZEdlc3R1cmVzSW5IaWRkZW5F ZGl0YWJsZUFyZWFzKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc1RvdWNoQmFy VXBkYXRlU3VwcmVzc2VkRm9ySGlkZGVuQ29udGVudEVkaXRhYmxlKCkgY29uc3Q7CiAgICAgV0VC Q09SRV9FWFBPUlQgYm9vbCBpc05ldmVyUmljaGx5RWRpdGFibGVGb3JUb3VjaEJhcigpIGNvbnN0 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b24uY3BwCmluZGV4IGNkZWYxYTI0YmU1NWNlMmY0YjNlN2UzODU4MzYwZDAyNGIxOTgxZjguLjQ4 ZmIzMjQyM2Q1NThiMjBkYmU3ZDllYjEwYzhlODcwNzJiMTQwZGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwCkBAIC0xMDQsNyAr MTA0LDcgQEAgdm9pZCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOjplbmNvZGUoSVBDOjpFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgc3VnZ2VzdGVkQ29sb3JzOwogI2Vu ZGlmCiAjZW5kaWYKLSAgICBlbmNvZGVyIDw8IHNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JV bmRvQW5kUmVkbzsKKyAgICBlbmNvZGVyIDw8IHNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JF ZGl0aW5nOwogfQogCiBib29sIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb246OmRlY29kZShJUEM6 OkRlY29kZXImIGRlY29kZXIsIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24mIHJlc3VsdCkKQEAg LTIyMyw3ICsyMjMsNyBAQCBib29sIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb246OmRlY29kZShJ UEM6OkRlY29kZXImIGRlY29kZXIsIEZvY3VzZWRFbGVtZW50SW5mbwogICAgICAgICByZXR1cm4g ZmFsc2U7CiAjZW5kaWYKICNlbmRpZgotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNo b3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JVbmRvQW5kUmVkbykpCisgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQuc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0ZvckVkaXRpbmcpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaCBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaAppbmRleCBiMzkwMGNlYjNjYjJh ZGUwNTJkNDljNThmZjc5NDIzOTRiMTQ3N2NhLi44ZDAzYWUyZTViNTQxOGY2MGU3ZDI2YzlkOTJm N2NjMzI0YWE4ZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1l bnRJbmZvcm1hdGlvbi5oCkBAIC0xMzYsNyArMTM2LDcgQEAgc3RydWN0IEZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24gewogICAgIFZlY3RvcjxXZWJDb3JlOjpDb2xvcj4gc3VnZ2VzdGVkQ29sb3Jz OwogI2VuZGlmCiAjZW5kaWYKLSAgICBib29sIHNob3VsZFN5bnRoZXNpemVLZXlFdmVudHNGb3JV bmRvQW5kUmVkbyB7IGZhbHNlIH07CisgICAgYm9vbCBzaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yRWRpdGluZyB7IGZhbHNlIH07CiAKICAgICBGb2N1c2VkRWxlbWVudElkZW50aWZpZXIgZm9j dXNlZEVsZW1lbnRJZGVudGlmaWVyIHsgMCB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9TeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUuaCBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1N5bnRoZXRpY0VkaXRpbmdDb21tYW5kVHlwZS5oCmluZGV4IDdlMzgxZTQ3ZDBjOTE1ZWUy ZjRiMjlhNDdmMzU5YmQ2OTM4MjIwMGEuLmY3ODE0ZDNkZDE5MzY2YzdiNDM3ZWIwNzcxYTIwNzJi OGI4YWIxZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1N5bnRoZXRpY0VkaXRp bmdDb21tYW5kVHlwZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1N5bnRoZXRpY0VkaXRp bmdDb21tYW5kVHlwZS5oCkBAIC0yOSw3ICsyOSwxMCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAg ICAKIGVudW0gY2xhc3MgU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlIDogdWludDhfdCAgewog ICAgIFVuZG8sCi0gICAgUmVkbworICAgIFJlZG8sCisgICAgVG9nZ2xlQm9sZGZhY2UsCisgICAg VG9nZ2xlSXRhbGljLAorICAgIFRvZ2dsZVVuZGVybGluZQogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CkBAIC00MCw3ICs0MywxMCBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBFbnVtVHJhaXRzPFdl YktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlPiB7CiAgICAgdXNpbmcgdmFsdWVzID0g RW51bVZhbHVlcyA8CiAgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUsCiAg ICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlVuZG8sCi0gICAgV2ViS2l0 OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlJlZG8KKyAgICBXZWJLaXQ6OlN5bnRoZXRp Y0VkaXRpbmdDb21tYW5kVHlwZTo6UmVkbywKKyAgICBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdD b21tYW5kVHlwZTo6VG9nZ2xlQm9sZGZhY2UsCisgICAgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5n Q29tbWFuZFR5cGU6OlRvZ2dsZUl0YWxpYywKKyAgICBXZWJLaXQ6OlN5bnRoZXRpY0VkaXRpbmdD b21tYW5kVHlwZTo6VG9nZ2xlVW5kZXJsaW5lCiAgICAgPjsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggNTZiNDU2MmM3OTZhNzE0Yjlh MDkzN2Q2NjgyODEzN2I4OGI0NjkyMy4uMzE1YzdiOWEzMWUxMGE3OWVhNWJlZDI2ZWYwZGVmMmVk MjQxZmE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcu bW0KQEAgLTQ0Myw3ICs0NDMsNyBAQCAtICh2b2lkKWRpZFpvb21Ub1NjYWxlOihDR0Zsb2F0KXNj YWxlCiAKIC0gKE5TVW5kb01hbmFnZXIgKil1bmRvTWFuYWdlcgogewotICAgIGlmIChzZWxmLmZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0ZvclVuZG9B bmRSZWRvICYmIHNlbGYuaGFzSGlkZGVuQ29udGVudEVkaXRhYmxlKSB7CisgICAgaWYgKHNlbGYu Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzRm9yRWRp dGluZyAmJiBzZWxmLmhhc0hpZGRlbkNvbnRlbnRFZGl0YWJsZSkgewogICAgICAgICBpZiAoIV9x dWlya3lVbmRvTWFuYWdlcikKICAgICAgICAgICAgIF9xdWlya3lVbmRvTWFuYWdlciA9IGFkb3B0 TlMoW1tXS1F1aXJreU5TVW5kb01hbmFnZXIgYWxsb2NdIGluaXRXaXRoQ29udGVudFZpZXc6c2Vs Zl0pOwogICAgICAgICByZXR1cm4gX3F1aXJreVVuZG9NYW5hZ2VyLmdldCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggOWE2ZDIxNGU0YmM5OGVhZjJhZDNjMzBkZGE4ZDhjOTJhN2ZlNTU1Yy4uNDMzYzRl NjQwZjQyYTJjMTkxNWM5NDY5MjRlZWU4MjM0ZDZiYTJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0z MTE3LDEyICszMTE3LDIyIEBAIC0gKHZvaWQpc2VsZWN0QWxsRm9yV2ViVmlldzooaWQpc2VuZGVy CiAgICAgX3BhZ2UtPnNlbGVjdEFsbCgpOwogfQogCistIChCT09MKXNob3VsZFN5bnRoZXNpemVL ZXlFdmVudHMKK3sKKyAgICBpZiAoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uc2hvdWxkU3lu dGhlc2l6ZUtleUV2ZW50c0ZvckVkaXRpbmcgJiYgc2VsZi5oYXNIaWRkZW5Db250ZW50RWRpdGFi bGUpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKK30KKwogLSAodm9p ZCl0b2dnbGVCb2xkZmFjZUZvcldlYlZpZXc6KGlkKXNlbmRlcgogewogICAgIGlmICghX3BhZ2Ut PmVkaXRvclN0YXRlKCkuaXNDb250ZW50UmljaGx5RWRpdGFibGUpCiAgICAgICAgIHJldHVybjsK IAogICAgIFtzZWxmIGV4ZWN1dGVFZGl0Q29tbWFuZFdpdGhDYWxsYmFjazpAInRvZ2dsZUJvbGQi XTsKKworICAgIGlmIChzZWxmLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHMpCisgICAgICAgIF9w YWdlLT5nZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKFdlYktpdDo6U3ludGhldGljRWRp dGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVCb2xkZmFjZSk7CiB9CiAKIC0gKHZvaWQpdG9nZ2xlSXRh bGljc0ZvcldlYlZpZXc6KGlkKXNlbmRlcgpAQCAtMzEzMSw2ICszMTQxLDkgQEAgLSAodm9pZCl0 b2dnbGVJdGFsaWNzRm9yV2ViVmlldzooaWQpc2VuZGVyCiAgICAgICAgIHJldHVybjsKIAogICAg IFtzZWxmIGV4ZWN1dGVFZGl0Q29tbWFuZFdpdGhDYWxsYmFjazpAInRvZ2dsZUl0YWxpYyJdOwor CisgICAgaWYgKHNlbGYuc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50cykKKyAgICAgICAgX3BhZ2Ut PmdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5n Q29tbWFuZFR5cGU6OlRvZ2dsZUl0YWxpYyk7CiB9CiAKIC0gKHZvaWQpdG9nZ2xlVW5kZXJsaW5l Rm9yV2ViVmlldzooaWQpc2VuZGVyCkBAIC0zMTM5LDYgKzMxNTIsOSBAQCAtICh2b2lkKXRvZ2ds ZVVuZGVybGluZUZvcldlYlZpZXc6KGlkKXNlbmRlcgogICAgICAgICByZXR1cm47CiAKICAgICBb c2VsZiBleGVjdXRlRWRpdENvbW1hbmRXaXRoQ2FsbGJhY2s6QCJ0b2dnbGVVbmRlcmxpbmUiXTsK KworICAgIGlmIChzZWxmLnNob3VsZFN5bnRoZXNpemVLZXlFdmVudHMpCisgICAgICAgIF9wYWdl LT5nZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKFdlYktpdDo6U3ludGhldGljRWRpdGlu Z0NvbW1hbmRUeXBlOjpUb2dnbGVVbmRlcmxpbmUpOwogfQogCiAtICh2b2lkKV9zaG93VGV4dFN0 eWxlT3B0aW9uc0ZvcldlYlZpZXc6KGlkKXNlbmRlcgpAQCAtNTIxOSw3ICs1MjM1LDcgQEAgLSAo dm9pZClfZWxlbWVudERpZEJsdXIKICAgICBCT09MIGVkaXRhYmxlQ2hhbmdlZCA9IFtzZWxmIHNl dElzRWRpdGFibGU6Tk9dOwogCiAgICAgX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVu dFR5cGUgPSBXZWJLaXQ6OklucHV0VHlwZTo6Tm9uZTsKLSAgICBfZm9jdXNlZEVsZW1lbnRJbmZv cm1hdGlvbi5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRzRm9yVW5kb0FuZFJlZG8gPSBmYWxzZTsK KyAgICBfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5zaG91bGRTeW50aGVzaXplS2V5RXZlbnRz Rm9yRWRpdGluZyA9IGZhbHNlOwogICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7CiAgICAgX2Zv Y3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgPSBOTzsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBmNDIx MmIwMDNkOWNhMDAxMDIyMjBiY2I2N2NiY2Q5YzRkZDZmMWY5Li4zOGJmOGZlNWY3N2E4YzE2ZDY2 MTBiMGExNTk2YmI3MWVhYWY3YTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtNjE1LDYgKzYxNSwzNiBAQCB2b2lkIFdl YlBhZ2U6OmdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoU3ludGhldGljRWRpdGluZ0Nv bW1hbmRUeXBlIGNvbW1hbgogI2VuZGlmCiAgICAgICAgIEAiVSswMDU5IiwgODksIGZhbHNlLCBm YWxzZSwgZmFsc2UsIG1vZGlmaWVycywgV2FsbFRpbWU6Om5vdygpKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZUJvbGRmYWNlOgor ICAgICAgICBrZXlFdmVudCA9IFBsYXRmb3JtS2V5Ym9hcmRFdmVudChQbGF0Zm9ybUV2ZW50OjpL ZXlEb3duLCAiYiIsICJiIiwKKyNpZiBFTkFCTEUoS0VZQk9BUkRfS0VZX0FUVFJJQlVURSkKKyAg ICAgICAgImIiLAorI2VuZGlmCisjaWYgRU5BQkxFKEtFWUJPQVJEX0NPREVfQVRUUklCVVRFKQor ICAgICAgICAiS2V5QiJfcywKKyNlbmRpZgorICAgICAgICBAIlUrMDA0MiIsIDY2LCBmYWxzZSwg ZmFsc2UsIGZhbHNlLCBtb2RpZmllcnMsIFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgU3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlOjpUb2dnbGVJdGFsaWM6Cisg ICAgICAgIGtleUV2ZW50ID0gUGxhdGZvcm1LZXlib2FyZEV2ZW50KFBsYXRmb3JtRXZlbnQ6Oktl eURvd24sICJpIiwgImkiLAorI2lmIEVOQUJMRShLRVlCT0FSRF9LRVlfQVRUUklCVVRFKQorICAg ICAgICAiaSIsCisjZW5kaWYKKyNpZiBFTkFCTEUoS0VZQk9BUkRfQ09ERV9BVFRSSUJVVEUpCisg ICAgICAgICJLZXlJIl9zLAorI2VuZGlmCisgICAgICAgIEAiVSswMDQ5IiwgNzMsIGZhbHNlLCBm YWxzZSwgZmFsc2UsIG1vZGlmaWVycywgV2FsbFRpbWU6Om5vdygpKTsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGU6OlRvZ2dsZVVuZGVybGluZToK KyAgICAgICAga2V5RXZlbnQgPSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQoUGxhdGZvcm1FdmVudDo6 S2V5RG93biwgInUiLCAidSIsCisjaWYgRU5BQkxFKEtFWUJPQVJEX0tFWV9BVFRSSUJVVEUpCisg ICAgICAgICJ1IiwKKyNlbmRpZgorI2lmIEVOQUJMRShLRVlCT0FSRF9DT0RFX0FUVFJJQlVURSkK KyAgICAgICAgIktleVUiX3MsCisjZW5kaWYKKyAgICAgICAgQCJVKzAwNTUiLCA4NSwgZmFsc2Us IGZhbHNlLCBmYWxzZSwgbW9kaWZpZXJzLCBXYWxsVGltZTo6bm93KCkpOworICAgICAgICBicmVh azsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAgICB9CkBAIC0yODc3LDcgKzI5MDcs NyBAQCB2b2lkIFdlYlBhZ2U6OmdldEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24oRm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbiYgaW5mb3JtYXRpbwogICAgICAgICAgICAgaW5mb3JtYXRpb24uaXNB dXRvY29ycmVjdCA9IGZvY3VzZWRFbGVtZW50LnNob3VsZEF1dG9jb3JyZWN0KCk7CiAgICAgICAg ICAgICBpbmZvcm1hdGlvbi5hdXRvY2FwaXRhbGl6ZVR5cGUgPSBmb2N1c2VkRWxlbWVudC5hdXRv Y2FwaXRhbGl6ZVR5cGUoKTsKICAgICAgICAgICAgIGluZm9ybWF0aW9uLmlucHV0TW9kZSA9IGZv Y3VzZWRFbGVtZW50LmNhbm9uaWNhbElucHV0TW9kZSgpOwotICAgICAgICAgICAgaW5mb3JtYXRp b24uc2hvdWxkU3ludGhlc2l6ZUtleUV2ZW50c0ZvclVuZG9BbmRSZWRvID0gZm9jdXNlZEVsZW1l bnQuZG9jdW1lbnQoKS5xdWlya3MoKS5zaG91bGRFbXVsYXRlVW5kb1JlZG9JbkhpZGRlbkVkaXRh YmxlQXJlYXMoKTsKKyAgICAgICAgICAgIGluZm9ybWF0aW9uLnNob3VsZFN5bnRoZXNpemVLZXlF dmVudHNGb3JFZGl0aW5nID0gZm9jdXNlZEVsZW1lbnQuZG9jdW1lbnQoKS5xdWlya3MoKS5zaG91 bGRFbXVsYXRlRWRpdGluZ0J1dHRvbnNBbmRHZXN0dXJlc0luSGlkZGVuRWRpdGFibGVBcmVhcygp OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaW5mb3JtYXRpb24uaXNBdXRvY29ycmVj dCA9IHRydWU7CiAgICAgICAgICAgICBpbmZvcm1hdGlvbi5hdXRvY2FwaXRhbGl6ZVR5cGUgPSBB dXRvY2FwaXRhbGl6ZVR5cGVEZWZhdWx0Owo=