162118 2016-09-17 07:55:39 -0700 Cleanup: Remove an extraneous copy of SecurityOrigin 2016-09-21 16:20:11 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 dbates dbates cdumez commit-queue darin ddkilzer japhet mkwst youennf oldest_to_newest 1230843 0 dbates 2016-09-17 07:55:39 -0700 In WorkerThreadableLoader::MainThreadBridge::MainThreadBridge it is sufficient to make one isolated copy of SecurityOrigin that can be passed to the ContentSecurityPolicy and LoaderTaskOptions constructors. 1230844 1 289165 dbates 2016-09-17 08:00:59 -0700 Created attachment 289165 Patch 1230846 2 289166 dbates 2016-09-17 08:09:33 -0700 Created attachment 289166 Patch 1230849 3 289167 dbates 2016-09-17 08:23:05 -0700 Created attachment 289167 Patch 1230852 4 289169 dbates 2016-09-17 08:31:04 -0700 Created attachment 289169 Patch 1230854 5 289169 youennf 2016-09-17 08:41:02 -0700 Comment on attachment 289169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289169&action=review > Source/WebCore/loader/WorkerThreadableLoader.cpp:115 > + auto optionsCopy = std::make_unique<LoaderTaskOptions>(options, request.httpReferrer().isNull() ? outgoingReferrer : request.httpReferrer(), securityOriginCopy.ptr()); Can securityOriginCopy be moved? 1230860 6 289173 dbates 2016-09-17 11:07:56 -0700 Created attachment 289173 Patch 1231372 7 289173 dbates 2016-09-19 15:36:08 -0700 Comment on attachment 289173 Patch Clearing flags on attachment: 289173 Committed r206122: <http://trac.webkit.org/changeset/206122> 1231373 8 dbates 2016-09-19 15:36:13 -0700 All reviewed patches have been landed. Closing bug. 1231809 9 289173 darin 2016-09-20 11:30:46 -0700 Comment on attachment 289173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289173&action=review > Source/WebCore/loader/WorkerThreadableLoader.cpp:88 > + LoaderTaskOptions(const ThreadableLoaderOptions&, const String&, Ref<SecurityOrigin>&&); Why do we need this constructor? 1232182 10 289173 dbates 2016-09-21 14:10:51 -0700 Comment on attachment 289173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289173&action=review >> Source/WebCore/loader/WorkerThreadableLoader.cpp:88 >> + LoaderTaskOptions(const ThreadableLoaderOptions&, const String&, Ref<SecurityOrigin>&&); > > Why do we need this constructor? I take it you feel that it would make the code more understandable to use the default constructor and have the caller instantiate a LoaderTaskOptions with isolated copies. Currently, this constructor makes isolated copies of all its arguments except SecurityOrigin. 1232221 11 289173 darin 2016-09-21 16:20:11 -0700 Comment on attachment 289173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289173&action=review >>> Source/WebCore/loader/WorkerThreadableLoader.cpp:88 >>> + LoaderTaskOptions(const ThreadableLoaderOptions&, const String&, Ref<SecurityOrigin>&&); >> >> Why do we need this constructor? > > I take it you feel that it would make the code more understandable to use the default constructor and have the caller instantiate a LoaderTaskOptions with isolated copies. Currently, this constructor makes isolated copies of all its arguments except SecurityOrigin. OK, did not realize this constructor made isolated copies. I think that’s a bit subtle, so the question is what is a clearer idiom for that. For most classes, constructing makes a non-isolated copy and there is another function to make an isolated copy. If it was me I would: 1) Remove this constructor. 2) This effectively leaves us with a constructor that does copy or move for each data member (member-wise initialization). 3) Change each call site where a LoaderTaskOptions is created to move each piece in if the object is already isolated, or make an isolatedCopy as needed. But maybe that will make the code harder to get right. Not sure. It’s particularly unclear that this takes ownership of a SecurityOrigin, but makes isolated copies of the other things. What guarantees that the SecurityOrigin is already isolated with no other reference held to it? Seems easy to accidentally use that part wrong on a SecurityOrigin that is not isolated. 289165 2016-09-17 08:00:59 -0700 2016-09-17 08:09:29 -0700 Patch bug-162118-20160917075818.patch text/plain 3071 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IxNmE4MDQxYTRmNzcy YmQ1NDZlYWZkYWQwNjljOTQ0MGJkMGZkMS4uNjUyODIyMTE0MWJiZmZhMjY1YWNjNTAyMGZlMzcx NmQ5ODAwN2I3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA5LTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBSZW1vdmUg YW4gZXh0cmFuZW91cyBjb3B5IG9mIFNlY3VyaXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIxMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBvbmUgaXNvbGF0ZWQgY29weSBvZiB0 aGUgU2VjdXJpdHlPcmlnaW4gYmV0d2VlbiB0aGUgQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZAor ICAgICAgICBMb2FkZXJUYXNrT3B0aW9ucyBvYmplY3RzIGluc3RlYWQgb2YgY3JlYXRpbmcgdHdv IGlzb2xhdGVkIGNvcGllcyBvZiB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAgICAgIFRoaXMgaXMg c2FmZSBiZWNhdXNlIGJvdGggQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZCBMb2FkZXJUYXNrT3B0 aW9ucyBhcmUgaW5zdGFudGlhdGVkCisgICAgICAgIGluIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 Ok1haW5UaHJlYWRCcmlkZ2UgZm9yIHVzZSBvbiB0aGUgbWFpbiB0aHJlYWQgb25seS4KKworICAg ICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFk QnJpZGdlKToKKwogMjAxNi0wOS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1haW5UaHJlYWRCcmlkZ2UgbmVlZHMgYW4gaXNvbGF0ZWRDb3B5KCkgb2Yg U2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJU aHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBjMzkyNmIyMzBjNDA4ZmM0YjZlZTQ3ZDYyMzhiYzc4ZTFlMDA2 M2Y5Li5mOTljNzFkOTU5MDc3ODdiNWY0NzA5Mzg5MjY2NzcwMWE2OTdmZGZmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC05NCw3 ICs5NCw3IEBAIHN0cnVjdCBMb2FkZXJUYXNrT3B0aW9ucyB7CiBMb2FkZXJUYXNrT3B0aW9uczo6 TG9hZGVyVGFza09wdGlvbnMoY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMs IGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4pCiAg ICAgOiBvcHRpb25zKG9wdGlvbnMsIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5LCBvcHRpb25zLmNv bnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBvcHRpb25zLmluaXRpYXRvci5pc29sYXRl ZENvcHkoKSwgb3B0aW9ucy5vcGFxdWVSZXNwb25zZSkKICAgICAsIHJlZmVycmVyKHJlZmVycmVy Lmlzb2xhdGVkQ29weSgpKQotICAgICwgb3JpZ2luKG9yaWdpbi5pc29sYXRlZENvcHkoKSkKKyAg ICAsIG9yaWdpbihvcmlnaW4pCiB7CiB9CiAKQEAgLTEwOCwxMCArMTA4LDExIEBAIFdvcmtlclRo cmVhZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UoVGhyZWFk YWJsZUxvYWRlckNsaWVuCiAgICAgQVNTRVJUKHNlY3VyaXR5T3JpZ2luKTsKICAgICBBU1NFUlQo Y29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9saWN5 Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0eU9y aWdpbi0+aXNvbGF0ZWRDb3B5KCkpOworICAgIGF1dG8gc2VjdXJpdHlPcmlnaW5Db3B5ID0gc2Vj dXJpdHlPcmlnaW4tPmlzb2xhdGVkQ29weSgpOworICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9s aWN5Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0 eU9yaWdpbkNvcHkpOwogICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHktPmNvcHlTdGF0ZUZy b20oY29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6 Om1ha2VfdW5pcXVlPExvYWRlclRhc2tPcHRpb25zPihvcHRpb25zLCByZXF1ZXN0Lmh0dHBSZWZl cnJlcigpLmlzTnVsbCgpID8gb3V0Z29pbmdSZWZlcnJlciA6IHJlcXVlc3QuaHR0cFJlZmVycmVy KCksICpzZWN1cml0eU9yaWdpbik7CisgICAgYXV0byBvcHRpb25zQ29weSA9IHN0ZDo6bWFrZV91 bmlxdWU8TG9hZGVyVGFza09wdGlvbnM+KG9wdGlvbnMsIHJlcXVlc3QuaHR0cFJlZmVycmVyKCku aXNOdWxsKCkgPyBvdXRnb2luZ1JlZmVycmVyIDogcmVxdWVzdC5odHRwUmVmZXJyZXIoKSwgc2Vj dXJpdHlPcmlnaW5Db3B5KTsKIAogICAgIC8vIENhbiB3ZSBiZW5lZml0IGZyb20gcmVxdWVzdCBi ZWluZyBhbiByLXZhbHVlIHRvIGNyZWF0ZSBtb3JlIGVmZmljaWVudGx5IGl0cyBpc29sYXRlZCBj b3B5PwogICAgIG1fbG9hZGVyUHJveHkucG9zdFRhc2tUb0xvYWRlcihbdGhpcywgcmVxdWVzdCA9 IHJlcXVlc3QuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMgPSBXVEZNb3ZlKG9wdGlvbnNDb3B5KSwg Y29udGVudFNlY3VyaXR5UG9saWN5Q29weSA9IFdURk1vdmUoY29udGVudFNlY3VyaXR5UG9saWN5 Q29weSldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIG11dGFibGUgewo= 289166 2016-09-17 08:09:33 -0700 2016-09-17 08:23:01 -0700 Patch bug-162118-20160917080652.patch text/plain 3072 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IxNmE4MDQxYTRmNzcy YmQ1NDZlYWZkYWQwNjljOTQ0MGJkMGZkMS4uNjUyODIyMTE0MWJiZmZhMjY1YWNjNTAyMGZlMzcx NmQ5ODAwN2I3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA5LTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBSZW1vdmUg YW4gZXh0cmFuZW91cyBjb3B5IG9mIFNlY3VyaXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIxMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBvbmUgaXNvbGF0ZWQgY29weSBvZiB0 aGUgU2VjdXJpdHlPcmlnaW4gYmV0d2VlbiB0aGUgQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZAor ICAgICAgICBMb2FkZXJUYXNrT3B0aW9ucyBvYmplY3RzIGluc3RlYWQgb2YgY3JlYXRpbmcgdHdv IGlzb2xhdGVkIGNvcGllcyBvZiB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAgICAgIFRoaXMgaXMg c2FmZSBiZWNhdXNlIGJvdGggQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZCBMb2FkZXJUYXNrT3B0 aW9ucyBhcmUgaW5zdGFudGlhdGVkCisgICAgICAgIGluIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 Ok1haW5UaHJlYWRCcmlkZ2UgZm9yIHVzZSBvbiB0aGUgbWFpbiB0aHJlYWQgb25seS4KKworICAg ICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFk QnJpZGdlKToKKwogMjAxNi0wOS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1haW5UaHJlYWRCcmlkZ2UgbmVlZHMgYW4gaXNvbGF0ZWRDb3B5KCkgb2Yg U2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJU aHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBjMzkyNmIyMzBjNDA4ZmM0YjZlZTQ3ZDYyMzhiYzc4ZTFlMDA2 M2Y5Li45NGRlZjI1ODQxZDI4MzY4NTc4NTY0YThkMzM1MjYxZjcyN2E2MGVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC05NCw3 ICs5NCw3IEBAIHN0cnVjdCBMb2FkZXJUYXNrT3B0aW9ucyB7CiBMb2FkZXJUYXNrT3B0aW9uczo6 TG9hZGVyVGFza09wdGlvbnMoY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMs IGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4pCiAg ICAgOiBvcHRpb25zKG9wdGlvbnMsIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5LCBvcHRpb25zLmNv bnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBvcHRpb25zLmluaXRpYXRvci5pc29sYXRl ZENvcHkoKSwgb3B0aW9ucy5vcGFxdWVSZXNwb25zZSkKICAgICAsIHJlZmVycmVyKHJlZmVycmVy Lmlzb2xhdGVkQ29weSgpKQotICAgICwgb3JpZ2luKG9yaWdpbi5pc29sYXRlZENvcHkoKSkKKyAg ICAsIG9yaWdpbigmb3JpZ2luKQogewogfQogCkBAIC0xMDgsMTAgKzEwOCwxMSBAQCBXb3JrZXJU aHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFkQnJpZGdlKFRocmVh ZGFibGVMb2FkZXJDbGllbgogICAgIEFTU0VSVChzZWN1cml0eU9yaWdpbik7CiAgICAgQVNTRVJU KGNvbnRlbnRTZWN1cml0eVBvbGljeSk7CiAKLSAgICBhdXRvIGNvbnRlbnRTZWN1cml0eVBvbGlj eUNvcHkgPSBzdGQ6Om1ha2VfdW5pcXVlPENvbnRlbnRTZWN1cml0eVBvbGljeT4oc2VjdXJpdHlP cmlnaW4tPmlzb2xhdGVkQ29weSgpKTsKKyAgICBhdXRvIHNlY3VyaXR5T3JpZ2luQ29weSA9IHNl Y3VyaXR5T3JpZ2luLT5pc29sYXRlZENvcHkoKTsKKyAgICBhdXRvIGNvbnRlbnRTZWN1cml0eVBv bGljeUNvcHkgPSBzdGQ6Om1ha2VfdW5pcXVlPENvbnRlbnRTZWN1cml0eVBvbGljeT4oc2VjdXJp dHlPcmlnaW5Db3B5KTsKICAgICBjb250ZW50U2VjdXJpdHlQb2xpY3lDb3B5LT5jb3B5U3RhdGVG cm9tKGNvbnRlbnRTZWN1cml0eVBvbGljeSk7CiAKLSAgICBhdXRvIG9wdGlvbnNDb3B5ID0gc3Rk OjptYWtlX3VuaXF1ZTxMb2FkZXJUYXNrT3B0aW9ucz4ob3B0aW9ucywgcmVxdWVzdC5odHRwUmVm ZXJyZXIoKS5pc051bGwoKSA/IG91dGdvaW5nUmVmZXJyZXIgOiByZXF1ZXN0Lmh0dHBSZWZlcnJl cigpLCAqc2VjdXJpdHlPcmlnaW4pOworICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6Om1ha2Vf dW5pcXVlPExvYWRlclRhc2tPcHRpb25zPihvcHRpb25zLCByZXF1ZXN0Lmh0dHBSZWZlcnJlcigp LmlzTnVsbCgpID8gb3V0Z29pbmdSZWZlcnJlciA6IHJlcXVlc3QuaHR0cFJlZmVycmVyKCksIHNl Y3VyaXR5T3JpZ2luQ29weSk7CiAKICAgICAvLyBDYW4gd2UgYmVuZWZpdCBmcm9tIHJlcXVlc3Qg YmVpbmcgYW4gci12YWx1ZSB0byBjcmVhdGUgbW9yZSBlZmZpY2llbnRseSBpdHMgaXNvbGF0ZWQg Y29weT8KICAgICBtX2xvYWRlclByb3h5LnBvc3RUYXNrVG9Mb2FkZXIoW3RoaXMsIHJlcXVlc3Qg PSByZXF1ZXN0Lmlzb2xhdGVkQ29weSgpLCBvcHRpb25zID0gV1RGTW92ZShvcHRpb25zQ29weSks IGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHkgPSBXVEZNb3ZlKGNvbnRlbnRTZWN1cml0eVBvbGlj eUNvcHkpXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSBtdXRhYmxlIHsK 289167 2016-09-17 08:23:05 -0700 2016-09-17 08:30:59 -0700 Patch bug-162118-20160917082024.patch text/plain 3247 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IxNmE4MDQxYTRmNzcy YmQ1NDZlYWZkYWQwNjljOTQ0MGJkMGZkMS4uNjUyODIyMTE0MWJiZmZhMjY1YWNjNTAyMGZlMzcx NmQ5ODAwN2I3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA5LTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBSZW1vdmUg YW4gZXh0cmFuZW91cyBjb3B5IG9mIFNlY3VyaXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIxMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBvbmUgaXNvbGF0ZWQgY29weSBvZiB0 aGUgU2VjdXJpdHlPcmlnaW4gYmV0d2VlbiB0aGUgQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZAor ICAgICAgICBMb2FkZXJUYXNrT3B0aW9ucyBvYmplY3RzIGluc3RlYWQgb2YgY3JlYXRpbmcgdHdv IGlzb2xhdGVkIGNvcGllcyBvZiB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAgICAgIFRoaXMgaXMg c2FmZSBiZWNhdXNlIGJvdGggQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZCBMb2FkZXJUYXNrT3B0 aW9ucyBhcmUgaW5zdGFudGlhdGVkCisgICAgICAgIGluIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 Ok1haW5UaHJlYWRCcmlkZ2UgZm9yIHVzZSBvbiB0aGUgbWFpbiB0aHJlYWQgb25seS4KKworICAg ICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFk QnJpZGdlKToKKwogMjAxNi0wOS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1haW5UaHJlYWRCcmlkZ2UgbmVlZHMgYW4gaXNvbGF0ZWRDb3B5KCkgb2Yg U2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJU aHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBjMzkyNmIyMzBjNDA4ZmM0YjZlZTQ3ZDYyMzhiYzc4ZTFlMDA2 M2Y5Li4yMTBhNDc4NGRhOTQ4YjQ0OGY5OTFmZmRiOWUxOGU3N2I1ZjhjMjU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC05MSwx MCArOTEsMTAgQEAgc3RydWN0IExvYWRlclRhc2tPcHRpb25zIHsKICAgICBSZWZQdHI8U2VjdXJp dHlPcmlnaW4+IG9yaWdpbjsKIH07CiAKLUxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0 aW9ucyhjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucywgY29uc3QgU3RyaW5n JiByZWZlcnJlciwgY29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbikKK0xvYWRlclRhc2tPcHRp b25zOjpMb2FkZXJUYXNrT3B0aW9ucyhjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0 aW9ucywgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKICAg ICA6IG9wdGlvbnMob3B0aW9ucywgb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3ksIG9wdGlvbnMuY29u dGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQsIG9wdGlvbnMuaW5pdGlhdG9yLmlzb2xhdGVk Q29weSgpLCBvcHRpb25zLm9wYXF1ZVJlc3BvbnNlKQogICAgICwgcmVmZXJyZXIocmVmZXJyZXIu aXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBvcmlnaW4ob3JpZ2luLmlzb2xhdGVkQ29weSgpKQorICAg ICwgb3JpZ2luKG9yaWdpbikKIHsKIH0KIApAQCAtMTA4LDEwICsxMDgsMTEgQEAgV29ya2VyVGhy ZWFkYWJsZUxvYWRlcjo6TWFpblRocmVhZEJyaWRnZTo6TWFpblRocmVhZEJyaWRnZShUaHJlYWRh YmxlTG9hZGVyQ2xpZW4KICAgICBBU1NFUlQoc2VjdXJpdHlPcmlnaW4pOwogICAgIEFTU0VSVChj b250ZW50U2VjdXJpdHlQb2xpY3kpOwogCi0gICAgYXV0byBjb250ZW50U2VjdXJpdHlQb2xpY3lD b3B5ID0gc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50U2VjdXJpdHlQb2xpY3k+KHNlY3VyaXR5T3Jp Z2luLT5pc29sYXRlZENvcHkoKSk7CisgICAgYXV0byBzZWN1cml0eU9yaWdpbkNvcHkgPSBzZWN1 cml0eU9yaWdpbi0+aXNvbGF0ZWRDb3B5KCk7CisgICAgYXV0byBjb250ZW50U2VjdXJpdHlQb2xp Y3lDb3B5ID0gc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50U2VjdXJpdHlQb2xpY3k+KHNlY3VyaXR5 T3JpZ2luQ29weSk7CiAgICAgY29udGVudFNlY3VyaXR5UG9saWN5Q29weS0+Y29weVN0YXRlRnJv bShjb250ZW50U2VjdXJpdHlQb2xpY3kpOwogCi0gICAgYXV0byBvcHRpb25zQ29weSA9IHN0ZDo6 bWFrZV91bmlxdWU8TG9hZGVyVGFza09wdGlvbnM+KG9wdGlvbnMsIHJlcXVlc3QuaHR0cFJlZmVy cmVyKCkuaXNOdWxsKCkgPyBvdXRnb2luZ1JlZmVycmVyIDogcmVxdWVzdC5odHRwUmVmZXJyZXIo KSwgKnNlY3VyaXR5T3JpZ2luKTsKKyAgICBhdXRvIG9wdGlvbnNDb3B5ID0gc3RkOjptYWtlX3Vu aXF1ZTxMb2FkZXJUYXNrT3B0aW9ucz4ob3B0aW9ucywgcmVxdWVzdC5odHRwUmVmZXJyZXIoKS5p c051bGwoKSA/IG91dGdvaW5nUmVmZXJyZXIgOiByZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLCBzZWN1 cml0eU9yaWdpbkNvcHkucHRyKCkpOwogCiAgICAgLy8gQ2FuIHdlIGJlbmVmaXQgZnJvbSByZXF1 ZXN0IGJlaW5nIGFuIHItdmFsdWUgdG8gY3JlYXRlIG1vcmUgZWZmaWNpZW50bHkgaXRzIGlzb2xh dGVkIGNvcHk/CiAgICAgbV9sb2FkZXJQcm94eS5wb3N0VGFza1RvTG9hZGVyKFt0aGlzLCByZXF1 ZXN0ID0gcmVxdWVzdC5pc29sYXRlZENvcHkoKSwgb3B0aW9ucyA9IFdURk1vdmUob3B0aW9uc0Nv cHkpLCBjb250ZW50U2VjdXJpdHlQb2xpY3lDb3B5ID0gV1RGTW92ZShjb250ZW50U2VjdXJpdHlQ b2xpY3lDb3B5KV0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkgbXV0YWJsZSB7Cg== 289169 2016-09-17 08:31:04 -0700 2016-09-17 11:07:52 -0700 Patch bug-162118-20160917082823.patch text/plain 3533 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IxNmE4MDQxYTRmNzcy YmQ1NDZlYWZkYWQwNjljOTQ0MGJkMGZkMS4uNjUyODIyMTE0MWJiZmZhMjY1YWNjNTAyMGZlMzcx NmQ5ODAwN2I3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA5LTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBSZW1vdmUg YW4gZXh0cmFuZW91cyBjb3B5IG9mIFNlY3VyaXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIxMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBvbmUgaXNvbGF0ZWQgY29weSBvZiB0 aGUgU2VjdXJpdHlPcmlnaW4gYmV0d2VlbiB0aGUgQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZAor ICAgICAgICBMb2FkZXJUYXNrT3B0aW9ucyBvYmplY3RzIGluc3RlYWQgb2YgY3JlYXRpbmcgdHdv IGlzb2xhdGVkIGNvcGllcyBvZiB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAgICAgIFRoaXMgaXMg c2FmZSBiZWNhdXNlIGJvdGggQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZCBMb2FkZXJUYXNrT3B0 aW9ucyBhcmUgaW5zdGFudGlhdGVkCisgICAgICAgIGluIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 Ok1haW5UaHJlYWRCcmlkZ2UgZm9yIHVzZSBvbiB0aGUgbWFpbiB0aHJlYWQgb25seS4KKworICAg ICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFk QnJpZGdlKToKKwogMjAxNi0wOS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1haW5UaHJlYWRCcmlkZ2UgbmVlZHMgYW4gaXNvbGF0ZWRDb3B5KCkgb2Yg U2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJU aHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBjMzkyNmIyMzBjNDA4ZmM0YjZlZTQ3ZDYyMzhiYzc4ZTFlMDA2 M2Y5Li45NzM2ODhkYWZiMWQwZTUyNmEyMzA0YjMyZjY0MDhlZGQ4OTk1ZDM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC04NSwx NiArODUsMTYgQEAgdm9pZCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpjYW5jZWwoKQogfQogCiBz dHJ1Y3QgTG9hZGVyVGFza09wdGlvbnMgewotICAgIExvYWRlclRhc2tPcHRpb25zKGNvbnN0IFRo cmVhZGFibGVMb2FkZXJPcHRpb25zJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU2VjdXJpdHlPcmln aW4mKTsKKyAgICBMb2FkZXJUYXNrT3B0aW9ucyhjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9u cyYsIGNvbnN0IFN0cmluZyYsIFNlY3VyaXR5T3JpZ2luKik7CiAgICAgVGhyZWFkYWJsZUxvYWRl ck9wdGlvbnMgb3B0aW9uczsKICAgICBTdHJpbmcgcmVmZXJyZXI7CiAgICAgUmVmUHRyPFNlY3Vy aXR5T3JpZ2luPiBvcmlnaW47CiB9OwogCi1Mb2FkZXJUYXNrT3B0aW9uczo6TG9hZGVyVGFza09w dGlvbnMoY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmlu ZyYgcmVmZXJyZXIsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4pCitMb2FkZXJUYXNrT3B0 aW9uczo6TG9hZGVyVGFza09wdGlvbnMoY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9w dGlvbnMsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAg ICAgOiBvcHRpb25zKG9wdGlvbnMsIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5LCBvcHRpb25zLmNv bnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBvcHRpb25zLmluaXRpYXRvci5pc29sYXRl ZENvcHkoKSwgb3B0aW9ucy5vcGFxdWVSZXNwb25zZSkKICAgICAsIHJlZmVycmVyKHJlZmVycmVy Lmlzb2xhdGVkQ29weSgpKQotICAgICwgb3JpZ2luKG9yaWdpbi5pc29sYXRlZENvcHkoKSkKKyAg ICAsIG9yaWdpbihvcmlnaW4pCiB7CiB9CiAKQEAgLTEwOCwxMCArMTA4LDExIEBAIFdvcmtlclRo cmVhZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UoVGhyZWFk YWJsZUxvYWRlckNsaWVuCiAgICAgQVNTRVJUKHNlY3VyaXR5T3JpZ2luKTsKICAgICBBU1NFUlQo Y29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9saWN5 Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0eU9y aWdpbi0+aXNvbGF0ZWRDb3B5KCkpOworICAgIGF1dG8gc2VjdXJpdHlPcmlnaW5Db3B5ID0gc2Vj dXJpdHlPcmlnaW4tPmlzb2xhdGVkQ29weSgpOworICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9s aWN5Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0 eU9yaWdpbkNvcHkpOwogICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHktPmNvcHlTdGF0ZUZy b20oY29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6 Om1ha2VfdW5pcXVlPExvYWRlclRhc2tPcHRpb25zPihvcHRpb25zLCByZXF1ZXN0Lmh0dHBSZWZl cnJlcigpLmlzTnVsbCgpID8gb3V0Z29pbmdSZWZlcnJlciA6IHJlcXVlc3QuaHR0cFJlZmVycmVy KCksICpzZWN1cml0eU9yaWdpbik7CisgICAgYXV0byBvcHRpb25zQ29weSA9IHN0ZDo6bWFrZV91 bmlxdWU8TG9hZGVyVGFza09wdGlvbnM+KG9wdGlvbnMsIHJlcXVlc3QuaHR0cFJlZmVycmVyKCku aXNOdWxsKCkgPyBvdXRnb2luZ1JlZmVycmVyIDogcmVxdWVzdC5odHRwUmVmZXJyZXIoKSwgc2Vj dXJpdHlPcmlnaW5Db3B5LnB0cigpKTsKIAogICAgIC8vIENhbiB3ZSBiZW5lZml0IGZyb20gcmVx dWVzdCBiZWluZyBhbiByLXZhbHVlIHRvIGNyZWF0ZSBtb3JlIGVmZmljaWVudGx5IGl0cyBpc29s YXRlZCBjb3B5PwogICAgIG1fbG9hZGVyUHJveHkucG9zdFRhc2tUb0xvYWRlcihbdGhpcywgcmVx dWVzdCA9IHJlcXVlc3QuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMgPSBXVEZNb3ZlKG9wdGlvbnND b3B5KSwgY29udGVudFNlY3VyaXR5UG9saWN5Q29weSA9IFdURk1vdmUoY29udGVudFNlY3VyaXR5 UG9saWN5Q29weSldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIG11dGFibGUgewo= 289173 2016-09-17 11:07:56 -0700 2016-09-19 15:36:08 -0700 Patch bug-162118-20160917110514.patch text/plain 3590 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IxNmE4MDQxYTRmNzcy YmQ1NDZlYWZkYWQwNjljOTQ0MGJkMGZkMS4uNjUyODIyMTE0MWJiZmZhMjY1YWNjNTAyMGZlMzcx NmQ5ODAwN2I3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA5LTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBSZW1vdmUg YW4gZXh0cmFuZW91cyBjb3B5IG9mIFNlY3VyaXR5T3JpZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjIxMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFyZSBvbmUgaXNvbGF0ZWQgY29weSBvZiB0 aGUgU2VjdXJpdHlPcmlnaW4gYmV0d2VlbiB0aGUgQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZAor ICAgICAgICBMb2FkZXJUYXNrT3B0aW9ucyBvYmplY3RzIGluc3RlYWQgb2YgY3JlYXRpbmcgdHdv IGlzb2xhdGVkIGNvcGllcyBvZiB0aGUgU2VjdXJpdHlPcmlnaW4uCisgICAgICAgIFRoaXMgaXMg c2FmZSBiZWNhdXNlIGJvdGggQ29udGVudFNlY3VyaXR5UG9saWN5IGFuZCBMb2FkZXJUYXNrT3B0 aW9ucyBhcmUgaW5zdGFudGlhdGVkCisgICAgICAgIGluIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 Ok1haW5UaHJlYWRCcmlkZ2UgZm9yIHVzZSBvbiB0aGUgbWFpbiB0aHJlYWQgb25seS4KKworICAg ICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFk QnJpZGdlKToKKwogMjAxNi0wOS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1haW5UaHJlYWRCcmlkZ2UgbmVlZHMgYW4gaXNvbGF0ZWRDb3B5KCkgb2Yg U2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJU aHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBjMzkyNmIyMzBjNDA4ZmM0YjZlZTQ3ZDYyMzhiYzc4ZTFlMDA2 M2Y5Li4xNDU1YTJlMzkyMmFkMTMzMDk5ZWEzMjk0MGE1ZWUxYmVmYjQ4NDM1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC04NSwx NiArODUsMTYgQEAgdm9pZCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpjYW5jZWwoKQogfQogCiBz dHJ1Y3QgTG9hZGVyVGFza09wdGlvbnMgewotICAgIExvYWRlclRhc2tPcHRpb25zKGNvbnN0IFRo cmVhZGFibGVMb2FkZXJPcHRpb25zJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU2VjdXJpdHlPcmln aW4mKTsKKyAgICBMb2FkZXJUYXNrT3B0aW9ucyhjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9u cyYsIGNvbnN0IFN0cmluZyYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJik7CiAgICAgVGhyZWFkYWJs ZUxvYWRlck9wdGlvbnMgb3B0aW9uczsKICAgICBTdHJpbmcgcmVmZXJyZXI7Ci0gICAgUmVmUHRy PFNlY3VyaXR5T3JpZ2luPiBvcmlnaW47CisgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiBvcmlnaW47 CiB9OwogCi1Mb2FkZXJUYXNrT3B0aW9uczo6TG9hZGVyVGFza09wdGlvbnMoY29uc3QgVGhyZWFk YWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGNvbnN0 IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4pCitMb2FkZXJUYXNrT3B0aW9uczo6TG9hZGVyVGFza09w dGlvbnMoY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmlu ZyYgcmVmZXJyZXIsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4pCiAgICAgOiBvcHRpb25z KG9wdGlvbnMsIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5LCBvcHRpb25zLmNvbnRlbnRTZWN1cml0 eVBvbGljeUVuZm9yY2VtZW50LCBvcHRpb25zLmluaXRpYXRvci5pc29sYXRlZENvcHkoKSwgb3B0 aW9ucy5vcGFxdWVSZXNwb25zZSkKICAgICAsIHJlZmVycmVyKHJlZmVycmVyLmlzb2xhdGVkQ29w eSgpKQotICAgICwgb3JpZ2luKG9yaWdpbi5pc29sYXRlZENvcHkoKSkKKyAgICAsIG9yaWdpbihX VEZNb3ZlKG9yaWdpbikpCiB7CiB9CiAKQEAgLTEwOCwxMCArMTA4LDExIEBAIFdvcmtlclRocmVh ZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UoVGhyZWFkYWJs ZUxvYWRlckNsaWVuCiAgICAgQVNTRVJUKHNlY3VyaXR5T3JpZ2luKTsKICAgICBBU1NFUlQoY29u dGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9saWN5Q29w eSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0eU9yaWdp bi0+aXNvbGF0ZWRDb3B5KCkpOworICAgIGF1dG8gc2VjdXJpdHlPcmlnaW5Db3B5ID0gc2VjdXJp dHlPcmlnaW4tPmlzb2xhdGVkQ29weSgpOworICAgIGF1dG8gY29udGVudFNlY3VyaXR5UG9saWN5 Q29weSA9IHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudFNlY3VyaXR5UG9saWN5PihzZWN1cml0eU9y aWdpbkNvcHkpOwogICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeUNvcHktPmNvcHlTdGF0ZUZyb20o Y29udGVudFNlY3VyaXR5UG9saWN5KTsKIAotICAgIGF1dG8gb3B0aW9uc0NvcHkgPSBzdGQ6Om1h a2VfdW5pcXVlPExvYWRlclRhc2tPcHRpb25zPihvcHRpb25zLCByZXF1ZXN0Lmh0dHBSZWZlcnJl cigpLmlzTnVsbCgpID8gb3V0Z29pbmdSZWZlcnJlciA6IHJlcXVlc3QuaHR0cFJlZmVycmVyKCks ICpzZWN1cml0eU9yaWdpbik7CisgICAgYXV0byBvcHRpb25zQ29weSA9IHN0ZDo6bWFrZV91bmlx dWU8TG9hZGVyVGFza09wdGlvbnM+KG9wdGlvbnMsIHJlcXVlc3QuaHR0cFJlZmVycmVyKCkuaXNO dWxsKCkgPyBvdXRnb2luZ1JlZmVycmVyIDogcmVxdWVzdC5odHRwUmVmZXJyZXIoKSwgV1RGTW92 ZShzZWN1cml0eU9yaWdpbkNvcHkpKTsKIAogICAgIC8vIENhbiB3ZSBiZW5lZml0IGZyb20gcmVx dWVzdCBiZWluZyBhbiByLXZhbHVlIHRvIGNyZWF0ZSBtb3JlIGVmZmljaWVudGx5IGl0cyBpc29s YXRlZCBjb3B5PwogICAgIG1fbG9hZGVyUHJveHkucG9zdFRhc2tUb0xvYWRlcihbdGhpcywgcmVx dWVzdCA9IHJlcXVlc3QuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMgPSBXVEZNb3ZlKG9wdGlvbnND b3B5KSwgY29udGVudFNlY3VyaXR5UG9saWN5Q29weSA9IFdURk1vdmUoY29udGVudFNlY3VyaXR5 UG9saWN5Q29weSldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIG11dGFibGUgewo=