184478 2018-04-10 17:18:38 -0700 Use more r-values in NetworkResourceLoader 2018-04-11 09:57:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1413472 0 youennf 2018-04-10 17:18:38 -0700 Use more r-values in NetworkResourceLoader 1413482 1 337661 youennf 2018-04-10 17:41:10 -0700 Created attachment 337661 Patch 1413486 2 337662 youennf 2018-04-10 17:44:14 -0700 Created attachment 337662 Patch 1413707 3 337662 cdumez 2018-04-11 09:22:39 -0700 Comment on attachment 337662 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337662&action=review r=me with comment. > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:178 > + m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = ResourceRequest { request }](auto entry) mutable { This was already capturing by value, I do not understand why the explicit "= ResourceRequest { request }" would be needed. 1413709 4 youennf 2018-04-11 09:28:55 -0700 Thanks for the review. > This was already capturing by value, I do not understand why the explicit "= > ResourceRequest { request }" would be needed. I had a compilation error if not doing so. I believe request is captured as a "const ResourceRequest" otherwise. 1413710 5 cdumez 2018-04-11 09:30:03 -0700 (In reply to youenn fablet from comment #4) > Thanks for the review. > > > This was already capturing by value, I do not understand why the explicit "= > > ResourceRequest { request }" would be needed. > > I had a compilation error if not doing so. > I believe request is captured as a "const ResourceRequest" otherwise. And you sure you had the "mutable" at the time? Still seems odd. 1413717 6 337662 commit-queue 2018-04-11 09:56:43 -0700 Comment on attachment 337662 Patch Clearing flags on attachment: 337662 Committed r230528: <https://trac.webkit.org/changeset/230528> 1413718 7 commit-queue 2018-04-11 09:56:45 -0700 All reviewed patches have been landed. Closing bug. 1413719 8 webkit-bug-importer 2018-04-11 09:57:24 -0700 <rdar://problem/39350780> 337661 2018-04-10 17:41:10 -0700 2018-04-10 17:44:11 -0700 Patch bug-184478-20180410174108.patch text/plain 12644 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBiNzJiMGJjNmY3OWI3NmVh ODNiZDQ0ZDRkNmViZTc2ZTBhNGVhYmUuLjM0NjZiNWY3YmRkMWU1ZTNiNjJkNjIzNjNhZWVjNThi MTdkNTIwMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTgtMDQtMTAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBtb3JlIHItdmFsdWVzIGlu IE5ldHdvcmtSZXNvdXJjZUxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg0NDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUGFzcyBsb2FkIHBhcmFtZXRlcnMgYXMgci12YWx1ZXMgdG8gcmVtb3Zl IHNvbWUgdW5uZWVkZWQgY29waWVzLgorICAgICAgICBEaXR0byBmb3IgUmVzb3VyY2VSZXF1ZXN0 IGluc2lkZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzY2hlZHVsZVJlc291cmNlTG9hZCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpwZXJmb3JtU3luY2hy b25vdXNMb2FkKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29y a1Jlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVy OjpzdGFydCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6cmV0cmll dmVDYWNoZUVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpz dGFydE5ldHdvcmtMb2FkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVy Ojpjb250aW51ZVdpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6dmFsaWRhdGVDYWNoZUVudHJ5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxOC0wNC0xMCAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUGFzcyBGZXRjaE9wdGlvbnMgYW5kIFNlY3Vy aXR5T3JpZ2luIGFzIGxvYWQgcGFyYW1ldGVycyBmcm9tIFdlYlByb2Nlc3MgdG8gTmV0d29ya1By b2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKaW5kZXggZTZkZWQ0MjBhOTExMDg2OWMx MjM5ZmFmYTRkOGFlNjgzZDU1MjFhNy4uZTdkNTkyNmY1NTkyZTMzMzdjZDcyMjE0N2NkNjEyZTY2 MDAxOWUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKQEAgLTIyOSwxNyArMjI5LDIz IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmVuZFN1c3BlbnNpb24oKQog I2VuZGlmCiB9CiAKLXZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNjaGVkdWxl UmVzb3VyY2VMb2FkKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiBsb2FkUGFy YW1ldGVycykKK3ZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNjaGVkdWxlUmVz b3VyY2VMb2FkKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYgbG9hZFBhcmFtZXRlcnMp CiB7Ci0gICAgYXV0byBsb2FkZXIgPSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShsb2Fk UGFyYW1ldGVycywgKnRoaXMpOwotICAgIG1fbmV0d29ya1Jlc291cmNlTG9hZGVycy5hZGQobG9h ZFBhcmFtZXRlcnMuaWRlbnRpZmllciwgbG9hZGVyLnB0cigpKTsKKyAgICBhdXRvIGlkZW50aWZp ZXIgPSBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyOworICAgIEFTU0VSVCghbV9uZXR3b3JrUmVz b3VyY2VMb2FkZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKKworICAgIGF1dG8gbG9hZGVyID0g TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjcmVhdGUoV1RGTW92ZShsb2FkUGFyYW1ldGVycyksICp0 aGlzKTsKKyAgICBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuYWRkKGlkZW50aWZpZXIsIGxvYWRl ci5wdHIoKSk7CiAgICAgbG9hZGVyLT5zdGFydCgpOwogfQogCi12b2lkIE5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzOjpwZXJmb3JtU3luY2hyb25vdXNMb2FkKGNvbnN0IE5ldHdvcmtSZXNv dXJjZUxvYWRQYXJhbWV0ZXJzJiBsb2FkUGFyYW1ldGVycywgUmVmPE1lc3NhZ2VzOjpOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZDo6RGVsYXllZFJl cGx5PiYmIHJlcGx5KQordm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cGVyZm9y bVN5bmNocm9ub3VzTG9hZChOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmIGxvYWRQYXJh bWV0ZXJzLCBSZWY8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJm b3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYgcmVwbHkpCiB7Ci0gICAgYXV0byBs b2FkZXIgPSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShsb2FkUGFyYW1ldGVycywgKnRo aXMsIFdURk1vdmUocmVwbHkpKTsKLSAgICBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuYWRkKGxv YWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGxvYWRlci5wdHIoKSk7CisgICAgYXV0byBpZGVudGlm aWVyID0gbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcjsKKyAgICBBU1NFUlQoIW1fbmV0d29ya1Jl c291cmNlTG9hZGVycy5jb250YWlucyhpZGVudGlmaWVyKSk7CisKKyAgICBhdXRvIGxvYWRlciA9 IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKFdURk1vdmUobG9hZFBhcmFtZXRlcnMpLCAq dGhpcywgV1RGTW92ZShyZXBseSkpOworICAgIG1fbmV0d29ya1Jlc291cmNlTG9hZGVycy5hZGQo aWRlbnRpZmllciwgbG9hZGVyLnB0cigpKTsKICAgICBsb2FkZXItPnN0YXJ0KCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MuaAppbmRleCAyOGY1MTA3MGJlNTc0NjNjMDczMmY3NDE4YTBkMjA4 MTFlMzQ4YjlhLi40ZmRmYmYwNzY0ZjFmMDRhZWZmYzllMGIyMGE5NDU5NDVjZmRkOGVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2Vzcy5oCkBAIC05MCw4ICs5MCw4IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBkaWRSZWNlaXZlTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3NNZXNzYWdlKElQQzo6Q29u bmVjdGlvbiYsIElQQzo6RGVjb2RlciYpOwogICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzc01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNv ZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKTsKIAotICAgIHZvaWQgc2NoZWR1 bGVSZXNvdXJjZUxvYWQoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmKTsKLSAg ICB2b2lkIHBlcmZvcm1TeW5jaHJvbm91c0xvYWQoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnMmLCBSZWY8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQ ZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYpOworICAgIHZvaWQgc2NoZWR1 bGVSZXNvdXJjZUxvYWQoTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmJik7CisgICAgdm9p ZCBwZXJmb3JtU3luY2hyb25vdXNMb2FkKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYs IFJlZjxNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5j aHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBseT4mJik7CiAgICAgdm9pZCBsb2FkUGluZyhOZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmKTsKICAgICB2b2lkIHByZWZldGNoRE5TKGNvbnN0IFN0 cmluZyYpOwogICAgIHZvaWQgcHJlY29ubmVjdFRvKHVpbnQ2NF90IHByZWNvbm5lY3Rpb25JZGVu dGlmaWVyLCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggZjZiNWQ3 OTQ5MmU5ZmUyMmI1MTI1OGRiNTQxODk4ZmM4YmNiZjJjYy4uYmNiMzQzMGIzYzZhMzdlODZjMWYx YTA4MTZiNjc2YjI4ODJiMzBkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtODYsMTEgKzg2LDExIEBAIHN0 YXRpYyB2b2lkIHNlbmRSZXBseVRvU3luY2hyb25vdXNSZXF1ZXN0KE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6U3luY2hyb25vdXNMb2FkCiAgICAgZGF0YS5kZWxheWVkUmVwbHkgPSBudWxscHRyOwog fQogCi1OZXR3b3JrUmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcihjb25zdCBO ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVycywgTmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNzYWdlczo6TmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBseT4m JiBzeW5jaHJvbm91c1JlcGx5KQotICAgIDogbV9wYXJhbWV0ZXJzIHsgcGFyYW1ldGVycyB9CitO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcihOZXR3b3JrUmVzb3Vy Y2VMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMsIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzJiBjb25uZWN0aW9uLCBSZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYgc3luY2hyb25v dXNSZXBseSkKKyAgICA6IG1fcGFyYW1ldGVycyB7IFdURk1vdmUocGFyYW1ldGVycykgfQogICAg ICwgbV9jb25uZWN0aW9uIHsgY29ubmVjdGlvbiB9CiAgICAgLCBtX2RlZmVyc0xvYWRpbmcgeyBw YXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcgfQotICAgICwgbV9pc0FsbG93ZWRUb0Fza1VzZXJGb3JD cmVkZW50aWFscyB7IHBhcmFtZXRlcnMuY2xpZW50Q3JlZGVudGlhbFBvbGljeSA9PSBDbGllbnRD cmVkZW50aWFsUG9saWN5OjpNYXlBc2tDbGllbnRGb3JDcmVkZW50aWFscyB9CisgICAgLCBtX2lz QWxsb3dlZFRvQXNrVXNlckZvckNyZWRlbnRpYWxzIHsgbV9wYXJhbWV0ZXJzLmNsaWVudENyZWRl bnRpYWxQb2xpY3kgPT0gQ2xpZW50Q3JlZGVudGlhbFBvbGljeTo6TWF5QXNrQ2xpZW50Rm9yQ3Jl ZGVudGlhbHMgfQogICAgICwgbV9idWZmZXJpbmdUaW1lciB7ICp0aGlzLCAmTmV0d29ya1Jlc291 cmNlTG9hZGVyOjpidWZmZXJpbmdUaW1lckZpcmVkIH0KICAgICAsIG1fY2FjaGUgeyBzZXNzaW9u SUQoKS5pc0VwaGVtZXJhbCgpID8gbnVsbHB0ciA6IE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24o KS5jYWNoZSgpIH0KIHsKQEAgLTE2Nyw3ICsxNjcsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6c3RhcnQoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc3RhcnROZXR3b3Jr TG9hZChvcmlnaW5hbFJlcXVlc3QoKSk7CisgICAgc3RhcnROZXR3b3JrTG9hZChSZXNvdXJjZVJl cXVlc3QgeyBvcmlnaW5hbFJlcXVlc3QoKSB9KTsKIH0KIAogdm9pZCBOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OnJldHJpZXZlQ2FjaGVFbnRyeShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qp CkBAIC0xNzUsNyArMTc1LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJldHJpZXZl Q2FjaGVFbnRyeShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiAgICAgQVNTRVJUKGNh blVzZUNhY2hlKHJlcXVlc3QpKTsKIAogICAgIFJlZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+ IGxvYWRlcih0aGlzKTsKLSAgICBtX2NhY2hlLT5yZXRyaWV2ZShyZXF1ZXN0LCB7IG1fcGFyYW1l dGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlEIH0sIFt0aGlzLCBsb2FkZXIg PSBXVEZNb3ZlKGxvYWRlciksIHJlcXVlc3RdKGF1dG8gZW50cnkpIHsKKyAgICBtX2NhY2hlLT5y ZXRyaWV2ZShyZXF1ZXN0LCB7IG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53 ZWJGcmFtZUlEIH0sIFt0aGlzLCBsb2FkZXIgPSBXVEZNb3ZlKGxvYWRlciksIHJlcXVlc3QgPSBS ZXNvdXJjZVJlcXVlc3QgeyByZXF1ZXN0IH1dKGF1dG8gZW50cnkpIG11dGFibGUgewogI2lmIFJF TEVBU0VfTE9HX0RJU0FCTEVECiAgICAgICAgIFVOVVNFRF9QQVJBTSh0aGlzKTsKICNlbmRpZgpA QCAtMTg1LDcgKzE4NSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpyZXRyaWV2ZUNh Y2hlRW50cnkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgICAgICB9CiAgICAg ICAgIGlmICghZW50cnkpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInJl dHJpZXZlQ2FjaGVFbnRyeTogUmVzb3VyY2Ugbm90IGluIGNhY2hlIChwYWdlSUQgPSAlIiBQUkl1 NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGlz TWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2Vi UGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIs IGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMoKSk7Ci0gICAgICAgICAgICBsb2FkZXIt PnN0YXJ0TmV0d29ya0xvYWQocmVxdWVzdCk7CisgICAgICAgICAgICBsb2FkZXItPnN0YXJ0TmV0 d29ya0xvYWQoV1RGTW92ZShyZXF1ZXN0KSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KICAgICAgICAgaWYgKGVudHJ5LT5yZWRpcmVjdFJlcXVlc3QoKSkgewpAQCAtMTk1LDcgKzE5 NSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpyZXRyaWV2ZUNhY2hlRW50cnkoY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgICAgICB9CiAgICAgICAgIGlmIChsb2Fk ZXItPm1fcGFyYW1ldGVycy5uZWVkc0NlcnRpZmljYXRlSW5mbyAmJiAhZW50cnktPnJlc3BvbnNl KCkuY2VydGlmaWNhdGVJbmZvKCkpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInJldHJpZXZlQ2FjaGVFbnRyeTogUmVzb3VyY2UgZG9lcyBub3QgaGF2ZSByZXF1aXJlZCBj ZXJ0aWZpY2F0ZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9u b3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1l SUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9u b3VzKCkpOwotICAgICAgICAgICAgbG9hZGVyLT5zdGFydE5ldHdvcmtMb2FkKHJlcXVlc3QpOwor ICAgICAgICAgICAgbG9hZGVyLT5zdGFydE5ldHdvcmtMb2FkKFdURk1vdmUocmVxdWVzdCkpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChlbnRyeS0+bmVlZHNW YWxpZGF0aW9uKCkgfHwgcmVxdWVzdC5jYWNoZVBvbGljeSgpID09IFdlYkNvcmU6OlJlZnJlc2hB bnlDYWNoZURhdGEpIHsKQEAgLTIwOCw3ICsyMDgsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6cmV0cmlldmVDYWNoZUVudHJ5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkK ICAgICB9KTsKIH0KIAotdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TmV0d29ya0xv YWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQordm9pZCBOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OnN0YXJ0TmV0d29ya0xvYWQoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkKIHsKICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydE5ldHdvcmtMb2FkOiAocGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAi LCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJz LndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlm aWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOwogCkBAIC0yMjIsNyArMjIy LDYgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TmV0d29ya0xvYWQoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogCiAgICAgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHBh cmFtZXRlcnMgPSBtX3BhcmFtZXRlcnM7CiAgICAgcGFyYW1ldGVycy5kZWZlcnNMb2FkaW5nID0g bV9kZWZlcnNMb2FkaW5nOwotICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVlc3Q7CiAKICAg ICBpZiAocmVxdWVzdC51cmwoKS5wcm90b2NvbElzQmxvYigpKQogICAgICAgICBwYXJhbWV0ZXJz LmJsb2JGaWxlUmVmZXJlbmNlcyA9IE5ldHdvcmtCbG9iUmVnaXN0cnk6OnNpbmdsZXRvbigpLmZp bGVzSW5CbG9iKG1fY29ubmVjdGlvbiwgb3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkpOwpAQCAtMjM5 LDYgKzIzOCw4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydE5ldHdvcmtMb2Fk KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKICAgICAgICAgZGlkRmFpbExvYWRpbmco aW50ZXJuYWxFcnJvcihyZXF1ZXN0LnVybCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisK KyAgICBwYXJhbWV0ZXJzLnJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpOwogICAgIG1fbmV0d29y a0xvYWQgPSBzdGQ6Om1ha2VfdW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgV1RGTW92ZShwYXJh bWV0ZXJzKSwgKm5ldHdvcmtTZXNzaW9uKTsKIAogICAgIGlmIChtX2RlZmVyc0xvYWRpbmcpIHsK QEAgLTQ5Nyw3ICs0OTgsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVX aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgbmV3UmVxdWVzdAogICAgICAgICBpZiAo Y2FuVXNlQ2FjaGVkUmVkaXJlY3QobmV3UmVxdWVzdCkpCiAgICAgICAgICAgICByZXRyaWV2ZUNh Y2hlRW50cnkobmV3UmVxdWVzdCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHN0YXJ0TmV0 d29ya0xvYWQobmV3UmVxdWVzdCk7CisgICAgICAgICAgICBzdGFydE5ldHdvcmtMb2FkKFdURk1v dmUobmV3UmVxdWVzdCkpOwogCiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02NzIsNyArNjcz LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnZhbGlkYXRlQ2FjaGVFbnRyeShzdGQ6 OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlOjpFbnQKIAogICAgIG1fY2FjaGVFbnRyeUZvclZhbGlk YXRpb24gPSBXVEZNb3ZlKGVudHJ5KTsKIAotICAgIHN0YXJ0TmV0d29ya0xvYWQocmV2YWxpZGF0 aW9uUmVxdWVzdCk7CisgICAgc3RhcnROZXR3b3JrTG9hZChXVEZNb3ZlKHJldmFsaWRhdGlvblJl cXVlc3QpKTsKIH0KIAogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpc3BhdGNoV2lsbFNl bmRSZXF1ZXN0Rm9yQ2FjaGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlOjpFbnRy eT4gZW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuaAppbmRleCAxMDIwMzllZTkxYzBiMjcwOWU4NTM2ZTY2OTllNTUxZDEx NDg4YWMzLi5iOWZjZjA4ODA0ZjFkNDllMzJiNmRiYzgwYWMyZTUwYTMyMjNhZmFiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmgKQEAgLTUzLDkgKzUzLDkgQEAgY2xhc3MgRW50cnk7CiAKIGNsYXNzIE5ldHdvcmtSZXNvdXJj ZUxvYWRlciBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4s IHB1YmxpYyBOZXR3b3JrTG9hZENsaWVudCwgcHVibGljIElQQzo6TWVzc2FnZVNlbmRlciB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFJlZjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+IGNyZWF0ZShjb25z dCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVycywgTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNzYWdlczo6TmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBs eT4mJiByZXBseSA9IG51bGxwdHIpCisgICAgc3RhdGljIFJlZjxOZXR3b3JrUmVzb3VyY2VMb2Fk ZXI+IGNyZWF0ZShOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMsIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzJiBjb25uZWN0aW9uLCBSZWZQdHI8TWVzc2FnZXM6 Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpE ZWxheWVkUmVwbHk+JiYgcmVwbHkgPSBudWxscHRyKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UmVmKCpuZXcgTmV0d29ya1Jlc291cmNlTG9hZGVyKHBhcmFtZXRlcnMsIGNvbm5lY3Rpb24s IFdURk1vdmUocmVwbHkpKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE5ldHdvcmtS ZXNvdXJjZUxvYWRlcihXVEZNb3ZlKHBhcmFtZXRlcnMpLCBjb25uZWN0aW9uLCBXVEZNb3ZlKHJl cGx5KSkpOwogICAgIH0KICAgICB2aXJ0dWFsIH5OZXR3b3JrUmVzb3VyY2VMb2FkZXIoKTsKIApA QCAtMTEyLDcgKzExMiw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcml2YXRlOgotICAgIE5ldHdv cmtSZXNvdXJjZUxvYWRlcihjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYsIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzJiwgUmVmUHRyPE1lc3NhZ2VzOjpOZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZDo6RGVsYXllZFJlcGx5 PiYmKTsKKyAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291cmNlTG9hZFBhcmFt ZXRlcnMmJiwgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmLCBSZWZQdHI8TWVzc2FnZXM6 Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpE ZWxheWVkUmVwbHk+JiYpOwogCiAgICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAgICAgSVBDOjpD b25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJyaWRlOwpAQCAtMTI5LDcg KzEyOSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdEZvckNh Y2hlRW50cnkoc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+KTsKICAgICB2b2lk IGNvbnRpbnVlUHJvY2Vzc2luZ0NhY2hlZEVudHJ5QWZ0ZXJEaWRSZWNlaXZlUmVzcG9uc2Uoc3Rk Ojp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+KTsKIAotICAgIHZvaWQgc3RhcnROZXR3 b3JrTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICB2b2lkIHN0YXJ0 TmV0d29ya0xvYWQoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIHZvaWQgY29udGlu dWVEaWRSZWNlaXZlUmVzcG9uc2UoKTsKIAogICAgIHZvaWQgY2xlYW51cCgpOwo= 337662 2018-04-10 17:44:14 -0700 2018-04-11 09:56:43 -0700 Patch bug-184478-20180410174413.patch text/plain 12659 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAxYjYwMTJhNDViYzk2M2Ux M2RhZjYwNDJkYWVmMDYzM2M1ZDU0NTEuLjZjMDZhYmQxYTg4MTM3NzVkMzM1NDZjMzVhODhhODIx OTcyNDA1NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTgtMDQtMTAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBtb3JlIHItdmFsdWVzIGlu IE5ldHdvcmtSZXNvdXJjZUxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg0NDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUGFzcyBsb2FkIHBhcmFtZXRlcnMgYXMgci12YWx1ZXMgdG8gcmVtb3Zl IHNvbWUgdW5uZWVkZWQgY29waWVzLgorICAgICAgICBEaXR0byBmb3IgUmVzb3VyY2VSZXF1ZXN0 IGluc2lkZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzY2hlZHVsZVJlc291cmNlTG9hZCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpwZXJmb3JtU3luY2hy b25vdXNMb2FkKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29y a1Jlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVy OjpzdGFydCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6cmV0cmll dmVDYWNoZUVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpz dGFydE5ldHdvcmtMb2FkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVy Ojpjb250aW51ZVdpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6dmFsaWRhdGVDYWNoZUVudHJ5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxOC0wNC0xMCAgV2Vuc29uIEhzaWVoICA8 d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYXZhaWxhYmlsaXR5IGFubm90 YXRpb25zIGZvciBfV0tBdHRhY2htZW50IFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcApp bmRleCBmYTZmZWFjZDVkMjhlYWEyOTIwMjlkYTBhNzNiN2UzNTY2ZjdhM2I1Li4xYzM3OTllNjIz NGNjZWE5NjQ3MDZmODMwYTFlNjNjNjNmNzdiNWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmNwcApAQCAtMjI4LDE3ICsyMjgsMjMgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzczo6ZW5kU3VzcGVuc2lvbigpCiAjZW5kaWYKIH0KIAotdm9pZCBOZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzczo6c2NoZWR1bGVSZXNvdXJjZUxvYWQoY29uc3QgTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMmIGxvYWRQYXJhbWV0ZXJzKQordm9pZCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzczo6c2NoZWR1bGVSZXNvdXJjZUxvYWQoTmV0d29ya1Jlc291cmNlTG9hZFBhcmFt ZXRlcnMmJiBsb2FkUGFyYW1ldGVycykKIHsKLSAgICBhdXRvIGxvYWRlciA9IE5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6Y3JlYXRlKGxvYWRQYXJhbWV0ZXJzLCAqdGhpcyk7Ci0gICAgbV9uZXR3b3Jr UmVzb3VyY2VMb2FkZXJzLmFkZChsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyLCBsb2FkZXIucHRy KCkpOworICAgIGF1dG8gaWRlbnRpZmllciA9IGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXI7Cisg ICAgQVNTRVJUKCFtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuY29udGFpbnMoaWRlbnRpZmllcikp OworCisgICAgYXV0byBsb2FkZXIgPSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShXVEZN b3ZlKGxvYWRQYXJhbWV0ZXJzKSwgKnRoaXMpOworICAgIG1fbmV0d29ya1Jlc291cmNlTG9hZGVy cy5hZGQoaWRlbnRpZmllciwgbG9hZGVyLnB0cigpKTsKICAgICBsb2FkZXItPnN0YXJ0KCk7CiB9 CiAKLXZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnBlcmZvcm1TeW5jaHJvbm91 c0xvYWQoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmIGxvYWRQYXJhbWV0ZXJz LCBSZWY8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3lu Y2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYgcmVwbHkpCit2b2lkIE5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzOjpwZXJmb3JtU3luY2hyb25vdXNMb2FkKE5ldHdvcmtSZXNvdXJjZUxv YWRQYXJhbWV0ZXJzJiYgbG9hZFBhcmFtZXRlcnMsIFJlZjxNZXNzYWdlczo6TmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBseT4m JiByZXBseSkKIHsKLSAgICBhdXRvIGxvYWRlciA9IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y3Jl YXRlKGxvYWRQYXJhbWV0ZXJzLCAqdGhpcywgV1RGTW92ZShyZXBseSkpOwotICAgIG1fbmV0d29y a1Jlc291cmNlTG9hZGVycy5hZGQobG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllciwgbG9hZGVyLnB0 cigpKTsKKyAgICBhdXRvIGlkZW50aWZpZXIgPSBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyOwor ICAgIEFTU0VSVCghbV9uZXR3b3JrUmVzb3VyY2VMb2FkZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIp KTsKKworICAgIGF1dG8gbG9hZGVyID0gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjcmVhdGUoV1RG TW92ZShsb2FkUGFyYW1ldGVycyksICp0aGlzLCBXVEZNb3ZlKHJlcGx5KSk7CisgICAgbV9uZXR3 b3JrUmVzb3VyY2VMb2FkZXJzLmFkZChpZGVudGlmaWVyLCBsb2FkZXIucHRyKCkpOwogICAgIGxv YWRlci0+c3RhcnQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCmluZGV4IDA3NDgzOGVh MjhkOGIwN2QyZTA4YmZhYzM0MmM2OWY0YTQ0NmUyNTYuLjM4MDQzZDAxMWNmYmNkNzJhY2UwMmI4 NWQ1NTA4M2UyZGNiNzAwY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgKQEAgLTkwLDggKzkw LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJlY2VpdmVOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzc01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJik7CiAgICAgdm9p ZCBkaWRSZWNlaXZlU3luY05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzTWVzc2FnZShJUEM6 OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImLCBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpFbmNvZGVy PiYpOwogCi0gICAgdm9pZCBzY2hlZHVsZVJlc291cmNlTG9hZChjb25zdCBOZXR3b3JrUmVzb3Vy Y2VMb2FkUGFyYW1ldGVycyYpOwotICAgIHZvaWQgcGVyZm9ybVN5bmNocm9ub3VzTG9hZChjb25z dCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYsIFJlZjxNZXNzYWdlczo6TmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBs eT4mJik7CisgICAgdm9pZCBzY2hlZHVsZVJlc291cmNlTG9hZChOZXR3b3JrUmVzb3VyY2VMb2Fk UGFyYW1ldGVycyYmKTsKKyAgICB2b2lkIHBlcmZvcm1TeW5jaHJvbm91c0xvYWQoTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnMmJiwgUmVmPE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZDo6RGVsYXllZFJlcGx5PiYmKTsKICAg ICB2b2lkIGxvYWRQaW5nKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiYsIFdlYkNvcmU6 OkhUVFBIZWFkZXJNYXAmJiBvcmlnaW5hbFJlcXVlc3RIZWFkZXJzKTsKICAgICB2b2lkIHByZWZl dGNoRE5TKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgcHJlY29ubmVjdFRvKHVpbnQ2NF90IHBy ZWNvbm5lY3Rpb25JZGVudGlmaWVyLCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKaW5kZXggNzhiMDY2ZjRlMDdjMzRjM2ZmNWY0NjVkNTJmYzZjMjliNTk5M2VjNy4uZjFjYjVh YmFmY2MxMDUzN2E3NzYxYmYyZjFlNTA5OTUzNzE3MGE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtODYs MTEgKzg2LDExIEBAIHN0YXRpYyB2b2lkIHNlbmRSZXBseVRvU3luY2hyb25vdXNSZXF1ZXN0KE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6U3luY2hyb25vdXNMb2FkCiAgICAgZGF0YS5kZWxheWVkUmVw bHkgPSBudWxscHRyOwogfQogCi1OZXR3b3JrUmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJj ZUxvYWRlcihjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVycywg TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNzYWdl czo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6 OkRlbGF5ZWRSZXBseT4mJiBzeW5jaHJvbm91c1JlcGx5KQotICAgIDogbV9wYXJhbWV0ZXJzIHsg cGFyYW1ldGVycyB9CitOZXR3b3JrUmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cihOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMsIE5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzJiBjb25uZWN0aW9uLCBSZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVw bHk+JiYgc3luY2hyb25vdXNSZXBseSkKKyAgICA6IG1fcGFyYW1ldGVycyB7IFdURk1vdmUocGFy YW1ldGVycykgfQogICAgICwgbV9jb25uZWN0aW9uIHsgY29ubmVjdGlvbiB9CiAgICAgLCBtX2Rl ZmVyc0xvYWRpbmcgeyBwYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcgfQotICAgICwgbV9pc0FsbG93 ZWRUb0Fza1VzZXJGb3JDcmVkZW50aWFscyB7IHBhcmFtZXRlcnMuY2xpZW50Q3JlZGVudGlhbFBv bGljeSA9PSBDbGllbnRDcmVkZW50aWFsUG9saWN5OjpNYXlBc2tDbGllbnRGb3JDcmVkZW50aWFs cyB9CisgICAgLCBtX2lzQWxsb3dlZFRvQXNrVXNlckZvckNyZWRlbnRpYWxzIHsgbV9wYXJhbWV0 ZXJzLmNsaWVudENyZWRlbnRpYWxQb2xpY3kgPT0gQ2xpZW50Q3JlZGVudGlhbFBvbGljeTo6TWF5 QXNrQ2xpZW50Rm9yQ3JlZGVudGlhbHMgfQogICAgICwgbV9idWZmZXJpbmdUaW1lciB7ICp0aGlz LCAmTmV0d29ya1Jlc291cmNlTG9hZGVyOjpidWZmZXJpbmdUaW1lckZpcmVkIH0KICAgICAsIG1f Y2FjaGUgeyBzZXNzaW9uSUQoKS5pc0VwaGVtZXJhbCgpID8gbnVsbHB0ciA6IE5ldHdvcmtQcm9j ZXNzOjpzaW5nbGV0b24oKS5jYWNoZSgpIH0KIHsKQEAgLTE2Nyw3ICsxNjcsNyBAQCB2b2lkIE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0g ICAgc3RhcnROZXR3b3JrTG9hZChvcmlnaW5hbFJlcXVlc3QoKSk7CisgICAgc3RhcnROZXR3b3Jr TG9hZChSZXNvdXJjZVJlcXVlc3QgeyBvcmlnaW5hbFJlcXVlc3QoKSB9KTsKIH0KIAogdm9pZCBO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJldHJpZXZlQ2FjaGVFbnRyeShjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QpCkBAIC0xNzUsNyArMTc1LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OnJldHJpZXZlQ2FjaGVFbnRyeShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qp CiAgICAgQVNTRVJUKGNhblVzZUNhY2hlKHJlcXVlc3QpKTsKIAogICAgIFJlZlB0cjxOZXR3b3Jr UmVzb3VyY2VMb2FkZXI+IGxvYWRlcih0aGlzKTsKLSAgICBtX2NhY2hlLT5yZXRyaWV2ZShyZXF1 ZXN0LCB7IG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlEIH0s IFt0aGlzLCBsb2FkZXIgPSBXVEZNb3ZlKGxvYWRlciksIHJlcXVlc3RdKGF1dG8gZW50cnkpIHsK KyAgICBtX2NhY2hlLT5yZXRyaWV2ZShyZXF1ZXN0LCB7IG1fcGFyYW1ldGVycy53ZWJQYWdlSUQs IG1fcGFyYW1ldGVycy53ZWJGcmFtZUlEIH0sIFt0aGlzLCBsb2FkZXIgPSBXVEZNb3ZlKGxvYWRl ciksIHJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3QgeyByZXF1ZXN0IH1dKGF1dG8gZW50cnkpIG11 dGFibGUgewogI2lmIFJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgICAgIFVOVVNFRF9QQVJBTSh0 aGlzKTsKICNlbmRpZgpAQCAtMTg1LDcgKzE4NSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9h ZGVyOjpyZXRyaWV2ZUNhY2hlRW50cnkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQog ICAgICAgICB9CiAgICAgICAgIGlmICghZW50cnkpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoInJldHJpZXZlQ2FjaGVFbnRyeTogUmVzb3VyY2Ugbm90IGluIGNhY2hlIChw YWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0g JSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBt X3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0 ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMoKSk7Ci0gICAg ICAgICAgICBsb2FkZXItPnN0YXJ0TmV0d29ya0xvYWQocmVxdWVzdCk7CisgICAgICAgICAgICBs b2FkZXItPnN0YXJ0TmV0d29ya0xvYWQoV1RGTW92ZShyZXF1ZXN0KSk7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKGVudHJ5LT5yZWRpcmVjdFJlcXVlc3QoKSkg ewpAQCAtMTk1LDcgKzE5NSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpyZXRyaWV2 ZUNhY2hlRW50cnkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgICAgICB9CiAg ICAgICAgIGlmIChsb2FkZXItPm1fcGFyYW1ldGVycy5uZWVkc0NlcnRpZmljYXRlSW5mbyAmJiAh ZW50cnktPnJlc3BvbnNlKCkuY2VydGlmaWNhdGVJbmZvKCkpIHsKICAgICAgICAgICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoInJldHJpZXZlQ2FjaGVFbnRyeTogUmVzb3VyY2UgZG9lcyBub3Qg aGF2ZSByZXF1aXJlZCBjZXJ0aWZpY2F0ZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9 ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJh bWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJj ZSgpLCBpc1N5bmNocm9ub3VzKCkpOwotICAgICAgICAgICAgbG9hZGVyLT5zdGFydE5ldHdvcmtM b2FkKHJlcXVlc3QpOworICAgICAgICAgICAgbG9hZGVyLT5zdGFydE5ldHdvcmtMb2FkKFdURk1v dmUocmVxdWVzdCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlm IChlbnRyeS0+bmVlZHNWYWxpZGF0aW9uKCkgfHwgcmVxdWVzdC5jYWNoZVBvbGljeSgpID09IFdl YkNvcmU6OlJlZnJlc2hBbnlDYWNoZURhdGEpIHsKQEAgLTIwOCw3ICsyMDgsNyBAQCB2b2lkIE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6cmV0cmlldmVDYWNoZUVudHJ5KGNvbnN0IFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCkKICAgICB9KTsKIH0KIAotdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6 OnN0YXJ0TmV0d29ya0xvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQordm9pZCBO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TmV0d29ya0xvYWQoUmVzb3VyY2VSZXF1ZXN0JiYg cmVxdWVzdCkKIHsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydE5ldHdvcmtMb2Fk OiAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJ RCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQp IiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFy YW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOwog CkBAIC0yMjIsNyArMjIyLDYgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TmV0 d29ya0xvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogCiAgICAgTmV0d29ya0xv YWRQYXJhbWV0ZXJzIHBhcmFtZXRlcnMgPSBtX3BhcmFtZXRlcnM7CiAgICAgcGFyYW1ldGVycy5k ZWZlcnNMb2FkaW5nID0gbV9kZWZlcnNMb2FkaW5nOwotICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9 IHJlcXVlc3Q7CiAKICAgICBpZiAocmVxdWVzdC51cmwoKS5wcm90b2NvbElzQmxvYigpKQogICAg ICAgICBwYXJhbWV0ZXJzLmJsb2JGaWxlUmVmZXJlbmNlcyA9IE5ldHdvcmtCbG9iUmVnaXN0cnk6 OnNpbmdsZXRvbigpLmZpbGVzSW5CbG9iKG1fY29ubmVjdGlvbiwgb3JpZ2luYWxSZXF1ZXN0KCku dXJsKCkpOwpAQCAtMjM5LDYgKzIzOCw4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpz dGFydE5ldHdvcmtMb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKICAgICAgICAg ZGlkRmFpbExvYWRpbmcoaW50ZXJuYWxFcnJvcihyZXF1ZXN0LnVybCgpKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CisKKyAgICBwYXJhbWV0ZXJzLnJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3Qp OwogICAgIG1fbmV0d29ya0xvYWQgPSBzdGQ6Om1ha2VfdW5pcXVlPE5ldHdvcmtMb2FkPigqdGhp cywgV1RGTW92ZShwYXJhbWV0ZXJzKSwgKm5ldHdvcmtTZXNzaW9uKTsKIAogICAgIGlmIChtX2Rl ZmVyc0xvYWRpbmcpIHsKQEAgLTQ5Nyw3ICs0OTgsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6Y29udGludWVXaWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgbmV3UmVxdWVz dAogICAgICAgICBpZiAoY2FuVXNlQ2FjaGVkUmVkaXJlY3QobmV3UmVxdWVzdCkpCiAgICAgICAg ICAgICByZXRyaWV2ZUNhY2hlRW50cnkobmV3UmVxdWVzdCk7CiAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgIHN0YXJ0TmV0d29ya0xvYWQobmV3UmVxdWVzdCk7CisgICAgICAgICAgICBzdGFydE5l dHdvcmtMb2FkKFdURk1vdmUobmV3UmVxdWVzdCkpOwogCiAgICAgICAgIHJldHVybjsKICAgICB9 CkBAIC02NzIsNyArNjczLDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnZhbGlkYXRl Q2FjaGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlOjpFbnQKIAogICAgIG1fY2Fj aGVFbnRyeUZvclZhbGlkYXRpb24gPSBXVEZNb3ZlKGVudHJ5KTsKIAotICAgIHN0YXJ0TmV0d29y a0xvYWQocmV2YWxpZGF0aW9uUmVxdWVzdCk7CisgICAgc3RhcnROZXR3b3JrTG9hZChXVEZNb3Zl KHJldmFsaWRhdGlvblJlcXVlc3QpKTsKIH0KIAogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6 OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0Rm9yQ2FjaGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8TmV0 d29ya0NhY2hlOjpFbnRyeT4gZW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCAxMDIwMzllZTkxYzBiMjcwOWU4 NTM2ZTY2OTllNTUxZDExNDg4YWMzLi5iOWZjZjA4ODA0ZjFkNDllMzJiNmRiYzgwYWMyZTUwYTMy MjNhZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZGVyLmgKQEAgLTUzLDkgKzUzLDkgQEAgY2xhc3MgRW50cnk7CiAKIGNsYXNz IE5ldHdvcmtSZXNvdXJjZUxvYWRlciBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPE5ldHdvcmtS ZXNvdXJjZUxvYWRlcj4sIHB1YmxpYyBOZXR3b3JrTG9hZENsaWVudCwgcHVibGljIElQQzo6TWVz c2FnZVNlbmRlciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxOZXR3b3JrUmVzb3VyY2VMb2Fk ZXI+IGNyZWF0ZShjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVy cywgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIGNvbm5lY3Rpb24sIFJlZlB0cjxNZXNz YWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xv YWQ6OkRlbGF5ZWRSZXBseT4mJiByZXBseSA9IG51bGxwdHIpCisgICAgc3RhdGljIFJlZjxOZXR3 b3JrUmVzb3VyY2VMb2FkZXI+IGNyZWF0ZShOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYm IHBhcmFtZXRlcnMsIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzJiBjb25uZWN0aW9uLCBS ZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3lu Y2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYgcmVwbHkgPSBudWxscHRyKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya1Jlc291cmNlTG9hZGVyKHBhcmFtZXRl cnMsIGNvbm5lY3Rpb24sIFdURk1vdmUocmVwbHkpKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IE5ldHdvcmtSZXNvdXJjZUxvYWRlcihXVEZNb3ZlKHBhcmFtZXRlcnMpLCBjb25uZWN0 aW9uLCBXVEZNb3ZlKHJlcGx5KSkpOwogICAgIH0KICAgICB2aXJ0dWFsIH5OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIoKTsKIApAQCAtMTEyLDcgKzExMiw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcml2 YXRlOgotICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRlcihjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2Fk UGFyYW1ldGVycyYsIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzJiwgUmVmUHRyPE1lc3Nh Z2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9h ZDo6RGVsYXllZFJlcGx5PiYmKTsKKyAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnMmJiwgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmLCBS ZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3lu Y2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+JiYpOwogCiAgICAgLy8gSVBDOjpNZXNzYWdlU2Vu ZGVyCiAgICAgSVBDOjpDb25uZWN0aW9uKiBtZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJy aWRlOwpAQCAtMTI5LDcgKzEyOSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxT ZW5kUmVxdWVzdEZvckNhY2hlRW50cnkoc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50 cnk+KTsKICAgICB2b2lkIGNvbnRpbnVlUHJvY2Vzc2luZ0NhY2hlZEVudHJ5QWZ0ZXJEaWRSZWNl aXZlUmVzcG9uc2Uoc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+KTsKIAotICAg IHZvaWQgc3RhcnROZXR3b3JrTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsK KyAgICB2b2lkIHN0YXJ0TmV0d29ya0xvYWQoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpOwog ICAgIHZvaWQgY29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UoKTsKIAogICAgIHZvaWQgY2xlYW51 cCgpOwo=