159172 2016-06-27 14:52:43 -0700 REGRESSION?(r202466): http/tests/security/canvas-remote-read-remote-video-redirect.html failing on Sierra 2016-06-27 23:44:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 159185 1 jer.noble jer.noble achristensen commit-queue eric.carlson ryanhaddad webkit-bug-importer oldest_to_newest 1205723 0 jer.noble 2016-06-27 14:52:43 -0700 REGRESSION?(r202466): http/tests/security/canvas-remote-read-remote-video-redirect.html failing on Sierra 1205724 1 jer.noble 2016-06-27 14:53:08 -0700 <rdar://problem/27030025> 1205733 2 282173 jer.noble 2016-06-27 15:08:17 -0700 Created attachment 282173 Patch 1205739 3 282176 jer.noble 2016-06-27 15:17:29 -0700 Created attachment 282176 Patch 1205764 4 282176 bfulgham 2016-06-27 16:29:54 -0700 Comment on attachment 282176 Patch LGTM. R=me. 1205775 5 282176 commit-queue 2016-06-27 16:56:28 -0700 Comment on attachment 282176 Patch Clearing flags on attachment: 282176 Committed r202520: <http://trac.webkit.org/changeset/202520> 1205776 6 commit-queue 2016-06-27 16:56:32 -0700 All reviewed patches have been landed. Closing bug. 1205802 7 commit-queue 2016-06-27 17:34:54 -0700 Re-opened since this is blocked by bug 159185 1205809 8 ryanhaddad 2016-06-27 17:37:25 -0700 (In reply to comment #7) > Re-opened since this is blocked by bug 159185 /Volumes/Data/slave/elcapitan-32bit-release/build/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm:74:17: error: property 'hasSingleSecurityOrigin' requires method 'hasSingleSecurityOrigin' to be defined - use @synthesize, @dynamic or provide a method implementation in this class implementation [-Werror,-Wobjc-property-implementation] https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20%2832-bit%20Build%29/builds/7249 1205813 9 282176 achristensen 2016-06-27 17:43:27 -0700 Comment on attachment 282176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282176&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2252 > + if ([session respondsToSelector:@selector(hasSingleSecurityOrigin)]) > + return session.hasSingleSecurityOrigin; El Capitan compilers didn't like this. Does it need to be [session hasSingleSecurityOrigin]? 1205895 10 jer.noble 2016-06-27 23:35:22 -0700 (In reply to comment #9) > Comment on attachment 282176 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282176&action=review > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2252 > > + if ([session respondsToSelector:@selector(hasSingleSecurityOrigin)]) > > + return session.hasSingleSecurityOrigin; > > El Capitan compilers didn't like this. Does it need to be [session > hasSingleSecurityOrigin]? No, the error message is correct. It needs a @synthesize. 1205900 11 jer.noble 2016-06-27 23:44:26 -0700 Committed r202546: <http://trac.webkit.org/changeset/202546> 282173 2016-06-27 15:08:17 -0700 2016-06-27 15:17:26 -0700 Patch bug-159172-20160627150802.patch text/plain 8262 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFmODllMGQwM2U1M2E1 OTJkNzNiNGU5MTNmZmFiNDBkYzM1NDcyOS4uNjBlMmY4NjE1OWM2MmFlYzQ5MWNjZWI2MTU3MDQ4 YmI3ZGNjZWQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE2LTA2LTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFJFR1JFU1NJT04/KHIyMDI0 NjYpOiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NhbnZhcy1yZW1vdGUtcmVhZC1yZW1vdGUtdmlkZW8t cmVkaXJlY3QuaHRtbCBmYWlsaW5nIG9uIFNpZXJyYQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8y NzAzMDAyNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbiBwcm9wZXJ0eSB0byBXZWJDb3JlTlNVUkxT ZXNzaW9uIHRoYXQgZ2V0cyB1cGRhdGVkIGVhY2ggdGltZSBvbmUgb2YgdGhhdAorICAgICAgICBz ZXNzaW9ucycgdGFza3MgcmVjZWlldmVzIGEgcmVzcG9uc2Ugb3IgYSByZWRpcmVjdCByZXF1ZXN0 LiBDaGVjayB0aGF0IHByb3BlcnR5IGZyb20gdGhlIE1lZGlhUGxheWVyUHJpdmF0ZS4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdpbik6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmg6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tOgorICAgICAg ICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOl0p OgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uIGRhdGFUYXNrV2l0aFJlcXVlc3Q6XSk6 CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb24gZGF0YVRhc2tXaXRoVVJMOl0pOgorICAg ICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgcmVzb3VyY2U6cmVjZWl2ZWRSZXNw b25zZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHJlc291cmNl OnJlY2VpdmVkUmVkaXJlY3Q6cmVxdWVzdDpdKToKKworMjAxNi0wNi0yNyAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBDcmFzaCBpbiBsYXlvdXQgdGVzdCAvbWVk aWEvdmlkZW8tYnVmZmVyZWQtcmFuZ2UtY29udGFpbnMtY3VycmVudFRpbWUuaHRtbAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTA5CiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNjUzNTc1MD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IGEy ZjI4NjA3NGFhYWQzZWFhNDZjMWNkYzMyNjcwYWYxZjJiY2UxMmIuLjgwN2E1NzJlOTkwNWNkYTZi YzdhNDE3MDE5NDQ4YTE1MWNlMjg0NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtMjI0 MSw3ICsyMjQxLDE4IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKSBjb25zdAogICAgIAogICAgIFJlZjxTZWN1cml0eU9y aWdpbj4gcmVzb2x2ZWRPcmlnaW4oU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNvbHZlZFVSTCgp KSk7CiAgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiByZXF1ZXN0ZWRPcmlnaW4oU2VjdXJpdHlPcmln aW46OmNyZWF0ZUZyb21TdHJpbmcoYXNzZXRVUkwoKSkpOwotICAgIHJldHVybiByZXNvbHZlZE9y aWdpbi5nZXQoKS5pc1NhbWVTY2hlbWVIb3N0UG9ydCgmcmVxdWVzdGVkT3JpZ2luLmdldCgpKTsK KyAgICBpZiAoIXJlc29sdmVkT3JpZ2luLmdldCgpLmlzU2FtZVNjaGVtZUhvc3RQb3J0KCZyZXF1 ZXN0ZWRPcmlnaW4uZ2V0KCkpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyNpZiBQTEFURk9S TShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPiAxMDExMDAKKyAgICBB VkFzc2V0UmVzb3VyY2VMb2FkZXIgKnJlc291cmNlTG9hZGVyID0gbV9hdkFzc2V0LmdldCgpLnJl c291cmNlTG9hZGVyOworICAgIGlmIChTZXR0aW5nczo6aXNBVkZvdW5kYXRpb25OU1VSTFNlc3Np b25FbmFibGVkKCkgJiYgW3Jlc291cmNlTG9hZGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoVVJMU2Vzc2lvbildKSB7CisgICAgICAgIFdlYkNvcmVOU1VSTFNlc3Npb24gKnNlc3Npb24g PSAoV2ViQ29yZU5TVVJMU2Vzc2lvbiAqKXJlc291cmNlTG9hZGVyLlVSTFNlc3Npb247CisgICAg ICAgIGlmIChbc2Vzc2lvbiByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGhhc1NpbmdsZVNl Y3VyaXR5T3JpZ2luKV0pCisgICAgICAgICAgICByZXR1cm4gc2Vzc2lvbi5oYXNTaW5nbGVTZWN1 cml0eU9yaWdpbjsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogYm9vbCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkaWRQYXNzQ09SU0FjY2Vzc0NoZWNr KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29j b2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmgKaW5kZXggNTRiYzEzOWNmMDRlN2RmZjRhZjBh MzkzMjk2MzY1YmNiMWE3YmI1NC4uZTAwZjJmMTg4ZTA3ODYyOTU4YTE4OGNlY2Y2NTk3MWQ5MDYz ZWI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmgKQEAgLTQ2LDYgKzQ2LDcgQEAgY2xhc3MgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0OwogY2xhc3MgUGxhdGZvcm1NZWRpYVJlc291cmNlOwogY2xhc3Mg UGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyOwogY2xhc3MgV2ViQ29yZU5TVVJMU2Vzc2lvbkRh dGFUYXNrQ2xpZW50OworY2xhc3MgU2VjdXJpdHlPcmlnaW47CiB9CiAKIGVudW0gY2xhc3MgV2Vi Q29yZU5TVVJMU2Vzc2lvbkNPUlNBY2Nlc3NDaGVja1Jlc3VsdHMgewpAQCAtNjMsOSArNjQsMTEg QEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uIDogTlNPYmpl Y3QgewogICAgIE5TU3RyaW5nICpfc2Vzc2lvbkRlc2NyaXB0aW9uOwogICAgIEhhc2hTZXQ8UmV0 YWluUHRyPFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzaz4+IF9kYXRhVGFza3M7CiAgICAgQk9P TCBfaW52YWxpZGF0ZWQ7CisgICAgQk9PTCBfaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW47CiAgICAg TlNVSW50ZWdlciBfbmV4dFRhc2tJZGVudGlmaWVyOwogICAgIE9TT2JqZWN0UHRyPGRpc3BhdGNo X3F1ZXVlX3Q+IF9pbnRlcm5hbFF1ZXVlOwogICAgIFdlYkNvcmVOU1VSTFNlc3Npb25DT1JTQWNj ZXNzQ2hlY2tSZXN1bHRzIF9jb3JzUmVzdWx0czsKKyAgICBSZWZQdHI8V2ViQ29yZTo6U2VjdXJp dHlPcmlnaW4+IF9yZXF1ZXN0ZWRPcmlnaW47CiB9CiAtIChpZClpbml0V2l0aFJlc291cmNlTG9h ZGVyOihXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXImKWxvYWRlciBkZWxlZ2F0 ZTooaWQ8TlNVUkxTZXNzaW9uVGFza0RlbGVnYXRlPilkZWxlZ2F0ZSBkZWxlZ2F0ZVF1ZXVlOihO U09wZXJhdGlvblF1ZXVlKilxdWV1ZTsKIEBwcm9wZXJ0eSAocmVhZG9ubHksIHJldGFpbikgTlNP cGVyYXRpb25RdWV1ZSAqZGVsZWdhdGVRdWV1ZTsKQEAgLTczLDYgKzc2LDcgQEAgV0VCQ09SRV9F WFBPUlQgQGludGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uIDogTlNPYmplY3QgewogQHByb3Bl cnR5IChyZWFkb25seSwgY29weSkgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqY29uZmlndXJh dGlvbjsKIEBwcm9wZXJ0eSAoY29weSkgTlNTdHJpbmcgKnNlc3Npb25EZXNjcmlwdGlvbjsKIEBw cm9wZXJ0eSAocmVhZG9ubHkpIEJPT0wgZGlkUGFzc0NPUlNBY2Nlc3NDaGVja3M7CitAcHJvcGVy dHkgKHJlYWRvbmx5KSBCT09MIGhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOwogLSAodm9pZClmaW5p c2hUYXNrc0FuZEludmFsaWRhdGU7CiAtICh2b2lkKWludmFsaWRhdGVBbmRDYW5jZWw7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5T VVJMU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2Vi Q29yZU5TVVJMU2Vzc2lvbi5tbQppbmRleCA1MjI1M2NiNzc0ODJlZjRjZGQwN2RmMTY1YjhmMGNl MjA0YTBlMjljLi5iMzg1ZjhjMTc5NDIyMDI1YTZhMjU3ZjAyNjAxZjg5MDM3Yjk4ZTI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VS TFNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLm1tCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbXBvcnQgIkNhY2hl ZFJlc291cmNlUmVxdWVzdC5oIgogI2ltcG9ydCAiUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVy LmgiCisjaW1wb3J0ICJTZWN1cml0eU9yaWdpbi5oIgogI2ltcG9ydCAiU3VicmVzb3VyY2VMb2Fk ZXIuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC00NCw2ICs0NSw3IEBAIEBwcm9w ZXJ0eSAocmVhZHdyaXRlLCByZXRhaW4pIGlkPE5TVVJMU2Vzc2lvblRhc2tEZWxlZ2F0ZT4gZGVs ZWdhdGU7CiAtICh2b2lkKXRhc2tDb21wbGV0ZWQ6KFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFz ayAqKXRhc2s7CiAtICh2b2lkKWFkZERlbGVnYXRlT3BlcmF0aW9uOih2b2lkICheKSh2b2lkKSlv cGVyYXRpb247CiAtICh2b2lkKXRhc2s6KFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqKXRh c2sgZGlkUmVjZWl2ZUNPUlNBY2Nlc3NDaGVja1Jlc3VsdDooQk9PTClyZXN1bHQ7CistICh2b2lk KXVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOihTZWN1cml0eU9yaWdpbiYpb3JpZ2luOwog QGVuZAogCiBAaW50ZXJmYWNlIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAoKQpAQCAtMTM5 LDYgKzE0MSwxNyBAQCAtICh2b2lkKXRhc2s6KFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAq KXRhc2sgZGlkUmVjZWl2ZUNPUlNBY2Nlc3NDaGVja1Jlc3VsdAogICAgICAgICBfY29yc1Jlc3Vs dHMgPSBXZWJDb3JlTlNVUkxTZXNzaW9uQ09SU0FjY2Vzc0NoZWNrUmVzdWx0czo6UGFzczsKIH0K IAorLSAodm9pZCl1cGRhdGVIYXNTaW5nbGVTZWN1cml0eU9yaWdpbjooU2VjdXJpdHlPcmlnaW4m KW9yaWdpbgoreworICAgIGlmICghX3JlcXVlc3RlZE9yaWdpbikgeworICAgICAgICBfcmVxdWVz dGVkT3JpZ2luID0gJm9yaWdpbjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmICgh b3JpZ2luLmlzU2FtZVNjaGVtZUhvc3RQb3J0KF9yZXF1ZXN0ZWRPcmlnaW4uZ2V0KCkpKQorICAg ICAgICBfaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4gPSBmYWxzZTsKK30KKwogI3ByYWdtYSBtYXJr IC0gTlNVUkxTZXNzaW9uIEFQSQogQHN5bnRoZXNpemUgc2Vzc2lvbkRlc2NyaXB0aW9uPV9zZXNz aW9uRGVzY3JpcHRpb247CiBAZHluYW1pYyBkZWxlZ2F0ZTsKQEAgLTIzNCw2ICsyNDcsOCBAQCAt IChOU1VSTFNlc3Npb25EYXRhVGFzayAqKWRhdGFUYXNrV2l0aFJlcXVlc3Q6KE5TVVJMUmVxdWVz dCAqKXJlcXVlc3QKICAgICBpZiAoX2ludmFsaWRhdGVkKQogICAgICAgICByZXR1cm4gbmlsOwog CisgICAgW3NlbGYgdXBkYXRlSGFzU2luZ2xlU2VjdXJpdHlPcmlnaW46U2VjdXJpdHlPcmlnaW46 OmNyZWF0ZShbcmVxdWVzdCBVUkxdKV07CisKICAgICBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRh c2sgKnRhc2sgPSBbW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBhbGxvY10gaW5pdFdpdGhT ZXNzaW9uOnNlbGYgaWRlbnRpZmllcjpfbmV4dFRhc2tJZGVudGlmaWVyKysgcmVxdWVzdDpyZXF1 ZXN0XTsKICAgICBfZGF0YVRhc2tzLmFkZCh0YXNrKTsKICAgICByZXR1cm4gKE5TVVJMU2Vzc2lv bkRhdGFUYXNrICopW3Rhc2sgYXV0b3JlbGVhc2VdOwpAQCAtMjQ0LDYgKzI1OSw4IEBAIC0gKE5T VVJMU2Vzc2lvbkRhdGFUYXNrICopZGF0YVRhc2tXaXRoVVJMOihOU1VSTCAqKXVybAogICAgIGlm IChfaW52YWxpZGF0ZWQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKKyAgICBbc2VsZiB1cGRhdGVI YXNTaW5nbGVTZWN1cml0eU9yaWdpbjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCldOworCiAg ICAgV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrICp0YXNrID0gW1tXZWJDb3JlTlNVUkxTZXNz aW9uRGF0YVRhc2sgYWxsb2NdIGluaXRXaXRoU2Vzc2lvbjpzZWxmIGlkZW50aWZpZXI6X25leHRU YXNrSWRlbnRpZmllcisrIFVSTDp1cmxdOwogICAgIF9kYXRhVGFza3MuYWRkKHRhc2spOwogICAg IHJldHVybiAoTlNVUkxTZXNzaW9uRGF0YVRhc2sgKilbdGFzayBhdXRvcmVsZWFzZV07CkBAIC01 MjQsNiArNTQxLDcgQEAgLSAodm9pZClyZXNvdXJjZTooUGxhdGZvcm1NZWRpYVJlc291cmNlJily ZXNvdXJjZSByZWNlaXZlZFJlc3BvbnNlOihjb25zdCBSZXNvdXIKICAgICBBU1NFUlRfVU5VU0VE KHJlc291cmNlLCAmcmVzb3VyY2UgPT0gX3Jlc291cmNlKTsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwogICAgIFtzZWxmLnNlc3Npb24gdGFzazpzZWxmIGRpZFJlY2VpdmVDT1JTQWNjZXNz Q2hlY2tSZXN1bHQ6cmVzb3VyY2UuZGlkUGFzc0FjY2Vzc0NvbnRyb2xDaGVjaygpXTsKKyAgICBb c2VsZi5zZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOlNlY3VyaXR5T3JpZ2lu OjpjcmVhdGUocmVzcG9uc2UudXJsKCkpXTsKICAgICBzZWxmLmNvdW50T2ZCeXRlc0V4cGVjdGVk VG9SZWNlaXZlID0gcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCk7CiAgICAgW3NlbGYg X3NldERlZmVyc0xvYWRpbmc6WUVTXTsKICAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gc3Ry b25nUmVzcG9uc2UgeyByZXNwb25zZS5uc1VSTFJlc3BvbnNlKCkgfTsKQEAgLTYwOCw2ICs2MjYs OCBAQCAtICh2b2lkKXJlc291cmNlOihQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmKXJlc291cmNlIHJl Y2VpdmVkUmVkaXJlY3Q6KGNvbnN0IFJlc291cgogICAgIC8vIGN1cnJlbnQgcmVxdWVzdCBkdXJp bmcgcmVzcG9uc2VSZWNlaWV2ZWQ6IHRvIHdvcmsgYXJvdW5kIGEgQ29yZU1lZGlhIGJ1Zy4KICAg ICBpZiAocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSAhPSAzMDIgJiYgcmVzcG9uc2UuaHR0cFN0 YXR1c0NvZGUoKSAhPSAzMDcpCiAgICAgICAgIHNlbGYuY3VycmVudFJlcXVlc3QgPSBbTlNVUkxS ZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnJlcXVlc3QudXJsKCldOworCisgICAgW3NlbGYuc2Vzc2lv biB1cGRhdGVIYXNTaW5nbGVTZWN1cml0eU9yaWdpbjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHJl cXVlc3QudXJsKCkpXTsKIH0KIAogLSAodm9pZClfcmVzb3VyY2U6KFBsYXRmb3JtTWVkaWFSZXNv dXJjZSYpcmVzb3VyY2UgbG9hZEZpbmlzaGVkV2l0aEVycm9yOihOU0Vycm9yICopZXJyb3IK 282176 2016-06-27 15:17:29 -0700 2016-06-27 16:56:28 -0700 Patch bug-159172-20160627151713.patch text/plain 8639 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFmODllMGQwM2U1M2E1 OTJkNzNiNGU5MTNmZmFiNDBkYzM1NDcyOS4uNjBlMmY4NjE1OWM2MmFlYzQ5MWNjZWI2MTU3MDQ4 YmI3ZGNjZWQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE2LTA2LTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFJFR1JFU1NJT04/KHIyMDI0 NjYpOiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NhbnZhcy1yZW1vdGUtcmVhZC1yZW1vdGUtdmlkZW8t cmVkaXJlY3QuaHRtbCBmYWlsaW5nIG9uIFNpZXJyYQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8y NzAzMDAyNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbiBwcm9wZXJ0eSB0byBXZWJDb3JlTlNVUkxT ZXNzaW9uIHRoYXQgZ2V0cyB1cGRhdGVkIGVhY2ggdGltZSBvbmUgb2YgdGhhdAorICAgICAgICBz ZXNzaW9ucycgdGFza3MgcmVjZWlldmVzIGEgcmVzcG9uc2Ugb3IgYSByZWRpcmVjdCByZXF1ZXN0 LiBDaGVjayB0aGF0IHByb3BlcnR5IGZyb20gdGhlIE1lZGlhUGxheWVyUHJpdmF0ZS4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdpbik6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmg6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tOgorICAgICAg ICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOl0p OgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uIGRhdGFUYXNrV2l0aFJlcXVlc3Q6XSk6 CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb24gZGF0YVRhc2tXaXRoVVJMOl0pOgorICAg ICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgcmVzb3VyY2U6cmVjZWl2ZWRSZXNw b25zZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHJlc291cmNl OnJlY2VpdmVkUmVkaXJlY3Q6cmVxdWVzdDpdKToKKworMjAxNi0wNi0yNyAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBDcmFzaCBpbiBsYXlvdXQgdGVzdCAvbWVk aWEvdmlkZW8tYnVmZmVyZWQtcmFuZ2UtY29udGFpbnMtY3VycmVudFRpbWUuaHRtbAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTA5CiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNjUzNTc1MD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IGEy ZjI4NjA3NGFhYWQzZWFhNDZjMWNkYzMyNjcwYWYxZjJiY2UxMmIuLjgwN2E1NzJlOTkwNWNkYTZi YzdhNDE3MDE5NDQ4YTE1MWNlMjg0NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtMjI0 MSw3ICsyMjQxLDE4IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKSBjb25zdAogICAgIAogICAgIFJlZjxTZWN1cml0eU9y aWdpbj4gcmVzb2x2ZWRPcmlnaW4oU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNvbHZlZFVSTCgp KSk7CiAgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiByZXF1ZXN0ZWRPcmlnaW4oU2VjdXJpdHlPcmln aW46OmNyZWF0ZUZyb21TdHJpbmcoYXNzZXRVUkwoKSkpOwotICAgIHJldHVybiByZXNvbHZlZE9y aWdpbi5nZXQoKS5pc1NhbWVTY2hlbWVIb3N0UG9ydCgmcmVxdWVzdGVkT3JpZ2luLmdldCgpKTsK KyAgICBpZiAoIXJlc29sdmVkT3JpZ2luLmdldCgpLmlzU2FtZVNjaGVtZUhvc3RQb3J0KCZyZXF1 ZXN0ZWRPcmlnaW4uZ2V0KCkpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyNpZiBQTEFURk9S TShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPiAxMDExMDAKKyAgICBB VkFzc2V0UmVzb3VyY2VMb2FkZXIgKnJlc291cmNlTG9hZGVyID0gbV9hdkFzc2V0LmdldCgpLnJl c291cmNlTG9hZGVyOworICAgIGlmIChTZXR0aW5nczo6aXNBVkZvdW5kYXRpb25OU1VSTFNlc3Np b25FbmFibGVkKCkgJiYgW3Jlc291cmNlTG9hZGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoVVJMU2Vzc2lvbildKSB7CisgICAgICAgIFdlYkNvcmVOU1VSTFNlc3Npb24gKnNlc3Npb24g PSAoV2ViQ29yZU5TVVJMU2Vzc2lvbiAqKXJlc291cmNlTG9hZGVyLlVSTFNlc3Npb247CisgICAg ICAgIGlmIChbc2Vzc2lvbiByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGhhc1NpbmdsZVNl Y3VyaXR5T3JpZ2luKV0pCisgICAgICAgICAgICByZXR1cm4gc2Vzc2lvbi5oYXNTaW5nbGVTZWN1 cml0eU9yaWdpbjsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogYm9vbCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkaWRQYXNzQ09SU0FjY2Vzc0NoZWNr KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29j b2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmgKaW5kZXggNTRiYzEzOWNmMDRlN2RmZjRhZjBh MzkzMjk2MzY1YmNiMWE3YmI1NC4uZTAwZjJmMTg4ZTA3ODYyOTU4YTE4OGNlY2Y2NTk3MWQ5MDYz ZWI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmgKQEAgLTQ2LDYgKzQ2LDcgQEAgY2xhc3MgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0OwogY2xhc3MgUGxhdGZvcm1NZWRpYVJlc291cmNlOwogY2xhc3Mg UGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyOwogY2xhc3MgV2ViQ29yZU5TVVJMU2Vzc2lvbkRh dGFUYXNrQ2xpZW50OworY2xhc3MgU2VjdXJpdHlPcmlnaW47CiB9CiAKIGVudW0gY2xhc3MgV2Vi Q29yZU5TVVJMU2Vzc2lvbkNPUlNBY2Nlc3NDaGVja1Jlc3VsdHMgewpAQCAtNjMsOSArNjQsMTEg QEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uIDogTlNPYmpl Y3QgewogICAgIE5TU3RyaW5nICpfc2Vzc2lvbkRlc2NyaXB0aW9uOwogICAgIEhhc2hTZXQ8UmV0 YWluUHRyPFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzaz4+IF9kYXRhVGFza3M7CiAgICAgQk9P TCBfaW52YWxpZGF0ZWQ7CisgICAgQk9PTCBfaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW47CiAgICAg TlNVSW50ZWdlciBfbmV4dFRhc2tJZGVudGlmaWVyOwogICAgIE9TT2JqZWN0UHRyPGRpc3BhdGNo X3F1ZXVlX3Q+IF9pbnRlcm5hbFF1ZXVlOwogICAgIFdlYkNvcmVOU1VSTFNlc3Npb25DT1JTQWNj ZXNzQ2hlY2tSZXN1bHRzIF9jb3JzUmVzdWx0czsKKyAgICBSZWZQdHI8V2ViQ29yZTo6U2VjdXJp dHlPcmlnaW4+IF9yZXF1ZXN0ZWRPcmlnaW47CiB9CiAtIChpZClpbml0V2l0aFJlc291cmNlTG9h ZGVyOihXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXImKWxvYWRlciBkZWxlZ2F0 ZTooaWQ8TlNVUkxTZXNzaW9uVGFza0RlbGVnYXRlPilkZWxlZ2F0ZSBkZWxlZ2F0ZVF1ZXVlOihO U09wZXJhdGlvblF1ZXVlKilxdWV1ZTsKIEBwcm9wZXJ0eSAocmVhZG9ubHksIHJldGFpbikgTlNP cGVyYXRpb25RdWV1ZSAqZGVsZWdhdGVRdWV1ZTsKQEAgLTczLDYgKzc2LDcgQEAgV0VCQ09SRV9F WFBPUlQgQGludGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uIDogTlNPYmplY3QgewogQHByb3Bl cnR5IChyZWFkb25seSwgY29weSkgTlNVUkxTZXNzaW9uQ29uZmlndXJhdGlvbiAqY29uZmlndXJh dGlvbjsKIEBwcm9wZXJ0eSAoY29weSkgTlNTdHJpbmcgKnNlc3Npb25EZXNjcmlwdGlvbjsKIEBw cm9wZXJ0eSAocmVhZG9ubHkpIEJPT0wgZGlkUGFzc0NPUlNBY2Nlc3NDaGVja3M7CitAcHJvcGVy dHkgKHJlYWRvbmx5KSBCT09MIGhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOwogLSAodm9pZClmaW5p c2hUYXNrc0FuZEludmFsaWRhdGU7CiAtICh2b2lkKWludmFsaWRhdGVBbmRDYW5jZWw7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5T VVJMU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2Vi Q29yZU5TVVJMU2Vzc2lvbi5tbQppbmRleCA1MjI1M2NiNzc0ODJlZjRjZGQwN2RmMTY1YjhmMGNl MjA0YTBlMjljLi5iMDNjNDg2ZGI0YzFiYzQ2MzNmOTNjYjZlNTNlOWYzYjM4Yjk2NGY0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VS TFNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLm1tCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbXBvcnQgIkNhY2hl ZFJlc291cmNlUmVxdWVzdC5oIgogI2ltcG9ydCAiUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVy LmgiCisjaW1wb3J0ICJTZWN1cml0eU9yaWdpbi5oIgogI2ltcG9ydCAiU3VicmVzb3VyY2VMb2Fk ZXIuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC00NCw2ICs0NSw3IEBAIEBwcm9w ZXJ0eSAocmVhZHdyaXRlLCByZXRhaW4pIGlkPE5TVVJMU2Vzc2lvblRhc2tEZWxlZ2F0ZT4gZGVs ZWdhdGU7CiAtICh2b2lkKXRhc2tDb21wbGV0ZWQ6KFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFz ayAqKXRhc2s7CiAtICh2b2lkKWFkZERlbGVnYXRlT3BlcmF0aW9uOih2b2lkICheKSh2b2lkKSlv cGVyYXRpb247CiAtICh2b2lkKXRhc2s6KFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqKXRh c2sgZGlkUmVjZWl2ZUNPUlNBY2Nlc3NDaGVja1Jlc3VsdDooQk9PTClyZXN1bHQ7CistICh2b2lk KXVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOihTZWN1cml0eU9yaWdpbiYpb3JpZ2luOwog QGVuZAogCiBAaW50ZXJmYWNlIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAoKQpAQCAtODMs NiArODUsNyBAQCAtIChpZClpbml0V2l0aFJlc291cmNlTG9hZGVyOihQbGF0Zm9ybU1lZGlhUmVz b3VyY2VMb2FkZXImKWxvYWRlciBkZWxlZ2F0ZTooaWQ8TgogICAgIHNlbGYuZGVsZWdhdGUgPSBp bkRlbGVnYXRlOwogICAgIF9xdWV1ZSA9IGluUXVldWUgPyBpblF1ZXVlIDogW05TT3BlcmF0aW9u UXVldWUgbWFpblF1ZXVlXTsKICAgICBfaW50ZXJuYWxRdWV1ZSA9IGFkb3B0T1NPYmplY3QoZGlz cGF0Y2hfcXVldWVfY3JlYXRlKCJXZWJDb3JlTlNVUkxTZXNzaW9uIF9pbnRlcm5hbFF1ZXVlIiwg RElTUEFUQ0hfUVVFVUVfU0VSSUFMKSk7CisgICAgX2hhc1NpbmdsZVNlY3VyaXR5T3JpZ2luID0g WUVTOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC0xMzksNiArMTQyLDE3IEBAIC0gKHZvaWQp dGFzazooV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrICopdGFzayBkaWRSZWNlaXZlQ09SU0Fj Y2Vzc0NoZWNrUmVzdWx0CiAgICAgICAgIF9jb3JzUmVzdWx0cyA9IFdlYkNvcmVOU1VSTFNlc3Np b25DT1JTQWNjZXNzQ2hlY2tSZXN1bHRzOjpQYXNzOwogfQogCistICh2b2lkKXVwZGF0ZUhhc1Np bmdsZVNlY3VyaXR5T3JpZ2luOihTZWN1cml0eU9yaWdpbiYpb3JpZ2luCit7CisgICAgaWYgKCFf cmVxdWVzdGVkT3JpZ2luKSB7CisgICAgICAgIF9yZXF1ZXN0ZWRPcmlnaW4gPSAmb3JpZ2luOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFvcmlnaW4uaXNTYW1lU2NoZW1lSG9z dFBvcnQoX3JlcXVlc3RlZE9yaWdpbi5nZXQoKSkpCisgICAgICAgIF9oYXNTaW5nbGVTZWN1cml0 eU9yaWdpbiA9IGZhbHNlOworfQorCiAjcHJhZ21hIG1hcmsgLSBOU1VSTFNlc3Npb24gQVBJCiBA c3ludGhlc2l6ZSBzZXNzaW9uRGVzY3JpcHRpb249X3Nlc3Npb25EZXNjcmlwdGlvbjsKIEBkeW5h bWljIGRlbGVnYXRlOwpAQCAtMjM0LDYgKzI0OCw4IEBAIC0gKE5TVVJMU2Vzc2lvbkRhdGFUYXNr ICopZGF0YVRhc2tXaXRoUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdAogICAgIGlmIChf aW52YWxpZGF0ZWQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKKyAgICBbc2VsZiB1cGRhdGVIYXNT aW5nbGVTZWN1cml0eU9yaWdpbjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFtyZXF1ZXN0IFVSTF0p XTsKKwogICAgIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqdGFzayA9IFtbV2ViQ29yZU5T VVJMU2Vzc2lvbkRhdGFUYXNrIGFsbG9jXSBpbml0V2l0aFNlc3Npb246c2VsZiBpZGVudGlmaWVy Ol9uZXh0VGFza0lkZW50aWZpZXIrKyByZXF1ZXN0OnJlcXVlc3RdOwogICAgIF9kYXRhVGFza3Mu YWRkKHRhc2spOwogICAgIHJldHVybiAoTlNVUkxTZXNzaW9uRGF0YVRhc2sgKilbdGFzayBhdXRv cmVsZWFzZV07CkBAIC0yNDQsNiArMjYwLDggQEAgLSAoTlNVUkxTZXNzaW9uRGF0YVRhc2sgKilk YXRhVGFza1dpdGhVUkw6KE5TVVJMICopdXJsCiAgICAgaWYgKF9pbnZhbGlkYXRlZCkKICAgICAg ICAgcmV0dXJuIG5pbDsKIAorICAgIFtzZWxmIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2lu OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUodXJsKV07CisKICAgICBXZWJDb3JlTlNVUkxTZXNzaW9u RGF0YVRhc2sgKnRhc2sgPSBbW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBhbGxvY10gaW5p dFdpdGhTZXNzaW9uOnNlbGYgaWRlbnRpZmllcjpfbmV4dFRhc2tJZGVudGlmaWVyKysgVVJMOnVy bF07CiAgICAgX2RhdGFUYXNrcy5hZGQodGFzayk7CiAgICAgcmV0dXJuIChOU1VSTFNlc3Npb25E YXRhVGFzayAqKVt0YXNrIGF1dG9yZWxlYXNlXTsKQEAgLTUyNCw2ICs1NDIsNyBAQCAtICh2b2lk KXJlc291cmNlOihQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmKXJlc291cmNlIHJlY2VpdmVkUmVzcG9u c2U6KGNvbnN0IFJlc291cgogICAgIEFTU0VSVF9VTlVTRUQocmVzb3VyY2UsICZyZXNvdXJjZSA9 PSBfcmVzb3VyY2UpOwogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgW3NlbGYuc2Vz c2lvbiB0YXNrOnNlbGYgZGlkUmVjZWl2ZUNPUlNBY2Nlc3NDaGVja1Jlc3VsdDpyZXNvdXJjZS5k aWRQYXNzQWNjZXNzQ29udHJvbENoZWNrKCldOworICAgIFtzZWxmLnNlc3Npb24gdXBkYXRlSGFz U2luZ2xlU2VjdXJpdHlPcmlnaW46U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXNwb25zZS51cmwo KSldOwogICAgIHNlbGYuY291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmUgPSByZXNwb25zZS5l eHBlY3RlZENvbnRlbnRMZW5ndGgoKTsKICAgICBbc2VsZiBfc2V0RGVmZXJzTG9hZGluZzpZRVNd OwogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBzdHJvbmdSZXNwb25zZSB7IHJlc3BvbnNl Lm5zVVJMUmVzcG9uc2UoKSB9OwpAQCAtNjA4LDYgKzYyNyw4IEBAIC0gKHZvaWQpcmVzb3VyY2U6 KFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYpcmVzb3VyY2UgcmVjZWl2ZWRSZWRpcmVjdDooY29uc3Qg UmVzb3VyCiAgICAgLy8gY3VycmVudCByZXF1ZXN0IGR1cmluZyByZXNwb25zZVJlY2VpZXZlZDog dG8gd29yayBhcm91bmQgYSBDb3JlTWVkaWEgYnVnLgogICAgIGlmIChyZXNwb25zZS5odHRwU3Rh dHVzQ29kZSgpICE9IDMwMiAmJiByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpICE9IDMwNykKICAg ICAgICAgc2VsZi5jdXJyZW50UmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6 cmVxdWVzdC51cmwoKV07CisKKyAgICBbc2VsZi5zZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3Vy aXR5T3JpZ2luOlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVxdWVzdC51cmwoKSldOwogfQogCiAt ICh2b2lkKV9yZXNvdXJjZTooUGxhdGZvcm1NZWRpYVJlc291cmNlJilyZXNvdXJjZSBsb2FkRmlu aXNoZWRXaXRoRXJyb3I6KE5TRXJyb3IgKillcnJvcgo=