193774 2019-01-24 11:29:01 -0800 [JSC] SharedArrayBufferConstructor and ArrayBufferConstructor should not have their own IsoSubspace 2019-01-24 16:52:33 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 193606 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1497897 0 ysuzuki 2019-01-24 11:29:01 -0800 Too costly. Use InternalFunction's one instead. We need to make sizeof(SharedArrayBufferConstructor) == sizeof(InternalFunction). 1498022 1 360046 ysuzuki 2019-01-24 16:24:25 -0800 Created attachment 360046 Patch 1498035 2 360046 mark.lam 2019-01-24 16:45:30 -0800 Comment on attachment 360046 Patch r=me 1498039 3 ysuzuki 2019-01-24 16:50:09 -0800 Committed r240456: <https://trac.webkit.org/changeset/240456> 1498041 4 webkit-bug-importer 2019-01-24 16:52:33 -0800 <rdar://problem/47534303> 360046 2019-01-24 16:24:25 -0800 2019-01-24 16:45:30 -0800 Patch bug-193774-20190124162424.patch text/plain 16674 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 YWUyNzZjMGY4NGZhNzk2NDU3MjUxYWViMjdlZDg4OTJjYzBlZmY4Li5kYWY1YWE3NDk1ZjFhYjIy MzFiMDdlMTU3OTZlMzkzOWNhODQxNDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAxOS0wMS0yNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFNoYXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IgYW5kIEFycmF5 QnVmZmVyQ29uc3RydWN0b3Igc2hvdWxkIG5vdCBoYXZlIHRoZWlyIG93biBJc29TdWJzcGFjZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNzc0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgcHV0IGFs bCB0aGUgaW5zdGFuY2VzIG9mIEludGVybmFsRnVuY3Rpb24gYW5kIGl0cyBzdWJjbGFzc2VzIGlu IElzb1N1YnNwYWNlIHRvIG1ha2Ugc2FmZXIgZnJvbSBVQUYuCisgICAgICAgIEJ1dCBzaW5jZSBJ c29TdWJzcGFjZSByZXF1aXJlcyB0aGUgbWVtb3J5IGxheW91dCBvZiBpbnN0YW5jZXMgaXMgdGhl IHNhbWUsIHdlIGNyZWF0ZWQgZGlmZmVyZW50IElzb1N1YnNwYWNlCisgICAgICAgIGZvciBzdWJj bGFzc2VzIG9mIEludGVybmFsRnVuY3Rpb24gaWYgc2l6ZW9mKHN1YmNsYXNzKSAhPSBzaXplb2Yo SW50ZXJuYWxGdW5jdGlvbikuIE9uZSBleGFtcGxlIGlzCisgICAgICAgIEFycmF5QnVmZmVyQ29u c3RydWN0b3IgYW5kIFNoYXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IuIEJ1dCBpdCBpcyB0b28g Y29zdGx5IHRvIGFsbG9jYXRlIDE2S0IgcGFnZSBqdXN0CisgICAgICAgIGZvciB0aGVzZSB0d28g Y29uc3RydWN0b3IgaW5zdGFuY2VzLiBUaGV5IGFyZSBvbmx5IHR3byBpbnN0YW5jZXMgcGVyIEpT R2xvYmFsT2JqZWN0LgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgc2l6ZW9mKEFycmF5QnVm ZmVyQ29uc3RydWN0b3IpID09IHNpemVvZihJbnRlcm5hbEZ1bmN0aW9uKSBzbyB0aGF0IHRoZXkg Y2FuIHVzZSBJc29TdWJzcGFjZQorICAgICAgICBvZiBJbnRlcm5hbEZ1bmN0aW9uLiBXZSBpbnRy b2R1Y2UgSlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3RvciwgYW5kIGl0IHRha2VzIEFycmF5 QnVmZmVyU2hhcmluZ01vZGUgYXMKKyAgICAgICAgaXRzIHRlbXBsYXRlIHBhcmFtZXRlci4gV2Ug ZGVmaW5lIEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3RvciBhcyBKU0dlbmVyaWNBcnJheUJ1ZmZlckNv bnN0cnVjdG9yPEFycmF5QnVmZmVyU2hhcmluZ01vZGU6OkRlZmF1bHQ+CisgICAgICAgIGFuZCBK U1NoYXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IgYXMgSlNHZW5lcmljQXJyYXlCdWZmZXJDb25z dHJ1Y3RvcjxBcnJheUJ1ZmZlclNoYXJpbmdNb2RlOjpTaGFyZWQ+IHNvIHRoYXQKKyAgICAgICAg d2UgZG8gbm90IG5lZWQgdG8gaG9sZCBBcnJheUJ1ZmZlclNoYXJpbmdNb2RlIGluIHRoZSBmaWVs ZCBvZiB0aGUgY29uc3RydWN0b3IuIFRoaXMgY2hhbmdlIHJlbW92ZXMgSXNvU3Vic3BhY2UKKyAg ICAgICAgZm9yIEFycmF5QnVmZmVyQ29uc3RydWN0b3JzLCBhbmQgcmVkdWNlcyB0aGUgbWVtb3J5 IHVzYWdlLgorCisgICAgICAgICogcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3Bw OgorICAgICAgICAoSlNDOjpKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yPHNoYXJpbmdN b2RlPjo6SlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcik6CisgICAgICAgIChKU0M6OkpT R2VuZXJpY0FycmF5QnVmZmVyQ29uc3RydWN0b3I8c2hhcmluZ01vZGU+OjpmaW5pc2hDcmVhdGlv bik6CisgICAgICAgIChKU0M6OkpTR2VuZXJpY0FycmF5QnVmZmVyQ29uc3RydWN0b3I8c2hhcmlu Z01vZGU+Ojpjb25zdHJ1Y3RBcnJheUJ1ZmZlcik6CisgICAgICAgIChKU0M6OkpTR2VuZXJpY0Fy cmF5QnVmZmVyQ29uc3RydWN0b3I8c2hhcmluZ01vZGU+OjpjcmVhdGVTdHJ1Y3R1cmUpOgorICAg ICAgICAoSlNDOjpKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yPHNoYXJpbmdNb2RlPjo6 aW5mbyk6CisgICAgICAgIChKU0M6OkpTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcjo6SlNBcnJheUJ1 ZmZlckNvbnN0cnVjdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6SlNBcnJheUJ1ZmZlckNv bnN0cnVjdG9yOjpmaW5pc2hDcmVhdGlvbik6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkpTQXJy YXlCdWZmZXJDb25zdHJ1Y3Rvcjo6Y3JlYXRlKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6SlNB cnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpjcmVhdGVTdHJ1Y3R1cmUpOiBEZWxldGVkLgorICAgICAg ICAoSlNDOjpjb25zdHJ1Y3RBcnJheUJ1ZmZlcik6IERlbGV0ZWQuCisgICAgICAgICogcnVudGlt ZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuaDoKKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFs T2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxPYmplY3Q6OmluaXQpOgorICAgICAg ICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAgKiBydW50aW1lL1ZNLmNwcDoK KyAgICAgICAgKEpTQzo6Vk06OlZNKToKKyAgICAgICAgKiBydW50aW1lL1ZNLmg6CisKIDIwMTkt MDEtMjQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBzdHJl c3MvY29uc3Qtc2VtYW50aWNzLmpzIGZhaWxzIGEgZGZnLWVhZ2VyIC8gZnRsLWVhZ2VyIHJ1biB3 aXRoIGFuIEFTQU4gcmVsZWFzZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuY3BwCmluZGV4IDlkNzQy MmY4NGI5NjNiMjk4MjI0NTI4NjhjNmYyZGQ1MDI4YjM4MGIuLmU2ZThlMGQwMTI1NzZiZjUwYzM1 OTBkZjBiZTJlMjJlNzM3ZTBmOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yLmNwcApAQCAtMzgsNjAgKzM4 LDUwIEBACiBuYW1lc3BhY2UgSlNDIHsKIAogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgYXJyYXlCdWZmZXJGdW5jSXNWaWV3KEV4ZWNTdGF0ZSopOworc3RhdGljIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwgY2FsbEFycmF5QnVmZmVyKEV4ZWNTdGF0ZSopOwogCit0ZW1w bGF0ZTw+CiBjb25zdCBDbGFzc0luZm8gSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpzX2luZm8g PSB7CiAgICAgIkZ1bmN0aW9uIiwgJkJhc2U6OnNfaW5mbywgbnVsbHB0ciwgbnVsbHB0ciwKICAg ICBDUkVBVEVfTUVUSE9EX1RBQkxFKEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcikKIH07CiAKLXN0 YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNhbGxBcnJheUJ1ZmZlcihFeGVjU3Rh dGUqKTsKLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnN0cnVjdEFycmF5 QnVmZmVyKEV4ZWNTdGF0ZSopOwordGVtcGxhdGU8PgorY29uc3QgQ2xhc3NJbmZvIEpTU2hhcmVk QXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcjo6c19pbmZvID0geworICAgICJGdW5jdGlvbiIsICZCYXNl OjpzX2luZm8sIG51bGxwdHIsIG51bGxwdHIsCisgICAgQ1JFQVRFX01FVEhPRF9UQUJMRShKU1No YXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IpCit9OwogCi1KU0FycmF5QnVmZmVyQ29uc3RydWN0 b3I6OkpTQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcihWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJl LCBBcnJheUJ1ZmZlclNoYXJpbmdNb2RlIHNoYXJpbmdNb2RlKQotICAgIDogQmFzZSh2bSwgc3Ry dWN0dXJlLCBjYWxsQXJyYXlCdWZmZXIsIGNvbnN0cnVjdEFycmF5QnVmZmVyKQotICAgICwgbV9z aGFyaW5nTW9kZShzaGFyaW5nTW9kZSkKK3RlbXBsYXRlPEFycmF5QnVmZmVyU2hhcmluZ01vZGUg c2hhcmluZ01vZGU+CitKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yPHNoYXJpbmdNb2Rl Pjo6SlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcihWTSYgdm0sIFN0cnVjdHVyZSogc3Ry dWN0dXJlKQorICAgIDogQmFzZSh2bSwgc3RydWN0dXJlLCBjYWxsQXJyYXlCdWZmZXIsIEpTR2Vu ZXJpY0FycmF5QnVmZmVyQ29uc3RydWN0b3I8c2hhcmluZ01vZGU+Ojpjb25zdHJ1Y3RBcnJheUJ1 ZmZlcikKIHsKIH0KIAotdm9pZCBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3I6OmZpbmlzaENyZWF0 aW9uKFZNJiB2bSwgSlNBcnJheUJ1ZmZlclByb3RvdHlwZSogcHJvdG90eXBlLCBHZXR0ZXJTZXR0 ZXIqIHNwZWNpZXNTeW1ib2wpCit0ZW1wbGF0ZTxBcnJheUJ1ZmZlclNoYXJpbmdNb2RlIHNoYXJp bmdNb2RlPgordm9pZCBKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yPHNoYXJpbmdNb2Rl Pjo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBKU0FycmF5QnVmZmVyUHJvdG90eXBlKiBwcm90b3R5 cGUsIEdldHRlclNldHRlciogc3BlY2llc1N5bWJvbCkKIHsKLSAgICBCYXNlOjpmaW5pc2hDcmVh dGlvbih2bSwgYXJyYXlCdWZmZXJTaGFyaW5nTW9kZU5hbWUobV9zaGFyaW5nTW9kZSkpOworICAg IEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtLCBhcnJheUJ1ZmZlclNoYXJpbmdNb2RlTmFtZShzaGFy aW5nTW9kZSkpOwogICAgIHB1dERpcmVjdFdpdGhvdXRUcmFuc2l0aW9uKHZtLCB2bS5wcm9wZXJ0 eU5hbWVzLT5wcm90b3R5cGUsIHByb3RvdHlwZSwgUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVt IHwgUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnREZWxldGUgfCBQcm9wZXJ0eUF0dHJpYnV0ZTo6UmVh ZE9ubHkpOwogICAgIHB1dERpcmVjdFdpdGhvdXRUcmFuc2l0aW9uKHZtLCB2bS5wcm9wZXJ0eU5h bWVzLT5sZW5ndGgsIGpzTnVtYmVyKDEpLCBQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0gfCBQ cm9wZXJ0eUF0dHJpYnV0ZTo6UmVhZE9ubHkpOwogICAgIHB1dERpcmVjdE5vbkluZGV4QWNjZXNz b3Iodm0sIHZtLnByb3BlcnR5TmFtZXMtPnNwZWNpZXNTeW1ib2wsIHNwZWNpZXNTeW1ib2wsIFBy b3BlcnR5QXR0cmlidXRlOjpBY2Nlc3NvciB8IFByb3BlcnR5QXR0cmlidXRlOjpSZWFkT25seSB8 IFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSk7CiAKLSAgICBpZiAobV9zaGFyaW5nTW9kZSA9 PSBBcnJheUJ1ZmZlclNoYXJpbmdNb2RlOjpEZWZhdWx0KSB7CisgICAgaWYgKHNoYXJpbmdNb2Rl ID09IEFycmF5QnVmZmVyU2hhcmluZ01vZGU6OkRlZmF1bHQpIHsKICAgICAgICAgSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCA9IHRoaXMtPmdsb2JhbE9iamVjdCh2bSk7CiAgICAgICAgIEpT Q19OQVRJVkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lUSU9OKHZtLnByb3BlcnR5TmFtZXMtPmlz VmlldywgYXJyYXlCdWZmZXJGdW5jSXNWaWV3LCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVy dHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSwgMSk7CiAgICAgICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05f V0lUSE9VVF9UUkFOU0lUSU9OKHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmlzVmll d1ByaXZhdGVOYW1lKCksIGFycmF5QnVmZmVyRnVuY0lzVmlldywgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSksIDEpOwogICAgIH0KIH0KIAotSlNBcnJh eUJ1ZmZlckNvbnN0cnVjdG9yKiBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3I6OmNyZWF0ZShWTSYg dm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCBKU0FycmF5QnVmZmVyUHJvdG90eXBlKiBwcm90b3R5 cGUsIEdldHRlclNldHRlciogc3BlY2llc1N5bWJvbCwgQXJyYXlCdWZmZXJTaGFyaW5nTW9kZSBz aGFyaW5nTW9kZSkKLXsKLSAgICBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3IqIHJlc3VsdCA9Ci0g ICAgICAgIG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rv cj4odm0uaGVhcCkpCi0gICAgICAgIEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcih2bSwgc3RydWN0 dXJlLCBzaGFyaW5nTW9kZSk7Ci0gICAgcmVzdWx0LT5maW5pc2hDcmVhdGlvbih2bSwgcHJvdG90 eXBlLCBzcGVjaWVzU3ltYm9sKTsKLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1TdHJ1Y3R1cmUq IEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcjo6Y3JlYXRlU3RydWN0dXJlKAotICAgIFZNJiB2bSwg SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNWYWx1ZSBwcm90b3R5cGUpCi17Ci0gICAg cmV0dXJuIFN0cnVjdHVyZTo6Y3JlYXRlKAotICAgICAgICB2bSwgZ2xvYmFsT2JqZWN0LCBwcm90 b3R5cGUsIFR5cGVJbmZvKEludGVybmFsRnVuY3Rpb25UeXBlLCBTdHJ1Y3R1cmVGbGFncyksIGlu Zm8oKSk7Ci19Ci0KLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnN0cnVj dEFycmF5QnVmZmVyKEV4ZWNTdGF0ZSogZXhlYykKK3RlbXBsYXRlPEFycmF5QnVmZmVyU2hhcmlu Z01vZGUgc2hhcmluZ01vZGU+CitFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEpTR2VuZXJp Y0FycmF5QnVmZmVyQ29uc3RydWN0b3I8c2hhcmluZ01vZGU+Ojpjb25zdHJ1Y3RBcnJheUJ1ZmZl cihFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICBhdXRv IHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKLSAgICBKU0FycmF5QnVmZmVyQ29u c3RydWN0b3IqIGNvbnN0cnVjdG9yID0KLSAgICAgICAganNDYXN0PEpTQXJyYXlCdWZmZXJDb25z dHJ1Y3Rvcio+KGV4ZWMtPmpzQ2FsbGVlKCkpOworICAgIEpTR2VuZXJpY0FycmF5QnVmZmVyQ29u c3RydWN0b3IqIGNvbnN0cnVjdG9yID0ganNDYXN0PEpTR2VuZXJpY0FycmF5QnVmZmVyQ29uc3Ry dWN0b3IqPihleGVjLT5qc0NhbGxlZSgpKTsKIAotICAgIFN0cnVjdHVyZSogYXJyYXlCdWZmZXJT dHJ1Y3R1cmUgPSBJbnRlcm5hbEZ1bmN0aW9uOjpjcmVhdGVTdWJjbGFzc1N0cnVjdHVyZShleGVj LCBleGVjLT5uZXdUYXJnZXQoKSwgY29uc3RydWN0b3ItPmdsb2JhbE9iamVjdCh2bSktPmFycmF5 QnVmZmVyU3RydWN0dXJlKGNvbnN0cnVjdG9yLT5zaGFyaW5nTW9kZSgpKSk7CisgICAgU3RydWN0 dXJlKiBhcnJheUJ1ZmZlclN0cnVjdHVyZSA9IEludGVybmFsRnVuY3Rpb246OmNyZWF0ZVN1YmNs YXNzU3RydWN0dXJlKGV4ZWMsIGV4ZWMtPm5ld1RhcmdldCgpLCBjb25zdHJ1Y3Rvci0+Z2xvYmFs T2JqZWN0KHZtKS0+YXJyYXlCdWZmZXJTdHJ1Y3R1cmUoc2hhcmluZ01vZGUpKTsKICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogCiAgICAgdW5zaWduZWQgbGVuZ3RoOwpAQCAt MTA5LDE0ICs5OSwyNiBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjb25z dHJ1Y3RBcnJheUJ1ZmZlcihFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCFidWZmZXIpCiAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUodGhyb3dPdXRPZk1lbW9yeUVycm9yKGV4ZWMsIHNj b3BlKSk7CiAgICAgCi0gICAgaWYgKGNvbnN0cnVjdG9yLT5zaGFyaW5nTW9kZSgpID09IEFycmF5 QnVmZmVyU2hhcmluZ01vZGU6OlNoYXJlZCkKKyAgICBpZiAoc2hhcmluZ01vZGUgPT0gQXJyYXlC dWZmZXJTaGFyaW5nTW9kZTo6U2hhcmVkKQogICAgICAgICBidWZmZXItPm1ha2VTaGFyZWQoKTsK LSAgICBBU1NFUlQoY29uc3RydWN0b3ItPnNoYXJpbmdNb2RlKCkgPT0gYnVmZmVyLT5zaGFyaW5n TW9kZSgpKTsKKyAgICBBU1NFUlQoc2hhcmluZ01vZGUgPT0gYnVmZmVyLT5zaGFyaW5nTW9kZSgp KTsKIAogICAgIEpTQXJyYXlCdWZmZXIqIHJlc3VsdCA9IEpTQXJyYXlCdWZmZXI6OmNyZWF0ZSh2 bSwgYXJyYXlCdWZmZXJTdHJ1Y3R1cmUsIFdURk1vdmUoYnVmZmVyKSk7CiAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShyZXN1bHQpOwogfQogCit0ZW1wbGF0ZTxBcnJheUJ1ZmZlclNoYXJpbmdN b2RlIHNoYXJpbmdNb2RlPgorU3RydWN0dXJlKiBKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVj dG9yPHNoYXJpbmdNb2RlPjo6Y3JlYXRlU3RydWN0dXJlKFZNJiB2bSwgSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgSlNWYWx1ZSBwcm90b3R5cGUpCit7CisgICAgcmV0dXJuIFN0cnVjdHVy ZTo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8oSW50ZXJuYWxG dW5jdGlvblR5cGUsIFN0cnVjdHVyZUZsYWdzKSwgaW5mbygpKTsKK30KKwordGVtcGxhdGU8QXJy YXlCdWZmZXJTaGFyaW5nTW9kZSBzaGFyaW5nTW9kZT4KK2NvbnN0IENsYXNzSW5mbyogSlNHZW5l cmljQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcjxzaGFyaW5nTW9kZT46OmluZm8oKQoreworICAgIHJl dHVybiAmSlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcjxzaGFyaW5nTW9kZT46OnNfaW5m bzsKK30KKwogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY2FsbEFycmF5QnVm ZmVyKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBWTSYgdm0gPSBleGVjLT52bSgpOwpAQCAtMTMx LDcgKzEzMywxMCBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGFycmF5QnVmZmVyRnVu Y0lzVmlldyhFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShq c0Jvb2xlYW4oanNEeW5hbWljQ2FzdDxKU0FycmF5QnVmZmVyVmlldyo+KGV4ZWMtPnZtKCksIGV4 ZWMtPmFyZ3VtZW50KDApKSkpOwogfQotICAgIAorCisvLyBJbnN0YW50aWF0ZSBKU0dlbmVyaWNB cnJheUJ1ZmZlckNvbnN0cnVjdG9ycy4KK3RlbXBsYXRlIGNsYXNzIEpTR2VuZXJpY0FycmF5QnVm ZmVyQ29uc3RydWN0b3I8QXJyYXlCdWZmZXJTaGFyaW5nTW9kZTo6U2hhcmVkPjsKK3RlbXBsYXRl IGNsYXNzIEpTR2VuZXJpY0FycmF5QnVmZmVyQ29uc3RydWN0b3I8QXJyYXlCdWZmZXJTaGFyaW5n TW9kZTo6RGVmYXVsdD47CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5QnVmZmVyQ29uc3RydWN0b3IuaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5oCmlu ZGV4IDMxNGI0MDM4ZDA2OTlmYzJlYmQ4YzJiMTY5YTEwYzg1MDQ5NDI2N2MuLjQyZjE2M2ZlMzhh Y2M0ZjdjY2NjOTNlODdiZTE2OTYyYzljY2IzNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvci5oCkBAIC0zMywz MSArMzMsMzUgQEAgbmFtZXNwYWNlIEpTQyB7CiBjbGFzcyBKU0FycmF5QnVmZmVyUHJvdG90eXBl OwogY2xhc3MgR2V0dGVyU2V0dGVyOwogCi1jbGFzcyBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3Ig ZmluYWwgOiBwdWJsaWMgSW50ZXJuYWxGdW5jdGlvbiB7Cit0ZW1wbGF0ZTxBcnJheUJ1ZmZlclNo YXJpbmdNb2RlIHNoYXJpbmdNb2RlPgorY2xhc3MgSlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1 Y3RvciBmaW5hbCA6IHB1YmxpYyBJbnRlcm5hbEZ1bmN0aW9uIHsKIHB1YmxpYzoKLSAgICB0eXBl ZGVmIEludGVybmFsRnVuY3Rpb24gQmFzZTsKLQotICAgIHRlbXBsYXRlPHR5cGVuYW1lIENlbGxU eXBlPgotICAgIHN0YXRpYyBJc29TdWJzcGFjZSogc3Vic3BhY2VGb3IoVk0mIHZtKQotICAgIHsK LSAgICAgICAgcmV0dXJuICZ2bS5hcnJheUJ1ZmZlckNvbnN0cnVjdG9yU3BhY2U7Ci0gICAgfQor ICAgIHVzaW5nIEJhc2UgPSBJbnRlcm5hbEZ1bmN0aW9uOwogCiBwcm90ZWN0ZWQ6Ci0gICAgSlNB cnJheUJ1ZmZlckNvbnN0cnVjdG9yKFZNJiwgU3RydWN0dXJlKiwgQXJyYXlCdWZmZXJTaGFyaW5n TW9kZSk7CisgICAgSlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3RvcihWTSYsIFN0cnVjdHVy ZSopOwogICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oVk0mLCBKU0FycmF5QnVmZmVyUHJvdG90eXBl KiwgR2V0dGVyU2V0dGVyKiBzcGVjaWVzU3ltYm9sKTsKIAorICAgIHN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnN0cnVjdEFycmF5QnVmZmVyKEV4ZWNTdGF0ZSopOworCiBw dWJsaWM6Ci0gICAgc3RhdGljIEpTQXJyYXlCdWZmZXJDb25zdHJ1Y3RvciogY3JlYXRlKFZNJiwg U3RydWN0dXJlKiwgSlNBcnJheUJ1ZmZlclByb3RvdHlwZSosIEdldHRlclNldHRlciogc3BlY2ll c1N5bWJvbCwgQXJyYXlCdWZmZXJTaGFyaW5nTW9kZSk7Ci0gICAgCi0gICAgREVDTEFSRV9JTkZP OwotICAgIAorICAgIHN0YXRpYyBKU0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yKiBjcmVh dGUoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNBcnJheUJ1ZmZlclByb3RvdHlwZSog cHJvdG90eXBlLCBHZXR0ZXJTZXR0ZXIqIHNwZWNpZXNTeW1ib2wpCisgICAgeworICAgICAgICBK U0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yKiByZXN1bHQgPQorICAgICAgICAgICAgbmV3 IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8SlNHZW5lcmljQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcj4o dm0uaGVhcCkpIEpTR2VuZXJpY0FycmF5QnVmZmVyQ29uc3RydWN0b3Iodm0sIHN0cnVjdHVyZSk7 CisgICAgICAgIHJlc3VsdC0+ZmluaXNoQ3JlYXRpb24odm0sIHByb3RvdHlwZSwgc3BlY2llc1N5 bWJvbCk7CisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQorCiAgICAgc3RhdGljIFN0cnVj dHVyZSogY3JlYXRlU3RydWN0dXJlKFZNJiwgSlNHbG9iYWxPYmplY3QqLCBKU1ZhbHVlIHByb3Rv dHlwZSk7CiAgICAgCi0gICAgQXJyYXlCdWZmZXJTaGFyaW5nTW9kZSBzaGFyaW5nTW9kZSgpIGNv bnN0IHsgcmV0dXJuIG1fc2hhcmluZ01vZGU7IH0KLQotcHJpdmF0ZToKLSAgICBBcnJheUJ1ZmZl clNoYXJpbmdNb2RlIG1fc2hhcmluZ01vZGU7CisgICAgc3RhdGljIGNvbnN0IENsYXNzSW5mbyBz X2luZm87IC8vIFRoaXMgaXMgbmV2ZXIgYWNjZXNzZWQgZGlyZWN0bHksIHNpbmNlIHRoYXQgd291 bGQgYnJlYWsgbGlua2FnZSBvbiBzb21lIGNvbXBpbGVycy4KKyAgICBzdGF0aWMgY29uc3QgQ2xh c3NJbmZvKiBpbmZvKCk7CiB9OwogCit1c2luZyBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3IgPSBK U0dlbmVyaWNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yPEFycmF5QnVmZmVyU2hhcmluZ01vZGU6OkRl ZmF1bHQ+OwordXNpbmcgSlNTaGFyZWRBcnJheUJ1ZmZlckNvbnN0cnVjdG9yID0gSlNHZW5lcmlj QXJyYXlCdWZmZXJDb25zdHJ1Y3RvcjxBcnJheUJ1ZmZlclNoYXJpbmdNb2RlOjpTaGFyZWQ+Owor c3RhdGljX2Fzc2VydChzaXplb2YoSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpCYXNlKSA9PSBz aXplb2YoSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yKSwgIiIpOworc3RhdGljX2Fzc2VydChzaXpl b2YoSlNTaGFyZWRBcnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpCYXNlKSA9PSBzaXplb2YoSlNTaGFy ZWRBcnJheUJ1ZmZlckNvbnN0cnVjdG9yKSwgIiIpOworCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAppbmRl eCAxMjdjMTA1Zjk2MTE0OWFhNzhhOGUwOGQ3NzY3ZDE0NGUzNTRjZGE3Li5jY2U1NmEyMWJiYzAz NjZiMGZmODk3NDNiNTFlNWM1MjQ0NTI3MTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCkBAIC02NzYsMTIgKzY3NiwxMiBAQCB2b2lk IEpTR2xvYmFsT2JqZWN0Ojppbml0KFZNJiB2bSkKICAgICAKICAgICBtX3JlZ0V4cENvbnN0cnVj dG9yLnNldCh2bSwgdGhpcywgUmVnRXhwQ29uc3RydWN0b3I6OmNyZWF0ZSh2bSwgUmVnRXhwQ29u c3RydWN0b3I6OmNyZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywgbV9mdW5jdGlvblByb3RvdHlwZS5n ZXQoKSksIG1fcmVnRXhwUHJvdG90eXBlLmdldCgpLCBtX3NwZWNpZXNHZXR0ZXJTZXR0ZXIuZ2V0 KCkpKTsKICAgICAKLSAgICBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3IqIGFycmF5QnVmZmVyQ29u c3RydWN0b3IgPSBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3I6OmNyZWF0ZSh2bSwgSlNBcnJheUJ1 ZmZlckNvbnN0cnVjdG9yOjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1fZnVuY3Rpb25Qcm90 b3R5cGUuZ2V0KCkpLCBtX2FycmF5QnVmZmVyUHJvdG90eXBlLmdldCgpLCBtX3NwZWNpZXNHZXR0 ZXJTZXR0ZXIuZ2V0KCksIEFycmF5QnVmZmVyU2hhcmluZ01vZGU6OkRlZmF1bHQpOworICAgIEpT QXJyYXlCdWZmZXJDb25zdHJ1Y3RvciogYXJyYXlCdWZmZXJDb25zdHJ1Y3RvciA9IEpTQXJyYXlC dWZmZXJDb25zdHJ1Y3Rvcjo6Y3JlYXRlKHZtLCBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3I6OmNy ZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywgbV9mdW5jdGlvblByb3RvdHlwZS5nZXQoKSksIG1fYXJy YXlCdWZmZXJQcm90b3R5cGUuZ2V0KCksIG1fc3BlY2llc0dldHRlclNldHRlci5nZXQoKSk7CiAg ICAgbV9hcnJheUJ1ZmZlclByb3RvdHlwZS0+cHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0s IHZtLnByb3BlcnR5TmFtZXMtPmNvbnN0cnVjdG9yLCBhcnJheUJ1ZmZlckNvbnN0cnVjdG9yLCBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSk7CiAKICNp ZiBFTkFCTEUoU0hBUkVEX0FSUkFZX0JVRkZFUikKLSAgICBKU0FycmF5QnVmZmVyQ29uc3RydWN0 b3IqIHNoYXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IgPSBudWxscHRyOwotICAgIHNoYXJlZEFy cmF5QnVmZmVyQ29uc3RydWN0b3IgPSBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3I6OmNyZWF0ZSh2 bSwgSlNBcnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1f ZnVuY3Rpb25Qcm90b3R5cGUuZ2V0KCkpLCBtX3NoYXJlZEFycmF5QnVmZmVyUHJvdG90eXBlLmdl dCgpLCBtX3NwZWNpZXNHZXR0ZXJTZXR0ZXIuZ2V0KCksIEFycmF5QnVmZmVyU2hhcmluZ01vZGU6 OlNoYXJlZCk7CisgICAgSlNTaGFyZWRBcnJheUJ1ZmZlckNvbnN0cnVjdG9yKiBzaGFyZWRBcnJh eUJ1ZmZlckNvbnN0cnVjdG9yID0gbnVsbHB0cjsKKyAgICBzaGFyZWRBcnJheUJ1ZmZlckNvbnN0 cnVjdG9yID0gSlNTaGFyZWRBcnJheUJ1ZmZlckNvbnN0cnVjdG9yOjpjcmVhdGUodm0sIEpTU2hh cmVkQXJyYXlCdWZmZXJDb25zdHJ1Y3Rvcjo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBtX2Z1 bmN0aW9uUHJvdG90eXBlLmdldCgpKSwgbV9zaGFyZWRBcnJheUJ1ZmZlclByb3RvdHlwZS5nZXQo KSwgbV9zcGVjaWVzR2V0dGVyU2V0dGVyLmdldCgpKTsKICAgICBtX3NoYXJlZEFycmF5QnVmZmVy UHJvdG90eXBlLT5wdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgdm0ucHJvcGVydHlOYW1l cy0+Y29uc3RydWN0b3IsIHNoYXJlZEFycmF5QnVmZmVyQ29uc3RydWN0b3IsIHN0YXRpY19jYXN0 PHVuc2lnbmVkPihQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udEVudW0pKTsKIAogICAgIEF0b21pY3NP YmplY3QqIGF0b21pY3NPYmplY3QgPSBBdG9taWNzT2JqZWN0OjpjcmVhdGUodm0sIHRoaXMsIEF0 b21pY3NPYmplY3Q6OmNyZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywgbV9vYmplY3RQcm90b3R5cGUu Z2V0KCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xv YmFsT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVj dC5oCmluZGV4IDY2Y2UxNjg0OGIxYzBkNzEwOWRmM2M4NmFjOGU5ZmMxYjQ0MDI1YTMuLjE1ZjA2 Mzc5MjJhYjRiZmRjYmUwYzA2MTYzMjQwZDdjMzY0Yzc4Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaApAQCAtODIsNyArODIsNiBAQCBjbGFz cyBJbmRpcmVjdEV2YWxFeGVjdXRhYmxlOwogY2xhc3MgSW5wdXRDdXJzb3I7CiBjbGFzcyBJbnRs T2JqZWN0OwogY2xhc3MgSlNBcnJheUJ1ZmZlcjsKLWNsYXNzIEpTQXJyYXlCdWZmZXJDb25zdHJ1 Y3RvcjsKIGNsYXNzIEpTQXJyYXlCdWZmZXJQcm90b3R5cGU7CiBjbGFzcyBKU0NhbGxlZTsKIGNs YXNzIEpTR2xvYmFsT2JqZWN0RGVidWdnYWJsZTsKQEAgLTkzLDcgKzkyLDYgQEAgY2xhc3MgSlNQ cm9taXNlOwogY2xhc3MgSlNQcm9taXNlQ29uc3RydWN0b3I7CiBjbGFzcyBKU1Byb21pc2VQcm90 b3R5cGU7CiBjbGFzcyBKU1NoYXJlZEFycmF5QnVmZmVyOwotY2xhc3MgSlNTaGFyZWRBcnJheUJ1 ZmZlckNvbnN0cnVjdG9yOwogY2xhc3MgSlNTaGFyZWRBcnJheUJ1ZmZlclByb3RvdHlwZTsKIGNs YXNzIEpTVHlwZWRBcnJheVZpZXdDb25zdHJ1Y3RvcjsKIGNsYXNzIEpTVHlwZWRBcnJheVZpZXdQ cm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAKaW5kZXggNmI1MjA1MTU3 YzJhM2E1OWFiZDhjZTNhN2NhZDJiYzE4YjJhODE5OS4uYzA4N2NhOGQ2OTUyZmQ3OGM5NzRhNzcz MjE0YWM0Nzg3NzNlNzk2NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmNwcApAQCAt MjkyLDcgKzI5Miw2IEBAIFZNOjpWTShWTVR5cGUgdm1UeXBlLCBIZWFwVHlwZSBoZWFwVHlwZSkK ICAgICAsIGRlc3RydWN0aWJsZU9iamVjdFNwYWNlKCJKU0Rlc3RydWN0aWJsZU9iamVjdCIsIGhl YXAsIGRlc3RydWN0aWJsZU9iamVjdEhlYXBDZWxsVHlwZS5nZXQoKSwgZmFzdE1hbGxvY0FsbG9j YXRvci5nZXQoKSkKICAgICAsIGVhZ2VybHlTd2VwdERlc3RydWN0aWJsZU9iamVjdFNwYWNlKCJF YWdlcmx5IFN3ZXB0IEpTRGVzdHJ1Y3RpYmxlT2JqZWN0IiwgaGVhcCwgZGVzdHJ1Y3RpYmxlT2Jq ZWN0SGVhcENlbGxUeXBlLmdldCgpLCBmYXN0TWFsbG9jQWxsb2NhdG9yLmdldCgpKQogICAgICwg c2VnbWVudGVkVmFyaWFibGVPYmplY3RTcGFjZSgiSlNTZWdtZW50ZWRWYXJpYWJsZU9iamVjdFNw YWNlIiwgaGVhcCwgc2VnbWVudGVkVmFyaWFibGVPYmplY3RIZWFwQ2VsbFR5cGUuZ2V0KCksIGZh c3RNYWxsb2NBbGxvY2F0b3IuZ2V0KCkpCi0gICAgLCBhcnJheUJ1ZmZlckNvbnN0cnVjdG9yU3Bh Y2UgSVNPX1NVQlNQQUNFX0lOSVQoaGVhcCwgZGVzdHJ1Y3RpYmxlT2JqZWN0SGVhcENlbGxUeXBl LmdldCgpLCBKU0FycmF5QnVmZmVyQ29uc3RydWN0b3IpCiAgICAgLCBhc3luY0Z1bmN0aW9uU3Bh Y2UgSVNPX1NVQlNQQUNFX0lOSVQoaGVhcCwgY2VsbEpTVmFsdWVPT0JIZWFwQ2VsbFR5cGUuZ2V0 KCksIEpTQXN5bmNGdW5jdGlvbikKICAgICAsIGFzeW5jR2VuZXJhdG9yRnVuY3Rpb25TcGFjZSBJ U09fU1VCU1BBQ0VfSU5JVChoZWFwLCBjZWxsSlNWYWx1ZU9PQkhlYXBDZWxsVHlwZS5nZXQoKSwg SlNBc3luY0dlbmVyYXRvckZ1bmN0aW9uKQogICAgICwgYm91bmRGdW5jdGlvblNwYWNlIElTT19T VUJTUEFDRV9JTklUKGhlYXAsIGNlbGxKU1ZhbHVlT09CSGVhcENlbGxUeXBlLmdldCgpLCBKU0Jv dW5kRnVuY3Rpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9W TS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAppbmRleCBiZjA4ZDVlNzUy NzQ0OWM5YTg4MTFjOGFhZjY0YTFjYzFjNDc5MjFiLi5lZTBiM2E2NmRkZTFlNzRmYjUyNTk2ZGQz OWUwOTI5NDQzMzM3YzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9WTS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgKQEAgLTM2Nyw3 ICszNjcsNiBAQCBjbGFzcyBWTSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxWTT4sIHB1 YmxpYyBEb3VibHlMaW5rZWRMaXN0Tm9kZTxWTT4gewogICAgIENvbXBsZXRlU3Vic3BhY2UgZWFn ZXJseVN3ZXB0RGVzdHJ1Y3RpYmxlT2JqZWN0U3BhY2U7CiAgICAgQ29tcGxldGVTdWJzcGFjZSBz ZWdtZW50ZWRWYXJpYWJsZU9iamVjdFNwYWNlOwogICAgIAotICAgIElzb1N1YnNwYWNlIGFycmF5 QnVmZmVyQ29uc3RydWN0b3JTcGFjZTsKICAgICBJc29TdWJzcGFjZSBhc3luY0Z1bmN0aW9uU3Bh Y2U7CiAgICAgSXNvU3Vic3BhY2UgYXN5bmNHZW5lcmF0b3JGdW5jdGlvblNwYWNlOwogICAgIElz b1N1YnNwYWNlIGJvdW5kRnVuY3Rpb25TcGFjZTsK