73355 2011-11-29 13:12:43 -0800 Allow WebCore to describe typed arrays to JSC 2011-11-29 15:36:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver abarth japhet webkit.review.bot oldest_to_newest 511042 0 oliver 2011-11-29 13:12:43 -0800 Allow WebCore to describe typed arrays to JSC 511048 1 117031 oliver 2011-11-29 13:20:41 -0800 Created attachment 117031 Patch 511058 2 117031 sam 2011-11-29 13:26:55 -0800 Comment on attachment 117031 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117031&action=review > Source/JavaScriptCore/runtime/JSGlobalData.h:374 > + TypedArrayDescriptor int8ArrayDescriptor; > + TypedArrayDescriptor int16ArrayDescriptor; > + TypedArrayDescriptor int32ArrayDescriptor; > + TypedArrayDescriptor uint8ArrayDescriptor; > + TypedArrayDescriptor uint16ArrayDescriptor; > + TypedArrayDescriptor uint32ArrayDescriptor; > + TypedArrayDescriptor float32ArrayDescriptor; > + TypedArrayDescriptor float64ArrayDescriptor; should these be m_? 511129 3 117050 oliver 2011-11-29 14:55:05 -0800 Created attachment 117050 Patch 511160 4 oliver 2011-11-29 15:36:59 -0800 Committed r101426: <http://trac.webkit.org/changeset/101426> 117031 2011-11-29 13:20:41 -0800 2011-11-29 14:55:02 -0800 Patch bug-73355-20111129132040.patch text/plain 7561 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk YTExM2QzZDUyYmM3MzM5MTYzMDVlNjRiZTc2YTUxYjA5YzA5ODU0Li45MjNjODMzOGE3YjBlMWJl NzNiMzMwYzEzOTllYjQ4NGY5OGYwYWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMS0xMS0yOSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFsbG93IFdlYkNvcmUgdG8gZGVzY3JpYmUgdHlwZWQgYXJyYXlzIHRvIEpTQwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBnbG9i YWxkYXRhIHRvIHRyYWNrIHRoZSBzdHJ1Y3R1cmUgb2YgdHlwZWQgYXJyYXlzLgorCisgICAgICAg ICogcnVudGltZS9KU0dsb2JhbERhdGEuaDoKKyAgICAgICAgKEpTQzo6VHlwZWRBcnJheURlc2Ny aXB0b3I6OlR5cGVkQXJyYXlEZXNjcmlwdG9yKToKKwogMjAxMS0xMS0yOCAgRmlsaXAgUGl6bG8g IDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIERGRyBkZWJ1Z0NhbGwoKSBtZWNoYW5pc20g b25seSB3b3JrcyBvbiBYODYgYW5kIFg4Ni02NApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE3YzIzZDMzZDE1ODFm NDAyZTExMDYxMjI5OGFkOGNjNmUwNjkwMjcuLmNjMjRiZDhlZWZiN2QwMzE0MGRiN2U0NmYxNzk4 YjgwMjM2YzRiMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMS0xMS0yOSAgT2xp dmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCisgICAgICAgIEFsbG93IFdlYkNvcmUgdG8g ZGVzY3JpYmUgdHlwZWQgYXJyYXlzIHRvIEpTQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgYmluZGluZ3MgY29kZWdlbiB0byByZXBvcnQgdGhl IGRhdGEgbGF5b3V0IHRvIEpTQy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOgorICAgICAgICAoR2VuZXJh dGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT RmxvYXQ2NEFycmF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRmxvYXQ2NEFycmF5OjpmaW5p c2hDcmVhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2 NEFycmF5Lmg6CisKKzIwMTEtMTEtMjkgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K KwogICAgICAgICBSZXZlcnQgdGhhdCBsYXN0IGNoYW5nZSwgYXBwYXJlbnRseSBpdCBkZXN0cm95 cyBldmVyeXRoaW5nIGluIHRoZSB3b3JsZC4KIAogICAgICAgICAqIGJpbmRpbmdzL2pzL0RPTVdy YXBwZXJXb3JsZC5oOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNHbG9iYWxEYXRhLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERh dGEuaAppbmRleCBiODE5NTFiZjExNTUwYjY4NTAxM2QzYWI2Y2FkOGRmMGVkMjQ0OWI4Li5jYTk2 NGNmZjBjZTdiODUzZDA3ZGIxMWI1ZWE5MDlmZThlMzIzNWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEuaApAQCAtMTAzLDYgKzEwMywyNCBAQCBuYW1l c3BhY2UgSlNDIHsKICAgICAgICAgVGhyZWFkU3RhY2tUeXBlU21hbGwKICAgICB9OwogCisgICAg c3RydWN0IFR5cGVkQXJyYXlEZXNjcmlwdG9yIHsKKyAgICAgICAgVHlwZWRBcnJheURlc2NyaXB0 b3IoKQorICAgICAgICAgICAgOiBtX3ZwdHIoMCkKKyAgICAgICAgICAgICwgbV9zdG9yYWdlT2Zm c2V0KDApCisgICAgICAgICAgICAsIG1fbGVuZ3RoT2Zmc2V0KDApCisgICAgICAgIHsKKyAgICAg ICAgfQorICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRvcih2b2lkKiB2cHRyLCBzaXplX3Qgc3Rv cmFnZU9mZnNldCwgc2l6ZV90IGxlbmd0aE9mZnNldCkKKyAgICAgICAgICAgIDogbV92cHRyKHZw dHIpCisgICAgICAgICAgICAsIG1fc3RvcmFnZU9mZnNldChzdG9yYWdlT2Zmc2V0KQorICAgICAg ICAgICAgLCBtX2xlbmd0aE9mZnNldChsZW5ndGhPZmZzZXQpCisgICAgICAgIHsKKyAgICAgICAg fQorICAgICAgICB2b2lkKiBtX3ZwdHI7CisgICAgICAgIHNpemVfdCBtX3N0b3JhZ2VPZmZzZXQ7 CisgICAgICAgIHNpemVfdCBtX2xlbmd0aE9mZnNldDsKKyAgICB9OworICAgIAogICAgIGNsYXNz IEpTR2xvYmFsRGF0YSA6IHB1YmxpYyBSZWZDb3VudGVkPEpTR2xvYmFsRGF0YT4gewogICAgIHB1 YmxpYzoKICAgICAgICAgLy8gV2ViQ29yZSBoYXMgYSBvbmUtdG8tb25lIG1hcHBpbmcgb2YgdGhy ZWFkcyB0byBKU0dsb2JhbERhdGFzOwpAQCAtMzE5LDYgKzMzNywyMiBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgdW5zaWduZWQgbV90aW1lb3V0Q291bnQ7CiAjZW5kaWYKIAorI2RlZmluZSBy ZWdpc3RlclR5cGVkQXJyYXlGdW5jdGlvbih0eXBlLCBjYXBpdGFsaXplZFR5cGUpIFwKKyAgICAg ICAgdm9pZCByZWdpc3RlclR5cGVkQXJyYXlEZXNjcmlwdG9yKGNvbnN0IGNhcGl0YWxpemVkVHlw ZSMjQXJyYXkqLCBjb25zdCBUeXBlZEFycmF5RGVzY3JpcHRvciYgZGVzY3JpcHRvcikgXAorICAg ICAgICB7IFwKKyAgICAgICAgICAgIEFTU0VSVCghdHlwZSMjQXJyYXlEZXNjcmlwdG9yLm1fdnB0 ciB8fCB0eXBlIyNBcnJheURlc2NyaXB0b3IubV92cHRyID09IGRlc2NyaXB0b3IubV92cHRyKTsg XAorICAgICAgICAgICAgdHlwZSMjQXJyYXlEZXNjcmlwdG9yID0gZGVzY3JpcHRvcjsgXAorICAg ICAgICB9CisgICAgICAgIHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKGludDgsIEludDgpOwor ICAgICAgICByZWdpc3RlclR5cGVkQXJyYXlGdW5jdGlvbihpbnQxNiwgSW50MTYpOworICAgICAg ICByZWdpc3RlclR5cGVkQXJyYXlGdW5jdGlvbihpbnQzMiwgSW50MzIpOworICAgICAgICByZWdp c3RlclR5cGVkQXJyYXlGdW5jdGlvbih1aW50OCwgVWludDgpOworICAgICAgICByZWdpc3RlclR5 cGVkQXJyYXlGdW5jdGlvbih1aW50MTYsIFVpbnQxNik7CisgICAgICAgIHJlZ2lzdGVyVHlwZWRB cnJheUZ1bmN0aW9uKHVpbnQzMiwgVWludDMyKTsKKyAgICAgICAgcmVnaXN0ZXJUeXBlZEFycmF5 RnVuY3Rpb24oZmxvYXQzMiwgRmxvYXQzMik7CisgICAgICAgIHJlZ2lzdGVyVHlwZWRBcnJheUZ1 bmN0aW9uKGZsb2F0NjQsIEZsb2F0NjQpOworI3VuZGVmIHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0 aW9uCisKICAgICBwcml2YXRlOgogICAgICAgICBKU0dsb2JhbERhdGEoR2xvYmFsRGF0YVR5cGUs IFRocmVhZFN0YWNrVHlwZSwgSGVhcFNpemUpOwogICAgICAgICBzdGF0aWMgSlNHbG9iYWxEYXRh KiYgc2hhcmVkSW5zdGFuY2VJbnRlcm5hbCgpOwpAQCAtMzMwLDYgKzM2NCwxNCBAQCBuYW1lc3Bh Y2UgSlNDIHsKICNpZiBFTkFCTEUoR0NfVkFMSURBVElPTikKICAgICAgICAgYm9vbCBtX2lzSW5p dGlhbGl6aW5nT2JqZWN0OwogI2VuZGlmCisgICAgICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yIGlu dDhBcnJheURlc2NyaXB0b3I7CisgICAgICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yIGludDE2QXJy YXlEZXNjcmlwdG9yOworICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRvciBpbnQzMkFycmF5RGVz Y3JpcHRvcjsKKyAgICAgICAgVHlwZWRBcnJheURlc2NyaXB0b3IgdWludDhBcnJheURlc2NyaXB0 b3I7CisgICAgICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yIHVpbnQxNkFycmF5RGVzY3JpcHRvcjsK KyAgICAgICAgVHlwZWRBcnJheURlc2NyaXB0b3IgdWludDMyQXJyYXlEZXNjcmlwdG9yOworICAg ICAgICBUeXBlZEFycmF5RGVzY3JpcHRvciBmbG9hdDMyQXJyYXlEZXNjcmlwdG9yOworICAgICAg ICBUeXBlZEFycmF5RGVzY3JpcHRvciBmbG9hdDY0QXJyYXlEZXNjcmlwdG9yOwogICAgIH07CiAK ICNpZiBFTkFCTEUoR0NfVkFMSURBVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggNzEwYzdhZTNlMzE3YTcxY2Q4MGU3 NjIyMGIyYWViYjQ4MTcxNWZkNy4uYmZkNWE2YzJlYWFhMDFmMTEzZTdlNDI1NzFjYmU4NTIzZGMz ZGE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0KQEAgLTkzMCw2ICs5MzAsMTEgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAg ICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgfVxuIik7CiAgICAgfQogCisgICAgaWYgKElz VHlwZWRBcnJheVR5cGUoJGltcGxUeXBlKSBhbmQgKCRpbXBsVHlwZSBuZSAiQXJyYXlCdWZmZXJW aWV3IikgYW5kICgkaW1wbFR5cGUgbmUgIkFycmF5QnVmZmVyIikpIHsKKyAgICAgICAgcHVzaChA aGVhZGVyQ29udGVudCwgIiAgICBpbnRwdHJfdCBtX3N0b3JhZ2VMZW5ndGg7XG4iKTsKKyAgICAg ICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICB2b2lkKiBtX3N0b3JhZ2U7XG4iKTsKKyAgICB9 CisKICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAicHJvdGVjdGVkOlxuIik7CiAgICAgIyBDb25z dHJ1Y3RvcgogICAgIGlmICgkaW50ZXJmYWNlTmFtZSBlcSAiRE9NV2luZG93IikgewpAQCAtMTU2 OCw2ICsxNTczLDEyIEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAidm9pZCAke2NsYXNzTmFtZX06OmZpbmlzaENyZWF0aW9uKEpTR2xvYmFs RGF0YSYgZ2xvYmFsRGF0YSlcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIntcbiIp OwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihn bG9iYWxEYXRhKTtcbiIpOworICAgICAgICBpZiAoSXNUeXBlZEFycmF5VHlwZSgkaW1wbFR5cGUp IGFuZCAoJGltcGxUeXBlIG5lICJBcnJheUJ1ZmZlclZpZXciKSBhbmQgKCRpbXBsVHlwZSBuZSAi QXJyYXlCdWZmZXIiKSkgeworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgVHlw ZWRBcnJheURlc2NyaXB0b3IgZGVzY3JpcHRvcih2cHRyKCksIE9CSkVDVF9PRkZTRVRPRigke2Ns YXNzTmFtZX0sIG1fc3RvcmFnZSksIE9CSkVDVF9PRkZTRVRPRigke2NsYXNzTmFtZX0sIG1fc3Rv cmFnZUxlbmd0aCkpO1xuIik7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBn bG9iYWxEYXRhLnJlZ2lzdGVyVHlwZWRBcnJheURlc2NyaXB0b3IoaW1wbCgpLCBkZXNjcmlwdG9y KTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgbV9zdG9yYWdlID0g aW1wbCgpLT5kYXRhKCk7XG4iKTsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAg IG1fc3RvcmFnZUxlbmd0aCA9IGltcGwoKS0+bGVuZ3RoKCk7XG4iKTsKKyAgICAgICAgfQogICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBBU1NFUlQoaW5oZXJpdHMoJnNfaW5mbykpO1xu Iik7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAifVxuXG4iKTsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJy YXkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2 NEFycmF5LmNwcAppbmRleCA3Mzk2Yjg5MDM4YmU3OWVmMjE2YjFkYjU4YzIwYzYxMjc2Y2U1MTIz Li45NzIzZDcyMjYwYzZlNmYxNjQ4NDliZjNmMmNiZmMyNzlkOTllNDY4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJyYXkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU0Zsb2F0NjRB cnJheS5jcHAKQEAgLTE2NSw2ICsxNjUsMTAgQEAgSlNGbG9hdDY0QXJyYXk6OkpTRmxvYXQ2NEFy cmF5KFN0cnVjdHVyZSogc3RydWN0dXJlLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2IKIHZv aWQgSlNGbG9hdDY0QXJyYXk6OmZpbmlzaENyZWF0aW9uKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0 YSkKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihnbG9iYWxEYXRhKTsKKyAgICBUeXBlZEFy cmF5RGVzY3JpcHRvciBkZXNjcmlwdG9yKHZwdHIoKSwgT0JKRUNUX09GRlNFVE9GKEpTRmxvYXQ2 NEFycmF5LCBtX3N0b3JhZ2UpLCBPQkpFQ1RfT0ZGU0VUT0YoSlNGbG9hdDY0QXJyYXksIG1fc3Rv cmFnZUxlbmd0aCkpOworICAgIGdsb2JhbERhdGEucmVnaXN0ZXJUeXBlZEFycmF5RGVzY3JpcHRv cihpbXBsKCksIGRlc2NyaXB0b3IpOworICAgIG1fc3RvcmFnZSA9IGltcGwoKS0+ZGF0YSgpOwor ICAgIG1fc3RvcmFnZUxlbmd0aCA9IGltcGwoKS0+bGVuZ3RoKCk7CiAgICAgQVNTRVJUKGluaGVy aXRzKCZzX2luZm8pKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2NEFycmF5LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJyYXkuaAppbmRleCA0ZjNhNjY3M2NhMDM4ODNk OTYzM2ViYTIxN2RjNWVkZGFiNzRlYTU0Li44N2M5MjE4YmU4ZmQ0YmJkZDljMmFkZDBmYWVmZDdj NzY4OGZjODYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvSlMvSlNGbG9hdDY0QXJyYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJyYXkuaApAQCAtNTcsNiArNTcsOCBAQCBwdWJsaWM6CiAg ICAgewogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RmxvYXQ2NEFycmF5Kj4oQmFzZTo6aW1w bCgpKTsKICAgICB9CisgICAgaW50cHRyX3QgbV9zdG9yYWdlTGVuZ3RoOworICAgIHZvaWQqIG1f c3RvcmFnZTsKIHByb3RlY3RlZDoKICAgICBKU0Zsb2F0NjRBcnJheShKU0M6OlN0cnVjdHVyZSos IEpTRE9NR2xvYmFsT2JqZWN0KiwgUGFzc1JlZlB0cjxGbG9hdDY0QXJyYXk+KTsKICAgICB2b2lk IGZpbmlzaENyZWF0aW9uKEpTQzo6SlNHbG9iYWxEYXRhJik7Cg== 117050 2011-11-29 14:55:05 -0800 2011-11-29 15:34:18 -0800 Patch bug-73355-20111129145504.patch text/plain 10212 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk YTExM2QzZDUyYmM3MzM5MTYzMDVlNjRiZTc2YTUxYjA5YzA5ODU0Li45MjNjODMzOGE3YjBlMWJl NzNiMzMwYzEzOTllYjQ4NGY5OGYwYWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMS0xMS0yOSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFsbG93IFdlYkNvcmUgdG8gZGVzY3JpYmUgdHlwZWQgYXJyYXlzIHRvIEpTQwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBnbG9i YWxkYXRhIHRvIHRyYWNrIHRoZSBzdHJ1Y3R1cmUgb2YgdHlwZWQgYXJyYXlzLgorCisgICAgICAg ICogcnVudGltZS9KU0dsb2JhbERhdGEuaDoKKyAgICAgICAgKEpTQzo6VHlwZWRBcnJheURlc2Ny aXB0b3I6OlR5cGVkQXJyYXlEZXNjcmlwdG9yKToKKwogMjAxMS0xMS0yOCAgRmlsaXAgUGl6bG8g IDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIERGRyBkZWJ1Z0NhbGwoKSBtZWNoYW5pc20g b25seSB3b3JrcyBvbiBYODYgYW5kIFg4Ni02NApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE3YzIzZDMzZDE1ODFm NDAyZTExMDYxMjI5OGFkOGNjNmUwNjkwMjcuLmNjMjRiZDhlZWZiN2QwMzE0MGRiN2U0NmYxNzk4 YjgwMjM2YzRiMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMS0xMS0yOSAgT2xp dmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCisgICAgICAgIEFsbG93IFdlYkNvcmUgdG8g ZGVzY3JpYmUgdHlwZWQgYXJyYXlzIHRvIEpTQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgYmluZGluZ3MgY29kZWdlbiB0byByZXBvcnQgdGhl IGRhdGEgbGF5b3V0IHRvIEpTQy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOgorICAgICAgICAoR2VuZXJh dGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT RmxvYXQ2NEFycmF5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRmxvYXQ2NEFycmF5OjpmaW5p c2hDcmVhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2 NEFycmF5Lmg6CisKKzIwMTEtMTEtMjkgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K KwogICAgICAgICBSZXZlcnQgdGhhdCBsYXN0IGNoYW5nZSwgYXBwYXJlbnRseSBpdCBkZXN0cm95 cyBldmVyeXRoaW5nIGluIHRoZSB3b3JsZC4KIAogICAgICAgICAqIGJpbmRpbmdzL2pzL0RPTVdy YXBwZXJXb3JsZC5oOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv Q2xhc3NJbmZvLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DbGFzc0luZm8uaApp bmRleCAwZjMyNzRhMTJiM2E5M2VmOWFjOWJiYmQxZTk2ZjI4YWViMTg2NTFkLi4wOWZlZGIzZjRl ODMzYTRiZjIzMjZlODgxZTkwYTZkZmMzZDBkNzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9DbGFzc0luZm8uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9DbGFzc0luZm8uaApAQCAtMTM1LDcgKzEzNSw4IEBAIHN0cnVjdCBNZW1iZXJDaGVj ayMjbWVtYmVyIHsgXAogICAgICAgICAmQ2xhc3NOYW1lOjpkZWZpbmVPd25Qcm9wZXJ0eSwgXAog ICAgICAgICAmQ2xhc3NOYW1lOjpnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IsIFwKICAgICB9LCBc Ci0gICAgc2l6ZW9mKENsYXNzTmFtZSkKKyAgICBzaXplb2YoQ2xhc3NOYW1lKSwgXAorICAgIENs YXNzTmFtZTo6VHlwZWRBcnJheVN0b3JhZ2VUeXBlCiAKICAgICBzdHJ1Y3QgQ2xhc3NJbmZvIHsK ICAgICAgICAgLyoqCkBAIC0xODQsNiArMTg1LDggQEAgc3RydWN0IE1lbWJlckNoZWNrIyNtZW1i ZXIgeyBcCiAgICAgICAgIE1ldGhvZFRhYmxlIG1ldGhvZFRhYmxlOwogCiAgICAgICAgIHNpemVf dCBjZWxsU2l6ZTsKKyAgICAgICAgCisgICAgICAgIFR5cGVkQXJyYXlUeXBlIHR5cGVkQXJyYXlT dG9yYWdlVHlwZTsKICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNDZWxsLmgKaW5kZXggM2JjMmJlZTFiYzA0Nzk1OWQ3ZTE3ODUwMjlhMjUy MjNkOTg2NDY2ZS4uNzZjZWYwNDVhNjkxOTkyNWMwZDc3OGIzZjgzN2U2YzJkNjhmNzQ3YyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKQEAgLTQ1LDYgKzQ1LDE4IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICBJbmNsdWRlRG9udEVudW1Qcm9wZXJ0aWVzCiAgICAgfTsK IAorICAgIGVudW0gVHlwZWRBcnJheVR5cGUgeworICAgICAgICBUeXBlZEFycmF5Tm9uZSwKKyAg ICAgICAgVHlwZWRBcnJheUludDgsCisgICAgICAgIFR5cGVkQXJyYXlJbnQxNiwKKyAgICAgICAg VHlwZWRBcnJheUludDMyLAorICAgICAgICBUeXBlZEFycmF5VWludDgsCisgICAgICAgIFR5cGVk QXJyYXlVaW50MTYsCisgICAgICAgIFR5cGVkQXJyYXlVaW50MzIsCisgICAgICAgIFR5cGVkQXJy YXlGbG9hdDMyLAorICAgICAgICBUeXBlZEFycmF5RmxvYXQ2NAorICAgIH07CisKICAgICBjbGFz cyBKU0NlbGwgewogICAgICAgICBmcmllbmQgY2xhc3MgSlNWYWx1ZTsKICAgICAgICAgZnJpZW5k IGNsYXNzIE1hcmtlZEJsb2NrOwpAQCAtMTMxLDYgKzE0Myw3IEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICBTdHJ1Y3R1cmUqIHVudmFsaWRhdGVkU3RydWN0dXJlKCkgeyByZXR1cm4gbV9zdHJ1 Y3R1cmUudW52YWxpZGF0ZWRHZXQoKTsgfQogI2VuZGlmCiAgICAgICAgIAorICAgICAgICBzdGF0 aWMgY29uc3QgVHlwZWRBcnJheVR5cGUgVHlwZWRBcnJheVN0b3JhZ2VUeXBlID0gVHlwZWRBcnJh eU5vbmU7CiAgICAgcHJvdGVjdGVkOgogCiAgICAgICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oSlNH bG9iYWxEYXRhJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0dsb2JhbERhdGEuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0 YS5oCmluZGV4IGI4MTk1MWJmMTE1NTBiNjg1MDEzZDNhYjZjYWQ4ZGYwZWQyNDQ5YjguLjNlYjEw NWMzZGY2MTkwMTU2ZGRhMWFlZGExMjhmNmY3MzU2OTgzNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5oCkBAIC0xMDMsNiArMTAzLDI0IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICBUaHJlYWRTdGFja1R5cGVTbWFsbAogICAgIH07CiAKKyAgICBz dHJ1Y3QgVHlwZWRBcnJheURlc2NyaXB0b3IgeworICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRv cigpCisgICAgICAgICAgICA6IG1fdnB0cigwKQorICAgICAgICAgICAgLCBtX3N0b3JhZ2VPZmZz ZXQoMCkKKyAgICAgICAgICAgICwgbV9sZW5ndGhPZmZzZXQoMCkKKyAgICAgICAgeworICAgICAg ICB9CisgICAgICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yKHZvaWQqIHZwdHIsIHNpemVfdCBzdG9y YWdlT2Zmc2V0LCBzaXplX3QgbGVuZ3RoT2Zmc2V0KQorICAgICAgICAgICAgOiBtX3ZwdHIodnB0 cikKKyAgICAgICAgICAgICwgbV9zdG9yYWdlT2Zmc2V0KHN0b3JhZ2VPZmZzZXQpCisgICAgICAg ICAgICAsIG1fbGVuZ3RoT2Zmc2V0KGxlbmd0aE9mZnNldCkKKyAgICAgICAgeworICAgICAgICB9 CisgICAgICAgIHZvaWQqIG1fdnB0cjsKKyAgICAgICAgc2l6ZV90IG1fc3RvcmFnZU9mZnNldDsK KyAgICAgICAgc2l6ZV90IG1fbGVuZ3RoT2Zmc2V0OworICAgIH07CisgICAgCiAgICAgY2xhc3Mg SlNHbG9iYWxEYXRhIDogcHVibGljIFJlZkNvdW50ZWQ8SlNHbG9iYWxEYXRhPiB7CiAgICAgcHVi bGljOgogICAgICAgICAvLyBXZWJDb3JlIGhhcyBhIG9uZS10by1vbmUgbWFwcGluZyBvZiB0aHJl YWRzIHRvIEpTR2xvYmFsRGF0YXM7CkBAIC0zMTksNiArMzM3LDIyIEBAIG5hbWVzcGFjZSBKU0Mg ewogICAgICAgICB1bnNpZ25lZCBtX3RpbWVvdXRDb3VudDsKICNlbmRpZgogCisjZGVmaW5lIHJl Z2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKHR5cGUsIGNhcGl0YWxpemVkVHlwZSkgXAorICAgICAg ICB2b2lkIHJlZ2lzdGVyVHlwZWRBcnJheURlc2NyaXB0b3IoY29uc3QgY2FwaXRhbGl6ZWRUeXBl IyNBcnJheSosIGNvbnN0IFR5cGVkQXJyYXlEZXNjcmlwdG9yJiBkZXNjcmlwdG9yKSBcCisgICAg ICAgIHsgXAorICAgICAgICAgICAgQVNTRVJUKCFtXyMjdHlwZSMjQXJyYXlEZXNjcmlwdG9yLm1f dnB0ciB8fCBtXyMjdHlwZSMjQXJyYXlEZXNjcmlwdG9yLm1fdnB0ciA9PSBkZXNjcmlwdG9yLm1f dnB0cik7IFwKKyAgICAgICAgICAgIG1fIyN0eXBlIyNBcnJheURlc2NyaXB0b3IgPSBkZXNjcmlw dG9yOyBcCisgICAgICAgIH0KKyAgICAgICAgcmVnaXN0ZXJUeXBlZEFycmF5RnVuY3Rpb24oaW50 OCwgSW50OCk7CisgICAgICAgIHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKGludDE2LCBJbnQx Nik7CisgICAgICAgIHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKGludDMyLCBJbnQzMik7Cisg ICAgICAgIHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKHVpbnQ4LCBVaW50OCk7CisgICAgICAg IHJlZ2lzdGVyVHlwZWRBcnJheUZ1bmN0aW9uKHVpbnQxNiwgVWludDE2KTsKKyAgICAgICAgcmVn aXN0ZXJUeXBlZEFycmF5RnVuY3Rpb24odWludDMyLCBVaW50MzIpOworICAgICAgICByZWdpc3Rl clR5cGVkQXJyYXlGdW5jdGlvbihmbG9hdDMyLCBGbG9hdDMyKTsKKyAgICAgICAgcmVnaXN0ZXJU eXBlZEFycmF5RnVuY3Rpb24oZmxvYXQ2NCwgRmxvYXQ2NCk7CisjdW5kZWYgcmVnaXN0ZXJUeXBl ZEFycmF5RnVuY3Rpb24KKwogICAgIHByaXZhdGU6CiAgICAgICAgIEpTR2xvYmFsRGF0YShHbG9i YWxEYXRhVHlwZSwgVGhyZWFkU3RhY2tUeXBlLCBIZWFwU2l6ZSk7CiAgICAgICAgIHN0YXRpYyBK U0dsb2JhbERhdGEqJiBzaGFyZWRJbnN0YW5jZUludGVybmFsKCk7CkBAIC0zMzAsNiArMzY0LDE0 IEBAIG5hbWVzcGFjZSBKU0MgewogI2lmIEVOQUJMRShHQ19WQUxJREFUSU9OKQogICAgICAgICBi b29sIG1faXNJbml0aWFsaXppbmdPYmplY3Q7CiAjZW5kaWYKKyAgICAgICAgVHlwZWRBcnJheURl c2NyaXB0b3IgbV9pbnQ4QXJyYXlEZXNjcmlwdG9yOworICAgICAgICBUeXBlZEFycmF5RGVzY3Jp cHRvciBtX2ludDE2QXJyYXlEZXNjcmlwdG9yOworICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRv ciBtX2ludDMyQXJyYXlEZXNjcmlwdG9yOworICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRvciBt X3VpbnQ4QXJyYXlEZXNjcmlwdG9yOworICAgICAgICBUeXBlZEFycmF5RGVzY3JpcHRvciBtX3Vp bnQxNkFycmF5RGVzY3JpcHRvcjsKKyAgICAgICAgVHlwZWRBcnJheURlc2NyaXB0b3IgbV91aW50 MzJBcnJheURlc2NyaXB0b3I7CisgICAgICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yIG1fZmxvYXQz MkFycmF5RGVzY3JpcHRvcjsKKyAgICAgICAgVHlwZWRBcnJheURlc2NyaXB0b3IgbV9mbG9hdDY0 QXJyYXlEZXNjcmlwdG9yOwogICAgIH07CiAKICNpZiBFTkFCTEUoR0NfVkFMSURBVElPTikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpT LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0K aW5kZXggNzEwYzdhZTNlMzE3YTcxY2Q4MGU3NjIyMGIyYWViYjQ4MTcxNWZkNy4uM2Q1ZjRiZmE2 ODAyMDY4NmRiZmZmMDQ5ZGUwOGEyZDEzNTc5ODA2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTkzMCw2ICs5MzAsMjEg QEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAg fVxuIik7CiAgICAgfQogCisgICAgaWYgKElzVHlwZWRBcnJheVR5cGUoJGltcGxUeXBlKSBhbmQg KCRpbXBsVHlwZSBuZSAiQXJyYXlCdWZmZXJWaWV3IikgYW5kICgkaW1wbFR5cGUgbmUgIkFycmF5 QnVmZmVyIikpIHsKKyAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICBzdGF0aWMgY29u c3QgSlNDOjpUeXBlZEFycmF5VHlwZSBUeXBlZEFycmF5U3RvcmFnZVR5cGUgPSBKU0M6OiIpOwor ICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiVHlwZWRBcnJheUludDgiKSBpZiAkaW1wbFR5 cGUgZXEgIkludDhBcnJheSI7CisgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJUeXBlZEFy cmF5SW50MTYiKSBpZiAkaW1wbFR5cGUgZXEgIkludDE2QXJyYXkiOworICAgICAgICBwdXNoKEBo ZWFkZXJDb250ZW50LCAiVHlwZWRBcnJheUludDMyIikgaWYgJGltcGxUeXBlIGVxICJJbnQzMkFy cmF5IjsKKyAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIlR5cGVkQXJyYXlVaW50OCIpIGlm ICRpbXBsVHlwZSBlcSAiVWludDhBcnJheSI7CisgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQs ICJUeXBlZEFycmF5VWludDE2IikgaWYgJGltcGxUeXBlIGVxICJVaW50MTZBcnJheSI7CisgICAg ICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJUeXBlZEFycmF5VWludDMyIikgaWYgJGltcGxUeXBl IGVxICJVaW50MzJBcnJheSI7CisgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJUeXBlZEFy cmF5RmxvYXQzMiIpIGlmICRpbXBsVHlwZSBlcSAiRmxvYXQzMkFycmF5IjsKKyAgICAgICAgcHVz aChAaGVhZGVyQ29udGVudCwgIlR5cGVkQXJyYXlGbG9hdDY0IikgaWYgJGltcGxUeXBlIGVxICJG bG9hdDY0QXJyYXkiOworICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiO1xuIik7CisgICAg ICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgaW50cHRyX3QgbV9zdG9yYWdlTGVuZ3RoO1xu Iik7CisgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgdm9pZCogbV9zdG9yYWdlO1xu Iik7CisgICAgfQorCiAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgInByb3RlY3RlZDpcbiIpOwog ICAgICMgQ29uc3RydWN0b3IKICAgICBpZiAoJGludGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIp IHsKQEAgLTE1NjgsNiArMTU4MywxMiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgInZvaWQgJHtjbGFzc05hbWV9OjpmaW5pc2hDcmVhdGlv bihKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpXG4iKTsKICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICJ7XG4iKTsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgQmFzZTo6ZmluaXNo Q3JlYXRpb24oZ2xvYmFsRGF0YSk7XG4iKTsKKyAgICAgICAgaWYgKElzVHlwZWRBcnJheVR5cGUo JGltcGxUeXBlKSBhbmQgKCRpbXBsVHlwZSBuZSAiQXJyYXlCdWZmZXJWaWV3IikgYW5kICgkaW1w bFR5cGUgbmUgIkFycmF5QnVmZmVyIikpIHsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIFR5cGVkQXJyYXlEZXNjcmlwdG9yIGRlc2NyaXB0b3IodnB0cigpLCBPQkpFQ1RfT0ZG U0VUT0YoJHtjbGFzc05hbWV9LCBtX3N0b3JhZ2UpLCBPQkpFQ1RfT0ZGU0VUT0YoJHtjbGFzc05h bWV9LCBtX3N0b3JhZ2VMZW5ndGgpKTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgZ2xvYmFsRGF0YS5yZWdpc3RlclR5cGVkQXJyYXlEZXNjcmlwdG9yKGltcGwoKSwg ZGVzY3JpcHRvcik7XG4iKTsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIG1f c3RvcmFnZSA9IGltcGwoKS0+ZGF0YSgpO1xuIik7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICBtX3N0b3JhZ2VMZW5ndGggPSBpbXBsKCktPmxlbmd0aCgpO1xuIik7CisgICAg ICAgIH0KICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgQVNTRVJUKGluaGVyaXRzKCZz X2luZm8pKTtcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn1cblxuIik7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT RmxvYXQ2NEFycmF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9K Uy9KU0Zsb2F0NjRBcnJheS5jcHAKaW5kZXggNzM5NmI4OTAzOGJlNzllZjIxNmIxZGI1OGMyMGM2 MTI3NmNlNTEyMy4uOTcyM2Q3MjI2MGM2ZTZmMTY0ODQ5YmYzZjJjYmZjMjc5ZDk5ZTQ2OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2 NEFycmF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMv SlNGbG9hdDY0QXJyYXkuY3BwCkBAIC0xNjUsNiArMTY1LDEwIEBAIEpTRmxvYXQ2NEFycmF5OjpK U0Zsb2F0NjRBcnJheShTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iCiB2b2lkIEpTRmxvYXQ2NEFycmF5OjpmaW5pc2hDcmVhdGlvbihKU0dsb2JhbERhdGEm IGdsb2JhbERhdGEpCiB7CiAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24oZ2xvYmFsRGF0YSk7Cisg ICAgVHlwZWRBcnJheURlc2NyaXB0b3IgZGVzY3JpcHRvcih2cHRyKCksIE9CSkVDVF9PRkZTRVRP RihKU0Zsb2F0NjRBcnJheSwgbV9zdG9yYWdlKSwgT0JKRUNUX09GRlNFVE9GKEpTRmxvYXQ2NEFy cmF5LCBtX3N0b3JhZ2VMZW5ndGgpKTsKKyAgICBnbG9iYWxEYXRhLnJlZ2lzdGVyVHlwZWRBcnJh eURlc2NyaXB0b3IoaW1wbCgpLCBkZXNjcmlwdG9yKTsKKyAgICBtX3N0b3JhZ2UgPSBpbXBsKCkt PmRhdGEoKTsKKyAgICBtX3N0b3JhZ2VMZW5ndGggPSBpbXBsKCktPmxlbmd0aCgpOwogICAgIEFT U0VSVChpbmhlcml0cygmc19pbmZvKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU0Zsb2F0NjRBcnJheS5oIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2NEFycmF5LmgKaW5kZXggNGYzYTY2 NzNjYTAzODgzZDk2MzNlYmEyMTdkYzVlZGRhYjc0ZWE1NC4uMjBjMTlmNjM5OWEyNWYxMzRkM2Zj N2UyZTE3ZWM5M2MyZTFjOWM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2NEFycmF5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2NEFycmF5LmgKQEAgLTU3LDYgKzU3LDkgQEAg cHVibGljOgogICAgIHsKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEZsb2F0NjRBcnJheSo+ KEJhc2U6OmltcGwoKSk7CiAgICAgfQorICAgIHN0YXRpYyBjb25zdCBUeXBlZEFycmF5VHlwZSBU eXBlZEFycmF5U3RvcmFnZVR5cGUgPSBUeXBlZEFycmF5RmxvYXQ2NDsKKyAgICBpbnRwdHJfdCBt X3N0b3JhZ2VMZW5ndGg7CisgICAgdm9pZCogbV9zdG9yYWdlOwogcHJvdGVjdGVkOgogICAgIEpT RmxvYXQ2NEFycmF5KEpTQzo6U3RydWN0dXJlKiwgSlNET01HbG9iYWxPYmplY3QqLCBQYXNzUmVm UHRyPEZsb2F0NjRBcnJheT4pOwogICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oSlNDOjpKU0dsb2Jh bERhdGEmKTsK