151021 2015-11-09 07:22:47 -0800 [Streams API] Activate assertions 2015-11-09 10:06:54 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf benjamin calvaris commit-queue darin oldest_to_newest 1140359 0 youennf 2015-11-09 07:22:47 -0800 As per the spec, we should enable some @assert in streams implementation. 1140371 1 265053 youennf 2015-11-09 08:26:53 -0800 Created attachment 265053 Patch 1140374 2 265054 youennf 2015-11-09 08:34:47 -0800 Created attachment 265054 Rebasing 1140375 3 youennf 2015-11-09 08:36:05 -0800 Patch activates assertion checking. It fixes a small bug when pull promise is rejected. This actually implements the "if" check of https://streams.spec.whatwg.org/#request-readable-stream-pull (step 7a) 1140406 4 265054 commit-queue 2015-11-09 10:06:49 -0800 Comment on attachment 265054 Rebasing Clearing flags on attachment: 265054 Committed r192160: <http://trac.webkit.org/changeset/192160> 1140407 5 commit-queue 2015-11-09 10:06:54 -0800 All reviewed patches have been landed. Closing bug. 265053 2015-11-09 08:26:53 -0800 2015-11-09 08:34:40 -0800 Patch bug-151021-20151109172648.patch text/plain 9570 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M2ZmJjOGMzMzc5ZjE1 MzAzMWNkYmUzMDQ5MmYyY2VlYzZhZjRhMC4uMTE0NDY3NTYxMWFmMmIzMmJkNDE3YTRlNzUwMmI0 ZDk3MGYxYThlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTExLTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgW1N0cmVh bXMgQVBJXSBBY3RpdmF0ZSBhc3NlcnRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBY3RpdmF0aW5nIGFzc2VydGlvbnMgaW4gc3RyZWFtcyBBUEku CisgICAgICAgIEZpeGluZyBhIGJ1ZyBpbiBSZWFkYWJsZVN0cmVhbSBpbXBsZW1lbnRhdGlvbjog d2hlbiBwdWxsIHByb21pc2UgaXMgcmVqZWN0ZWQsCisgICAgICAgIHRoZSByZWFkYWJsZSBzdHJl YW0gbWF5IGFscmVhZHkgYmUgZXJyb3JlZCBieSBzb21lIG90aGVyIG1lYW5zLgorCisgICAgICAg IENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdCBzZXRzIGluIERlYnVnIGJ1aWxkcy4KKworICAgICAg ICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAgICAg KHRlZVJlYWRhYmxlU3RyZWFtKToKKyAgICAgICAgKHRlZVJlYWRhYmxlU3RyZWFtUHVsbEZ1bmN0 aW9uKToKKyAgICAgICAgKGVycm9yUmVhZGFibGVTdHJlYW0pOgorICAgICAgICAocmVxdWVzdFJl YWRhYmxlU3RyZWFtUHVsbCk6CisgICAgICAgIChmaW5pc2hDbG9zaW5nUmVhZGFibGVTdHJlYW0p OgorICAgICAgICAoY2xvc2VSZWFkYWJsZVN0cmVhbSk6CisgICAgICAgIChlbnF1ZXVlSW5SZWFk YWJsZVN0cmVhbSk6CisgICAgICAgIChyZWFkRnJvbVJlYWRhYmxlU3RyZWFtUmVhZGVyKToKKyAg ICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuanM6CisgICAgICAg IChjYW5jZWwpOgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9TdHJlYW1JbnRlcm5hbHMuanM6 CisgICAgICAgIChwZWVrUXVldWVWYWx1ZSk6CisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1dy aXRhYmxlU3RyZWFtLmpzOgorICAgICAgICAod3JpdGUpOgorICAgICAgICAoc3RhdGUpOgorICAg ICAgICAqIE1vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAg ICAgKHN5bmNXcml0YWJsZVN0cmVhbVN0YXRlV2l0aFF1ZXVlKToKKyAgICAgICAgKGNsb3NlV3Jp dGFibGVTdHJlYW0pOiBEZWxldGVkLgorCiAyMDE1LTExLTA5ICBNYW51ZWwgUmVnbyBDYXNhc25v dmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0gUmVmYWN0b3IgY2Fj aGVkR3JpZENvb3JkaW5hdGUoKSB0byBjYWNoZWRHcmlkU3BhbigpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMK aW5kZXggMWRiZjBlNGQ1YzRmYzBkNDc2MDNkNGEzNTgyYWJlMzdiOTg0NTM4Ny4uMWZhOWViZGMy ZjU1MDlhMTNjMDBjNmIxNWE4ZmJjMWE1YWJiYjkyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qcwpAQCAt NzYsOCArNzYsOCBAQCBmdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbShzdHJlYW0sIHNob3VsZENs b25lKQogewogICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIC8vIFRPRE86IEFzc2VydDogSXNSZWFk YWJsZVN0cmVhbShzdHJlYW0pIGlzIHRydWUuCi0gICAgLy8gVE9ETzogQXNzZXJ0OiBUeXBlKHNo b3VsZENsb25lKSBpcyBCb29sZWFuLgorICAgIEBhc3NlcnQoQGlzUmVhZGFibGVTdHJlYW0oc3Ry ZWFtKSk7CisgICAgQGFzc2VydCh0eXBlb2Yoc2hvdWxkQ2xvbmUpID09PSAiYm9vbGVhbiIpOwog CiAgICAgbGV0IHJlYWRlciA9IHN0cmVhbS5nZXRSZWFkZXIoKTsKIApAQCAtMTMzLDExICsxMzMs MTEgQEAgZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW1QdWxsRnVuY3Rpb24odGVlU3RhdGUsIHJl YWRlciwgc2hvdWxkQ2xvbmUpCiAgICAgICAgICAgICBpZiAodGVlU3RhdGUuY2xvc2VkT3JFcnJv cmVkKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGlmICghdGVlU3RhdGUu Y2FuY2VsZWQxKSB7Ci0gICAgICAgICAgICAgICAgLy8gVE9ETzogSW1wbGVtZW50IGNsb25pbmcg aWYgc2hvdWxkQ2xvbmUgaXMgdHJ1ZQorICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1l bnQgY2xvbmluZyBpZiBzaG91bGRDbG9uZSBpcyB0cnVlCiAgICAgICAgICAgICAgICAgQGVucXVl dWVJblJlYWRhYmxlU3RyZWFtKHRlZVN0YXRlLmJyYW5jaDEsIHJlc3VsdC52YWx1ZSk7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIXRlZVN0YXRlLmNhbmNlbGVkMikgewotICAgICAg ICAgICAgICAgIC8vIFRPRE86IEltcGxlbWVudCBjbG9uaW5nIGlmIHNob3VsZENsb25lIGlzIHRy dWUKKyAgICAgICAgICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50IGNsb25pbmcgaWYgc2hvdWxk Q2xvbmUgaXMgdHJ1ZQogICAgICAgICAgICAgICAgIEBlbnF1ZXVlSW5SZWFkYWJsZVN0cmVhbSh0 ZWVTdGF0ZS5icmFuY2gyLCByZXN1bHQudmFsdWUpOwogICAgICAgICAgICAgfQogICAgICAgICB9 KTsKQEAgLTE5NSw3ICsxOTUsNyBAQCBmdW5jdGlvbiBlcnJvclJlYWRhYmxlU3RyZWFtKHN0cmVh bSwgZXJyb3IpCiB7CiAgICAgInVzZSBzdHJpY3QiOwogCi0gICAgLy8gRklYTUU6IEFTU0VSVChz dHJlYW0uQHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpOworICAgIEBhc3NlcnQoc3RyZWFtLkBz dGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKTsKICAgICBzdHJlYW0uQHF1ZXVlID0gQG5ld1F1ZXVl KCk7CiAgICAgc3RyZWFtLkBzdG9yZWRFcnJvciA9IGVycm9yOwogICAgIHN0cmVhbS5Ac3RhdGUg PSBAc3RyZWFtRXJyb3JlZDsKQEAgLTI0NCw3ICsyNDQsOCBAQCBmdW5jdGlvbiByZXF1ZXN0UmVh ZGFibGVTdHJlYW1QdWxsKHN0cmVhbSkKICAgICAgICAgICAgIEByZXF1ZXN0UmVhZGFibGVTdHJl YW1QdWxsKHN0cmVhbSk7CiAgICAgICAgIH0KICAgICB9LCBmdW5jdGlvbihlcnJvcikgewotICAg ICAgICBAZXJyb3JSZWFkYWJsZVN0cmVhbShzdHJlYW0sIGVycm9yKTsKKyAgICAgICAgaWYgKHN0 cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSkKKyAgICAgICAgICAgIEBlcnJvclJlYWRh YmxlU3RyZWFtKHN0cmVhbSwgZXJyb3IpOwogICAgIH0pOwogfQogCkBAIC0yODcsNyArMjg4LDcg QEAgZnVuY3Rpb24gZmluaXNoQ2xvc2luZ1JlYWRhYmxlU3RyZWFtKHN0cmVhbSkKIHsKICAgICAi dXNlIHN0cmljdCI7CiAKLSAgICAvLyBGSVhNRTogQVNTRVJUKHN0cmVhbS5Ac3RhdGUgPT09ICBA c3RyZWFtUmVhZGFibGUpOworICAgIEBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gIEBzdHJlYW1S ZWFkYWJsZSk7CiAgICAgc3RyZWFtLkBzdGF0ZSA9IEBzdHJlYW1DbG9zZWQ7CiAgICAgdmFyIHJl YWRlciA9IHN0cmVhbS5AcmVhZGVyOwogICAgIGlmIChyZWFkZXIpCkBAIC0yOTgsOCArMjk5LDgg QEAgZnVuY3Rpb24gY2xvc2VSZWFkYWJsZVN0cmVhbShzdHJlYW0pCiB7CiAgICAgInVzZSBzdHJp Y3QiOwogCi0gICAgLy8gRklYTUU6IEFTU0VSVCghc3RyZWFtLkBjbG9zZVJlcXVlc3RlZCk7Ci0g ICAgLy8gRklYTUU6IEFTU0VSVChzdHJlYW0uQHN0YXRlICE9PSBAc3RyZWFtRXJyb3JlZCk7Cisg ICAgQGFzc2VydCghc3RyZWFtLkBjbG9zZVJlcXVlc3RlZCk7CisgICAgQGFzc2VydChzdHJlYW0u QHN0YXRlICE9PSBAc3RyZWFtRXJyb3JlZCk7CiAgICAgaWYgKHN0cmVhbS5Ac3RhdGUgPT09IEBz dHJlYW1DbG9zZWQpCiAgICAgICAgIHJldHVybjsgCiAgICAgc3RyZWFtLkBjbG9zZVJlcXVlc3Rl ZCA9IHRydWU7CkBAIC0zMjQsOCArMzI1LDggQEAgZnVuY3Rpb24gZW5xdWV1ZUluUmVhZGFibGVT dHJlYW0oc3RyZWFtLCBjaHVuaykKIHsKICAgICAidXNlIHN0cmljdCI7CiAKLSAgICAvLyBGSVhN RTogQVNTRVJUKCFzdHJlYW0uQGNsb3NlUmVxdWVzdGVkKTsKLSAgICAvLyBGSVhNRTogQVNTRVJU KHN0cmVhbS5Ac3RhdGUgIT09IEBzdHJlYW1FcnJvcmVkKTsKKyAgICBAYXNzZXJ0KCFzdHJlYW0u QGNsb3NlUmVxdWVzdGVkKTsKKyAgICBAYXNzZXJ0KHN0cmVhbS5Ac3RhdGUgIT09IEBzdHJlYW1F cnJvcmVkKTsKICAgICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NlZCkKICAgICAg ICAgcmV0dXJuIHVuZGVmaW5lZDsKICAgICBpZiAoQGlzUmVhZGFibGVTdHJlYW1Mb2NrZWQoc3Ry ZWFtKSAmJiBzdHJlYW0uQHJlYWRlci5AcmVhZFJlcXVlc3RzLmxlbmd0aCkgewpAQCAtMzU3LDgg KzM1OCw4IEBAIGZ1bmN0aW9uIHJlYWRGcm9tUmVhZGFibGVTdHJlYW1SZWFkZXIocmVhZGVyKQog ICAgICAgICByZXR1cm4gQFByb21pc2UuQHJlc29sdmUoe3ZhbHVlOiB1bmRlZmluZWQsIGRvbmU6 IHRydWV9KTsKICAgICBpZiAocmVhZGVyLkBzdGF0ZSA9PT0gQHN0cmVhbUVycm9yZWQpCiAgICAg ICAgIHJldHVybiBAUHJvbWlzZS5AcmVqZWN0KHJlYWRlci5Ac3RvcmVkRXJyb3IpOwotICAgIC8v IEZJWE1FOiBBU1NFUlQoISFyZWFkZXIuQG93bmVyUmVhZGFibGVTdHJlYW0pOwotICAgIC8vIEZJ WE1FOiBBU1NFUlQocmVhZGVyLkBvd25lclJlYWRhYmxlU3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVh bVJlYWRhYmxlKTsKKyAgICBAYXNzZXJ0KCEhcmVhZGVyLkBvd25lclJlYWRhYmxlU3RyZWFtKTsK KyAgICBAYXNzZXJ0KHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVhbS5Ac3RhdGUgPT09IEBzdHJl YW1SZWFkYWJsZSk7CiAgICAgdmFyIHN0cmVhbSA9IHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVh bTsKICAgICBpZiAoc3RyZWFtLkBxdWV1ZS5jb250ZW50Lmxlbmd0aCkgewogICAgICAgICB2YXIg Y2h1bmsgPSBAZGVxdWV1ZVZhbHVlKHN0cmVhbS5AcXVldWUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmpzIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmpzCmluZGV4IDk1 ZDMyYTNjNWE3ZTYzZWVkZWE5NTI4MTczN2U5NzEyMTg1MDAzNmIuLjcxZTEwZTY0MDE5ZDg2ODM0 MGU0YjIzNDk1NTExYTM4MGU2OGI5ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJlYWRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuanMKQEAgLTM4LDggKzM4LDggQEAg ZnVuY3Rpb24gY2FuY2VsKHJlYXNvbikKICAgICBpZiAodGhpcy5Ac3RhdGUgPT09IEBzdHJlYW1F cnJvcmVkKQogICAgICAgICByZXR1cm4gQFByb21pc2UuQHJlamVjdCh0aGlzLkBzdG9yZWRFcnJv cik7CiAKLSAgICAvLyBGSVhNRTogQVNTRVJUKEBpc1JlYWRhYmxlU3RyZWFtKHRoaXMuQG93bmVy UmVhZGFibGVTdHJlYW0pKTsKLSAgICAvLyBGSVhNRTogQVNTRVJUKHRoaXMuQG93bmVyUmVhZGFi bGVTdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpOworICAgIEBhc3NlcnQoQGlzUmVh ZGFibGVTdHJlYW0odGhpcy5Ab3duZXJSZWFkYWJsZVN0cmVhbSkpOworICAgIEBhc3NlcnQodGhp cy5Ab3duZXJSZWFkYWJsZVN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSk7CiAgICAg cmV0dXJuIEBjYW5jZWxSZWFkYWJsZVN0cmVhbSh0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtLCBy ZWFzb24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMv U3RyZWFtSW50ZXJuYWxzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1N0cmVh bUludGVybmFscy5qcwppbmRleCA2MzA0MDhmYTNjMjYyNDcxYWE5OGEzMWFjNTE3NjFkNmNjNzAw MjJmLi5jYmMxYjIxNDQ2YzU1MzU3NWZhOWM1MGE2YjA4YzBhNzZjYzYzOGI1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvU3RyZWFtSW50ZXJuYWxzLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9TdHJlYW1JbnRlcm5hbHMuanMKQEAgLTEx Nyw4ICsxMTcsNyBAQCBmdW5jdGlvbiBlbnF1ZXVlVmFsdWVXaXRoU2l6ZShxdWV1ZSwgdmFsdWUs IHNpemUpCiAKIGZ1bmN0aW9uIHBlZWtRdWV1ZVZhbHVlKHF1ZXVlKQogewotICAgIC8vIEZJWE1F Ci0gICAgLy8gYXNzZXJ0KHF1ZXVlLmNvbnRlbnQubGVuZ3RoID4gMCk7CisgICAgQGFzc2VydChx dWV1ZS5jb250ZW50Lmxlbmd0aCA+IDApOwogCiAgICAgcmV0dXJuIHF1ZXVlLmNvbnRlbnRbMF0u dmFsdWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3Jp dGFibGVTdHJlYW0uanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVT dHJlYW0uanMKaW5kZXggYWQ5ZDExMDIxMmU1YWRkMWNjYzIxZWU2MGNmYzVjMmUxZWI0OGQwYy4u YjcyZGI1OTEwNWYyNDc3ZTM0MTYxMTYzNDYzNTdmYmYxOGExMGM1OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbS5qcwpAQCAtMTIxLDggKzEy MSw3IEBAIGZ1bmN0aW9uIHdyaXRlKGNodW5rKQogICAgIGlmICh0aGlzLkBzdGF0ZSA9PT0gQHN0 cmVhbUVycm9yZWQpCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVqZWN0KHRoaXMuQHN0b3Jl ZEVycm9yKTsKIAotICAgIC8vIEZJWE1FCi0gICAgLy8gYXNzZXJ0KHRoaXMuQHN0YXRlID09PSBA c3RyZWFtV3JpdGFibGUgfHwgdGhpcy5Ac3RhdGUgPT09IEBzdHJlYW1XYWl0aW5nKTsKKyAgICBA YXNzZXJ0KHRoaXMuQHN0YXRlID09PSBAc3RyZWFtV3JpdGFibGUgfHwgdGhpcy5Ac3RhdGUgPT09 IEBzdHJlYW1XYWl0aW5nKTsKIAogICAgIGxldCBjaHVua1NpemUgPSAxOwogICAgIGlmICh0aGlz LkBzdHJhdGVneS5zaXplICE9PSB1bmRlZmluZWQpIHsKQEAgLTE4OCw4ICsxODcsNSBAQCBmdW5j dGlvbiBzdGF0ZSgpCiAgICAgICAgIHJldHVybiAid3JpdGFibGUiOwogICAgIH0KIAotICAgIC8v IEZJWE1FCi0gICAgLy8gYXNzZXJ0X25vdF9yZWFjaGVkKCk7Ci0KLSAgICByZXR1cm4gdW5kZWZp bmVkOworICAgIEBhc3NlcnQoZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCmluZGV4IDVmZTM3 MzI2MThlNDNlMTk0MjEwZDczZWVmMmMyZmRkZDQ0ZTc0NzkuLmJmYzUwYmEzYjg1YzM2Zjc2NjRi ODljOTBmYzZhNTdmNDg0NmNjYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv c3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW1JbnRlcm5hbHMuanMKQEAgLTQxLDggKzQxLDcg QEAgZnVuY3Rpb24gc3luY1dyaXRhYmxlU3RyZWFtU3RhdGVXaXRoUXVldWUoc3RyZWFtKQogICAg IGlmIChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtQ2xvc2luZykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgLy8gRklYTUUKLSAgICAvLyBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVdy aXRhYmxlIHx8IHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1XYWl0aW5nKTsKKyAgICBAYXNzZXJ0 KHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1Xcml0YWJsZSB8fCBzdHJlYW0uQHN0YXRlID09PSBA c3RyZWFtV2FpdGluZyk7CiAKICAgICBjb25zdCBzaG91bGRBcHBseUJhY2twcmVzc3VyZSA9IHN0 cmVhbS5AcXVldWUuc2l6ZSA+IHN0cmVhbS5Ac3RyYXRlZ3kuaGlnaFdhdGVyTWFyazsKICAgICBp ZiAoc2hvdWxkQXBwbHlCYWNrcHJlc3N1cmUgJiYgc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVdy aXRhYmxlKSB7CkBAIC05MSwxMSArOTAsOSBAQCBmdW5jdGlvbiB3cml0YWJsZVN0cmVhbUFkdmFu Y2VRdWV1ZShzdHJlYW0pCiAKICAgICBjb25zdCB3cml0ZVJlY29yZCA9IEBwZWVrUXVldWVWYWx1 ZShzdHJlYW0uQHF1ZXVlKTsKICAgICBpZiAod3JpdGVSZWNvcmQgPT09ICJjbG9zZSIpIHsKLSAg ICAgICAgLy8gRklYTUUKLSAgICAgICAgLy8gYXNzZXJ0KHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJl YW1DbG9zaW5nKTsKKyAgICAgICAgQGFzc2VydChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtQ2xv c2luZyk7CiAgICAgICAgIEBkZXF1ZXVlVmFsdWUoc3RyZWFtLkBxdWV1ZSk7Ci0gICAgICAgIC8v IEZJWE1FCi0gICAgICAgIC8vIGFzc2VydChzdHJlYW0uQHF1ZXVlLmNvbnRlbnQubGVuZ3RoID09 PSAwKTsKKyAgICAgICAgQGFzc2VydChzdHJlYW0uQHF1ZXVlLmNvbnRlbnQubGVuZ3RoID09PSAw KTsKICAgICAgICAgQGNsb3NlV3JpdGFibGVTdHJlYW0oc3RyZWFtKTsKICAgICAgICAgcmV0dXJu IHVuZGVmaW5lZDsKICAgICB9CkBAIC0xMjEsMTQgKzExOCwxMiBAQCBmdW5jdGlvbiB3cml0YWJs ZVN0cmVhbUFkdmFuY2VRdWV1ZShzdHJlYW0pCiAKIGZ1bmN0aW9uIGNsb3NlV3JpdGFibGVTdHJl YW0oc3RyZWFtKQogewotICAgIC8vIEZJWE1FCi0gICAgLy8gYXNzZXJ0KHN0cmVhbS5Ac3RhdGUg PT09IEBzdHJlYW1DbG9zaW5nKTsKKyAgICBAYXNzZXJ0KHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJl YW1DbG9zaW5nKTsKICAgICBAcHJvbWlzZUludm9rZU9yTm9vcChzdHJlYW0uQHVuZGVybHlpbmdT aW5rLCAiY2xvc2UiKS50aGVuKAogICAgICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIGlm IChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtRXJyb3JlZCkKICAgICAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgICAgICAvLyBGSVhNRQotICAgICAgICAgICAgLy8gYXNzZXJ0KHN0cmVhbS5A c3RhdGUgPT09IEBzdHJlYW1DbG9zaW5nKTsKKyAgICAgICAgICAgIEBhc3NlcnQoc3RyZWFtLkBz dGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOwogICAgICAgICAgICAgc3RyZWFtLkBjbG9zZWRQcm9t aXNlQ2FwYWJpbGl0eS5AcmVzb2x2ZS5AY2FsbCh1bmRlZmluZWQsIHVuZGVmaW5lZCk7CiAgICAg ICAgICAgICBzdHJlYW0uQHN0YXRlID0gQHN0cmVhbUNsb3NlZDsKICAgICAgICAgfSwK 265054 2015-11-09 08:34:47 -0800 2015-11-09 10:06:49 -0800 Rebasing bug-151021-20151109173443.patch text/plain 9594 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFjZTBiNmM0ZjBlMDBk ZDI3ZmRmMTIxNjgyMTcwYmI4NjNjN2YwYy4uNjM1MWI3MTJlMjY1MDliYzJhYWM5MTQyY2I1NDJm ZGI4ZjQ5YjBiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTExLTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgW1N0cmVh bXMgQVBJXSBBY3RpdmF0ZSBhc3NlcnRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBY3RpdmF0aW5nIGFzc2VydGlvbnMgaW4gc3RyZWFtcyBBUEku CisgICAgICAgIEZpeGluZyBhIGJ1ZyBpbiBSZWFkYWJsZVN0cmVhbSBpbXBsZW1lbnRhdGlvbjog d2hlbiBwdWxsIHByb21pc2UgaXMgcmVqZWN0ZWQsCisgICAgICAgIHRoZSByZWFkYWJsZSBzdHJl YW0gbWF5IGFscmVhZHkgYmUgZXJyb3JlZCBieSBzb21lIG90aGVyIG1lYW5zLgorCisgICAgICAg IENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdCBzZXRzIGluIERlYnVnIGJ1aWxkcy4KKworICAgICAg ICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAgICAg KHRlZVJlYWRhYmxlU3RyZWFtKToKKyAgICAgICAgKHRlZVJlYWRhYmxlU3RyZWFtUHVsbEZ1bmN0 aW9uKToKKyAgICAgICAgKGVycm9yUmVhZGFibGVTdHJlYW0pOgorICAgICAgICAocmVxdWVzdFJl YWRhYmxlU3RyZWFtUHVsbCk6CisgICAgICAgIChmaW5pc2hDbG9zaW5nUmVhZGFibGVTdHJlYW0p OgorICAgICAgICAoY2xvc2VSZWFkYWJsZVN0cmVhbSk6CisgICAgICAgIChlbnF1ZXVlSW5SZWFk YWJsZVN0cmVhbSk6CisgICAgICAgIChyZWFkRnJvbVJlYWRhYmxlU3RyZWFtUmVhZGVyKToKKyAg ICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuanM6CisgICAgICAg IChjYW5jZWwpOgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9TdHJlYW1JbnRlcm5hbHMuanM6 CisgICAgICAgIChwZWVrUXVldWVWYWx1ZSk6CisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1dy aXRhYmxlU3RyZWFtLmpzOgorICAgICAgICAod3JpdGUpOgorICAgICAgICAoc3RhdGUpOgorICAg ICAgICAqIE1vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAg ICAgKHN5bmNXcml0YWJsZVN0cmVhbVN0YXRlV2l0aFF1ZXVlKToKKyAgICAgICAgKGNsb3NlV3Jp dGFibGVTdHJlYW0pOiBEZWxldGVkLgorCiAyMDE1LTExLTA5ICBYYWJpZXIgUm9kcmlndWV6IENh bHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJXSBTaGll bGQgaW1wbGVtZW50YXRpb24gZnJvbSBtYW5nbGluZyB0aGVuIGFuZCBjYXRjaCBwcm9taXNlIG1l dGhvZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbUludGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFk YWJsZVN0cmVhbUludGVybmFscy5qcwppbmRleCA1NWQxN2ZlOWM0MDRlYjI2MDY4NjkyODBjYzA3 NjY0YmM2NTcxOWVlLi43Nzc4M2E2NjQ5ZmZmODk1ZTc3OTQ2MzRiOWE5ZTNiOTA1N2RjNmI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1J bnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxl U3RyZWFtSW50ZXJuYWxzLmpzCkBAIC03Niw4ICs3Niw4IEBAIGZ1bmN0aW9uIHRlZVJlYWRhYmxl U3RyZWFtKHN0cmVhbSwgc2hvdWxkQ2xvbmUpCiB7CiAgICAgInVzZSBzdHJpY3QiOwogCi0gICAg Ly8gVE9ETzogQXNzZXJ0OiBJc1JlYWRhYmxlU3RyZWFtKHN0cmVhbSkgaXMgdHJ1ZS4KLSAgICAv LyBUT0RPOiBBc3NlcnQ6IFR5cGUoc2hvdWxkQ2xvbmUpIGlzIEJvb2xlYW4uCisgICAgQGFzc2Vy dChAaXNSZWFkYWJsZVN0cmVhbShzdHJlYW0pKTsKKyAgICBAYXNzZXJ0KHR5cGVvZihzaG91bGRD bG9uZSkgPT09ICJib29sZWFuIik7CiAKICAgICBsZXQgcmVhZGVyID0gc3RyZWFtLmdldFJlYWRl cigpOwogCkBAIC0xMzMsMTEgKzEzMywxMSBAQCBmdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbVB1 bGxGdW5jdGlvbih0ZWVTdGF0ZSwgcmVhZGVyLCBzaG91bGRDbG9uZSkKICAgICAgICAgICAgIGlm ICh0ZWVTdGF0ZS5jbG9zZWRPckVycm9yZWQpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgaWYgKCF0ZWVTdGF0ZS5jYW5jZWxlZDEpIHsKLSAgICAgICAgICAgICAgICAvLyBU T0RPOiBJbXBsZW1lbnQgY2xvbmluZyBpZiBzaG91bGRDbG9uZSBpcyB0cnVlCisgICAgICAgICAg ICAgICAgLy8gRklYTUU6IEltcGxlbWVudCBjbG9uaW5nIGlmIHNob3VsZENsb25lIGlzIHRydWUK ICAgICAgICAgICAgICAgICBAZW5xdWV1ZUluUmVhZGFibGVTdHJlYW0odGVlU3RhdGUuYnJhbmNo MSwgcmVzdWx0LnZhbHVlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICghdGVlU3Rh dGUuY2FuY2VsZWQyKSB7Ci0gICAgICAgICAgICAgICAgLy8gVE9ETzogSW1wbGVtZW50IGNsb25p bmcgaWYgc2hvdWxkQ2xvbmUgaXMgdHJ1ZQorICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJbXBs ZW1lbnQgY2xvbmluZyBpZiBzaG91bGRDbG9uZSBpcyB0cnVlCiAgICAgICAgICAgICAgICAgQGVu cXVldWVJblJlYWRhYmxlU3RyZWFtKHRlZVN0YXRlLmJyYW5jaDIsIHJlc3VsdC52YWx1ZSk7CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0pOwpAQCAtMTk1LDcgKzE5NSw3IEBAIGZ1bmN0aW9uIGVy cm9yUmVhZGFibGVTdHJlYW0oc3RyZWFtLCBlcnJvcikKIHsKICAgICAidXNlIHN0cmljdCI7CiAK LSAgICAvLyBGSVhNRTogQVNTRVJUKHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSk7 CisgICAgQGFzc2VydChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpOwogICAgIHN0 cmVhbS5AcXVldWUgPSBAbmV3UXVldWUoKTsKICAgICBzdHJlYW0uQHN0b3JlZEVycm9yID0gZXJy b3I7CiAgICAgc3RyZWFtLkBzdGF0ZSA9IEBzdHJlYW1FcnJvcmVkOwpAQCAtMjQ0LDcgKzI0NCw4 IEBAIGZ1bmN0aW9uIHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoc3RyZWFtKQogICAgICAgICAg ICAgQHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoc3RyZWFtKTsKICAgICAgICAgfQogICAgIH0s IGZ1bmN0aW9uKGVycm9yKSB7Ci0gICAgICAgIEBlcnJvclJlYWRhYmxlU3RyZWFtKHN0cmVhbSwg ZXJyb3IpOworICAgICAgICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKQor ICAgICAgICAgICAgQGVycm9yUmVhZGFibGVTdHJlYW0oc3RyZWFtLCBlcnJvcik7CiAgICAgfSk7 CiB9CiAKQEAgLTI4Nyw3ICsyODgsNyBAQCBmdW5jdGlvbiBmaW5pc2hDbG9zaW5nUmVhZGFibGVT dHJlYW0oc3RyZWFtKQogewogICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIC8vIEZJWE1FOiBBU1NF UlQoc3RyZWFtLkBzdGF0ZSA9PT0gIEBzdHJlYW1SZWFkYWJsZSk7CisgICAgQGFzc2VydChzdHJl YW0uQHN0YXRlID09PSAgQHN0cmVhbVJlYWRhYmxlKTsKICAgICBzdHJlYW0uQHN0YXRlID0gQHN0 cmVhbUNsb3NlZDsKICAgICB2YXIgcmVhZGVyID0gc3RyZWFtLkByZWFkZXI7CiAgICAgaWYgKHJl YWRlcikKQEAgLTI5OCw4ICsyOTksOCBAQCBmdW5jdGlvbiBjbG9zZVJlYWRhYmxlU3RyZWFtKHN0 cmVhbSkKIHsKICAgICAidXNlIHN0cmljdCI7CiAKLSAgICAvLyBGSVhNRTogQVNTRVJUKCFzdHJl YW0uQGNsb3NlUmVxdWVzdGVkKTsKLSAgICAvLyBGSVhNRTogQVNTRVJUKHN0cmVhbS5Ac3RhdGUg IT09IEBzdHJlYW1FcnJvcmVkKTsKKyAgICBAYXNzZXJ0KCFzdHJlYW0uQGNsb3NlUmVxdWVzdGVk KTsKKyAgICBAYXNzZXJ0KHN0cmVhbS5Ac3RhdGUgIT09IEBzdHJlYW1FcnJvcmVkKTsKICAgICBp ZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NlZCkKICAgICAgICAgcmV0dXJuOyAKICAg ICBzdHJlYW0uQGNsb3NlUmVxdWVzdGVkID0gdHJ1ZTsKQEAgLTMyNCw4ICszMjUsOCBAQCBmdW5j dGlvbiBlbnF1ZXVlSW5SZWFkYWJsZVN0cmVhbShzdHJlYW0sIGNodW5rKQogewogICAgICJ1c2Ug c3RyaWN0IjsKIAotICAgIC8vIEZJWE1FOiBBU1NFUlQoIXN0cmVhbS5AY2xvc2VSZXF1ZXN0ZWQp OwotICAgIC8vIEZJWE1FOiBBU1NFUlQoc3RyZWFtLkBzdGF0ZSAhPT0gQHN0cmVhbUVycm9yZWQp OworICAgIEBhc3NlcnQoIXN0cmVhbS5AY2xvc2VSZXF1ZXN0ZWQpOworICAgIEBhc3NlcnQoc3Ry ZWFtLkBzdGF0ZSAhPT0gQHN0cmVhbUVycm9yZWQpOwogICAgIGlmIChzdHJlYW0uQHN0YXRlID09 PSBAc3RyZWFtQ2xvc2VkKQogICAgICAgICByZXR1cm4gdW5kZWZpbmVkOwogICAgIGlmIChAaXNS ZWFkYWJsZVN0cmVhbUxvY2tlZChzdHJlYW0pICYmIHN0cmVhbS5AcmVhZGVyLkByZWFkUmVxdWVz dHMubGVuZ3RoKSB7CkBAIC0zNTcsOCArMzU4LDggQEAgZnVuY3Rpb24gcmVhZEZyb21SZWFkYWJs ZVN0cmVhbVJlYWRlcihyZWFkZXIpCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZSh7 dmFsdWU6IHVuZGVmaW5lZCwgZG9uZTogdHJ1ZX0pOwogICAgIGlmIChyZWFkZXIuQHN0YXRlID09 PSBAc3RyZWFtRXJyb3JlZCkKICAgICAgICAgcmV0dXJuIEBQcm9taXNlLkByZWplY3QocmVhZGVy LkBzdG9yZWRFcnJvcik7Ci0gICAgLy8gRklYTUU6IEFTU0VSVCghIXJlYWRlci5Ab3duZXJSZWFk YWJsZVN0cmVhbSk7Ci0gICAgLy8gRklYTUU6IEFTU0VSVChyZWFkZXIuQG93bmVyUmVhZGFibGVT dHJlYW0uQHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpOworICAgIEBhc3NlcnQoISFyZWFkZXIu QG93bmVyUmVhZGFibGVTdHJlYW0pOworICAgIEBhc3NlcnQocmVhZGVyLkBvd25lclJlYWRhYmxl U3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKTsKICAgICB2YXIgc3RyZWFtID0gcmVh ZGVyLkBvd25lclJlYWRhYmxlU3RyZWFtOwogICAgIGlmIChzdHJlYW0uQHF1ZXVlLmNvbnRlbnQu bGVuZ3RoKSB7CiAgICAgICAgIHZhciBjaHVuayA9IEBkZXF1ZXVlVmFsdWUoc3RyZWFtLkBxdWV1 ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVT dHJlYW1SZWFkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVT dHJlYW1SZWFkZXIuanMKaW5kZXggOTVkMzJhM2M1YTdlNjNlZWRlYTk1MjgxNzM3ZTk3MTIxODUw MDM2Yi4uNzFlMTBlNjQwMTlkODY4MzQwZTRiMjM0OTU1MTFhMzgwZTY4YjlmZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJlYWRl ci5qcwpAQCAtMzgsOCArMzgsOCBAQCBmdW5jdGlvbiBjYW5jZWwocmVhc29uKQogICAgIGlmICh0 aGlzLkBzdGF0ZSA9PT0gQHN0cmVhbUVycm9yZWQpCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5A cmVqZWN0KHRoaXMuQHN0b3JlZEVycm9yKTsKIAotICAgIC8vIEZJWE1FOiBBU1NFUlQoQGlzUmVh ZGFibGVTdHJlYW0odGhpcy5Ab3duZXJSZWFkYWJsZVN0cmVhbSkpOwotICAgIC8vIEZJWE1FOiBB U1NFUlQodGhpcy5Ab3duZXJSZWFkYWJsZVN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJs ZSk7CisgICAgQGFzc2VydChAaXNSZWFkYWJsZVN0cmVhbSh0aGlzLkBvd25lclJlYWRhYmxlU3Ry ZWFtKSk7CisgICAgQGFzc2VydCh0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtLkBzdGF0ZSA9PT0g QHN0cmVhbVJlYWRhYmxlKTsKICAgICByZXR1cm4gQGNhbmNlbFJlYWRhYmxlU3RyZWFtKHRoaXMu QG93bmVyUmVhZGFibGVTdHJlYW0sIHJlYXNvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9TdHJlYW1JbnRlcm5hbHMuanMgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3N0cmVhbXMvU3RyZWFtSW50ZXJuYWxzLmpzCmluZGV4IDYzMDQwOGZhM2MyNjI0 NzFhYTk4YTMxYWM1MTc2MWQ2Y2M3MDAyMmYuLmNiYzFiMjE0NDZjNTUzNTc1ZmE5YzUwYTZiMDhj MGE3NmNjNjM4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9T dHJlYW1JbnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1N0 cmVhbUludGVybmFscy5qcwpAQCAtMTE3LDggKzExNyw3IEBAIGZ1bmN0aW9uIGVucXVldWVWYWx1 ZVdpdGhTaXplKHF1ZXVlLCB2YWx1ZSwgc2l6ZSkKIAogZnVuY3Rpb24gcGVla1F1ZXVlVmFsdWUo cXVldWUpCiB7Ci0gICAgLy8gRklYTUUKLSAgICAvLyBhc3NlcnQocXVldWUuY29udGVudC5sZW5n dGggPiAwKTsKKyAgICBAYXNzZXJ0KHF1ZXVlLmNvbnRlbnQubGVuZ3RoID4gMCk7CiAKICAgICBy ZXR1cm4gcXVldWUuY29udGVudFswXS52YWx1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbS5qcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbS5qcwppbmRleCBlNWU0MDBmODM4ZmVlMzRmYTJk ZGZjZmFkYmI3M2JiNWQ0NTZkYzQ3Li5lYWM5NTZjMWUxNjE2Mzc5NzVhZmI5YTE2ODU3MDliZWE1 ZDFkMDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFi bGVTdHJlYW0uanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxl U3RyZWFtLmpzCkBAIC0xMjEsOCArMTIxLDcgQEAgZnVuY3Rpb24gd3JpdGUoY2h1bmspCiAgICAg aWYgKHRoaXMuQHN0YXRlID09PSBAc3RyZWFtRXJyb3JlZCkKICAgICAgICAgcmV0dXJuIEBQcm9t aXNlLkByZWplY3QodGhpcy5Ac3RvcmVkRXJyb3IpOwogCi0gICAgLy8gRklYTUUKLSAgICAvLyBh c3NlcnQodGhpcy5Ac3RhdGUgPT09IEBzdHJlYW1Xcml0YWJsZSB8fCB0aGlzLkBzdGF0ZSA9PT0g QHN0cmVhbVdhaXRpbmcpOworICAgIEBhc3NlcnQodGhpcy5Ac3RhdGUgPT09IEBzdHJlYW1Xcml0 YWJsZSB8fCB0aGlzLkBzdGF0ZSA9PT0gQHN0cmVhbVdhaXRpbmcpOwogCiAgICAgbGV0IGNodW5r U2l6ZSA9IDE7CiAgICAgaWYgKHRoaXMuQHN0cmF0ZWd5LnNpemUgIT09IHVuZGVmaW5lZCkgewpA QCAtMTg4LDggKzE4Nyw1IEBAIGZ1bmN0aW9uIHN0YXRlKCkKICAgICAgICAgcmV0dXJuICJ3cml0 YWJsZSI7CiAgICAgfQogCi0gICAgLy8gRklYTUUKLSAgICAvLyBhc3NlcnRfbm90X3JlYWNoZWQo KTsKLQotICAgIHJldHVybiB1bmRlZmluZWQ7CisgICAgQGFzc2VydChmYWxzZSk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW1JbnRl cm5hbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW1J bnRlcm5hbHMuanMKaW5kZXggOTg1OGRlNjQzMTUyYTgzYThlYmVjNTIxZGVmMTdmZWM2Y2Q5MDM1 Zi4uOWNkMzRhNWM3OWM4MTI1NGFkZTFmNmNmNGJlYjg0ZmE5MzFiYmJiMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtSW50ZXJuYWxzLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVy bmFscy5qcwpAQCAtNDEsOCArNDEsNyBAQCBmdW5jdGlvbiBzeW5jV3JpdGFibGVTdHJlYW1TdGF0 ZVdpdGhRdWV1ZShzdHJlYW0pCiAgICAgaWYgKHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1DbG9z aW5nKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRQotICAgIC8vIGFzc2VydChzdHJl YW0uQHN0YXRlID09PSBAc3RyZWFtV3JpdGFibGUgfHwgc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVh bVdhaXRpbmcpOworICAgIEBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVdyaXRhYmxl IHx8IHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1XYWl0aW5nKTsKIAogICAgIGNvbnN0IHNob3Vs ZEFwcGx5QmFja3ByZXNzdXJlID0gc3RyZWFtLkBxdWV1ZS5zaXplID4gc3RyZWFtLkBzdHJhdGVn eS5oaWdoV2F0ZXJNYXJrOwogICAgIGlmIChzaG91bGRBcHBseUJhY2twcmVzc3VyZSAmJiBzdHJl YW0uQHN0YXRlID09PSBAc3RyZWFtV3JpdGFibGUpIHsKQEAgLTkxLDExICs5MCw5IEBAIGZ1bmN0 aW9uIHdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVlKHN0cmVhbSkKIAogICAgIGNvbnN0IHdyaXRl UmVjb3JkID0gQHBlZWtRdWV1ZVZhbHVlKHN0cmVhbS5AcXVldWUpOwogICAgIGlmICh3cml0ZVJl Y29yZCA9PT0gImNsb3NlIikgewotICAgICAgICAvLyBGSVhNRQotICAgICAgICAvLyBhc3NlcnQo c3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOworICAgICAgICBAYXNzZXJ0KHN0cmVh bS5Ac3RhdGUgPT09IEBzdHJlYW1DbG9zaW5nKTsKICAgICAgICAgQGRlcXVldWVWYWx1ZShzdHJl YW0uQHF1ZXVlKTsKLSAgICAgICAgLy8gRklYTUUKLSAgICAgICAgLy8gYXNzZXJ0KHN0cmVhbS5A cXVldWUuY29udGVudC5sZW5ndGggPT09IDApOworICAgICAgICBAYXNzZXJ0KHN0cmVhbS5AcXVl dWUuY29udGVudC5sZW5ndGggPT09IDApOwogICAgICAgICBAY2xvc2VXcml0YWJsZVN0cmVhbShz dHJlYW0pOwogICAgICAgICByZXR1cm4gdW5kZWZpbmVkOwogICAgIH0KQEAgLTEyMSwxNCArMTE4 LDEyIEBAIGZ1bmN0aW9uIHdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVlKHN0cmVhbSkKIAogZnVu Y3Rpb24gY2xvc2VXcml0YWJsZVN0cmVhbShzdHJlYW0pCiB7Ci0gICAgLy8gRklYTUUKLSAgICAv LyBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOworICAgIEBhc3NlcnQo c3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOwogICAgIEBwcm9taXNlSW52b2tlT3JO b29wKHN0cmVhbS5AdW5kZXJseWluZ1NpbmssICJjbG9zZSIpLkB0aGVuKAogICAgICAgICBmdW5j dGlvbigpIHsKICAgICAgICAgICAgIGlmIChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtRXJyb3Jl ZCkKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAvLyBGSVhNRQotICAgICAg ICAgICAgLy8gYXNzZXJ0KHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1DbG9zaW5nKTsKKyAgICAg ICAgICAgIEBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOwogICAgICAg ICAgICAgc3RyZWFtLkBjbG9zZWRQcm9taXNlQ2FwYWJpbGl0eS5AcmVzb2x2ZS5AY2FsbCh1bmRl ZmluZWQsIHVuZGVmaW5lZCk7CiAgICAgICAgICAgICBzdHJlYW0uQHN0YXRlID0gQHN0cmVhbUNs b3NlZDsKICAgICAgICAgfSwK