135803 2014-08-11 09:40:34 -0700 Web Inspector: use type builders to construct high fidelity type information payloads 2014-08-11 12:20:08 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg burg commit-queue graouts joepeck saam timothy webkit-bug-importer oldest_to_newest 1028203 0 burg 2014-08-11 09:40:34 -0700 Due to a typo in Runtime.json, it seems that all of the payload construction code works with raw unchecked objects. We should use type builders. 1028204 1 webkit-bug-importer 2014-08-11 09:40:46 -0700 <rdar://problem/17977654> 1028220 2 236379 burg 2014-08-11 10:41:08 -0700 Created attachment 236379 Patch 1028221 3 commit-queue 2014-08-11 10:43:01 -0700 Attachment 236379 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/HighFidelityTypeProfiler.h:99: The parameter name "descriptor" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1028265 4 236379 commit-queue 2014-08-11 12:20:05 -0700 Comment on attachment 236379 Patch Clearing flags on attachment: 236379 Committed r172402: <http://trac.webkit.org/changeset/172402> 1028266 5 commit-queue 2014-08-11 12:20:08 -0700 All reviewed patches have been landed. Closing bug. 236379 2014-08-11 10:41:08 -0700 2014-08-11 12:20:04 -0700 Patch bug-135803-20140811104052.patch text/plain 19006 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ZGI2NjAzOTUxN2IyMDUzYzRkMGJmOTYzZTVmMTdjMzdhYzgzZDc2Li42YWI1NjI2ODQ1YjA1ZDVk ZTIzYjMzMzhhMGZmZjZjNDliNjM3MmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNC0wOC0xMSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlIHR5cGUgYnVpbGRlcnMgdG8gY29u c3RydWN0IGhpZ2ggZmlkZWxpdHkgdHlwZSBpbmZvcm1hdGlvbiBwYXlsb2FkcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODAzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHVlIHRvIHNvbWUgdHlwb3Mg aW4gdGhlIHByb3RvY29sIGZpbGUsIHRoZSBjb2RlIGhhZCB3b3JrZWQgd2l0aCByYXcgb2JqZWN0 cworICAgICAgICByYXRoZXIgdGhhbiB3aXRoIHR5cGUgYnVpbGRlcnMuIENvbnZlcnQgdG8gdXNp bmcgYnVpbGRlcnMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRp bWVBZ2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6Okluc3BlY3RvclJ1bnRpbWVBZ2VudDo6 Z2V0UnVudGltZVR5cGVzRm9yVmFyaWFibGVzQXRPZmZzZXRzKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9w cm90b2NvbC9SdW50aW1lLmpzb246IEZpeCAnaXRlbScgZm9yICdpdGVtcyc7IHRydWUgZm9yICd0 cnVlJy4KKyAgICAgICAgKiBydW50aW1lL0hpZ2hGaWRlbGl0eVR5cGVQcm9maWxlci5jcHA6Cisg ICAgICAgIChKU0M6OkhpZ2hGaWRlbGl0eVR5cGVQcm9maWxlcjo6Z2V0VHlwZXNGb3JWYXJpYWJs ZUF0T2Zmc2V0Rm9ySW5zcGVjdG9yKToKKyAgICAgICAgKiBydW50aW1lL0hpZ2hGaWRlbGl0eVR5 cGVQcm9maWxlci5oOgorICAgICAgICAqIHJ1bnRpbWUvVHlwZVNldC5jcHA6CisgICAgICAgIChK U0M6OlR5cGVTZXQ6OmFsbFN0cnVjdHVyZVJlcHJlc2VudGF0aW9ucyk6CisgICAgICAgIChKU0M6 OlN0cnVjdHVyZVNoYXBlOjpzdHJpbmdSZXByZXNlbnRhdGlvbik6CisgICAgICAgIChKU0M6OlN0 cnVjdHVyZVNoYXBlOjppbnNwZWN0b3JSZXByZXNlbnRhdGlvbik6CisgICAgICAgICogcnVudGlt ZS9UeXBlU2V0Lmg6CisKIDIwMTQtMDgtMTAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNv bT4KIAogICAgICAgICBEZXN0cnVjdHVyaW5nIGFzc2lnbm1lbnQgaW4gYSB2YXIgZGVjbGFyYXRp b24gbGlzdCBpbmNvcnJlY3RseSBjb25zdW1lcyBzdWJzZXF1ZW50IHZhcmlhYmxlIGluaXRpYWxp c2VycwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMv SW5zcGVjdG9yUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKaW5kZXggOWVmZWUxNWJkYjg0MTFj Y2JhM2ZhOTM5NDk2ZDVlYjk2ZDlmNDIwMy4uMGJiYjkwYjkwNzY1ZTg0MThmYjZhMjFkNDIyYzAw ZWUzMzNiZGM1YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9h Z2VudHMvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCkBAIC0xOTQsMTkg KzE5NCwxOSBAQCB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2VudDo6cnVuKEVycm9yU3RyaW5nKikK IHsKIH0KIAotdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmdldFJ1bnRpbWVUeXBlc0ZvclZh cmlhYmxlc0F0T2Zmc2V0cyhFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFJlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3RvckFycmF5PiYgaW5fbG9jYXRpb25zLCBSZWZQdHI8SW5zcGVjdG9y OjpJbnNwZWN0b3JBcnJheT4mIG91dF90eXBlcykKK3ZvaWQgSW5zcGVjdG9yUnVudGltZUFnZW50 OjpnZXRSdW50aW1lVHlwZXNGb3JWYXJpYWJsZXNBdE9mZnNldHMoRXJyb3JTdHJpbmcqIGVycm9y U3RyaW5nLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4mIGxvY2F0aW9u cywgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6VHlwZUJ1 aWxkZXI6OlJ1bnRpbWU6OlR5cGVEZXNjcmlwdGlvbj4+JiB0eXBlRGVzY3JpcHRpb25zKQogewog ICAgIHN0YXRpYyBjb25zdCBib29sIHZlcmJvc2UgPSBmYWxzZTsKICAgICBWTSYgdm0gPSBnbG9i YWxWTSgpOwotICAgIG91dF90eXBlcyA9IEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXk6OmNyZWF0 ZSgpOworICAgIHR5cGVEZXNjcmlwdGlvbnMgPSBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJh eTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1lOjpUeXBlRGVzY3JpcHRpb24+OjpjcmVh dGUoKTsKICAgICBpZiAoIXZtLmlzUHJvZmlsaW5nVHlwZXNXaXRoSGlnaEZpZGVsaXR5KCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIGRvdWJsZSBzdGFydCA9IGN1cnJlbnRUaW1lTVMoKTsKICAg ICB2bS5oaWdoRmlkZWxpdHlMb2coKS0+cHJvY2Vzc0hpZ2hGaWRlbGl0eUxvZygiVXNlciBRdWVy eSIpOwogCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBpbl9sb2NhdGlvbnMtPmxlbmd0aCgp OyBpKyspIHsKLSAgICAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yVmFsdWU+IHZhbHVl ID0gaW5fbG9jYXRpb25zLT5nZXQoaSk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsb2Nh dGlvbnMtPmxlbmd0aCgpOyBpKyspIHsKKyAgICAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVj dG9yVmFsdWU+IHZhbHVlID0gbG9jYXRpb25zLT5nZXQoaSk7CiAgICAgICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGxvY2F0aW9uOwogICAgICAgICBpZiAoIXZhbHVlLT5hc09iamVjdCgmbG9j YXRpb24pKSB7CiAgICAgICAgICAgICAqZXJyb3JTdHJpbmcgPSBBU0NJSUxpdGVyYWwoIkFycmF5 IG9mIFR5cGVMb2NhdGlvbiBvYmplY3RzIGhhcyBhbiBvYmplY3QgdGhhdCBkb2VzIG5vdCBoYXZl IHR5cGUgb2YgVHlwZUxvY2F0aW9uLiIpOwpAQCAtMjE5LDExICsyMTksMTEgQEAgdm9pZCBJbnNw ZWN0b3JSdW50aW1lQWdlbnQ6OmdldFJ1bnRpbWVUeXBlc0ZvclZhcmlhYmxlc0F0T2Zmc2V0cyhF cnJvclN0cmluZyogZXIKICAgICAgICAgbG9jYXRpb24tPmdldE51bWJlcihBU0NJSUxpdGVyYWwo InR5cGVJbmZvcm1hdGlvbkRlc2NyaXB0b3IiKSwgJmRlc2NyaXB0b3IpOwogICAgICAgICBsb2Nh dGlvbi0+Z2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgic291cmNlSUQiKSwgJnNvdXJjZUlEQXNTdHJp bmcpOwogICAgICAgICBsb2NhdGlvbi0+Z2V0TnVtYmVyKEFTQ0lJTGl0ZXJhbCgiZGl2b3QiKSwg JmRpdm90KTsKLSAgICAgICAgCi0gICAgICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9i amVjdD4gdHlwZURlc2NyaXB0aW9uID0gSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q6OmNyZWF0 ZSgpOworCisgICAgICAgIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1lOjpU eXBlRGVzY3JpcHRpb24+IHR5cGVEZXNjcmlwdGlvbiA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6 OlJ1bnRpbWU6OlR5cGVEZXNjcmlwdGlvbjo6Y3JlYXRlKCk7CiAgICAgICAgIGJvb2wgb2theTsK ICAgICAgICAgdm0uaGlnaEZpZGVsaXR5VHlwZVByb2ZpbGVyKCktPmdldFR5cGVzRm9yVmFyaWFi bGVBdE9mZnNldEZvckluc3BlY3RvcihzdGF0aWNfY2FzdDxUeXBlUHJvZmlsZXJTZWFyY2hEZXNj cmlwdG9yPihkZXNjcmlwdG9yKSwgZGl2b3QsIHNvdXJjZUlEQXNTdHJpbmcudG9JbnRQdHJTdHJp Y3QoJm9rYXkpLCB0eXBlRGVzY3JpcHRpb24pOwotICAgICAgICBvdXRfdHlwZXMtPnB1c2hPYmpl Y3QodHlwZURlc2NyaXB0aW9uKTsKKyAgICAgICAgdHlwZURlc2NyaXB0aW9ucy0+YWRkSXRlbSh0 eXBlRGVzY3JpcHRpb24pOwogICAgIH0KIAogICAgIGRvdWJsZSBlbmQgPSBjdXJyZW50VGltZU1T KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JSdW50aW1lQWdlbnQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCmluZGV4IDc2ZDMzNzIxZjlhZGM2ZWMwNmFm OTAyNWQzNDg2M2MzMDM0NDNmZDkuLjExNTUwZDA2ODRlYWVmNzc4OWVkYTlmZDViODBjZDgxY2Jk NjdmYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRz L0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCkBAIC02Niw3ICs2Niw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZ2V0UHJvcGVydGllcyhFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IGJvb2wqIG93blByb3BlcnRpZXMsIFJlZlB0cjxJbnNw ZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1l OjpQcm9wZXJ0eURlc2NyaXB0b3I+PiYgcmVzdWx0LCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVp bGRlcjo6QXJyYXk8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UnVudGltZTo6SW50ZXJuYWxQcm9w ZXJ0eURlc2NyaXB0b3I+PiYgaW50ZXJuYWxQcm9wZXJ0aWVzKSBvdmVycmlkZSBmaW5hbDsKICAg ICB2aXJ0dWFsIHZvaWQgcmVsZWFzZU9iamVjdEdyb3VwKEVycm9yU3RyaW5nKiwgY29uc3QgU3Ry aW5nJiBvYmplY3RHcm91cCkgb3ZlcnJpZGUgZmluYWw7CiAgICAgdmlydHVhbCB2b2lkIHJ1bihF cnJvclN0cmluZyopIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBnZXRSdW50aW1lVHlwZXNG b3JWYXJpYWJsZXNBdE9mZnNldHMoRXJyb3JTdHJpbmcqLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9y OjpJbnNwZWN0b3JBcnJheT4mIGluX2xvY2F0aW9ucywgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVj dG9yQXJyYXk+JiBvdXRfdHlwZXMpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBnZXRSdW50 aW1lVHlwZXNGb3JWYXJpYWJsZXNBdE9mZnNldHMoRXJyb3JTdHJpbmcqLCBjb25zdCBSZWZQdHI8 SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4mIGxvY2F0aW9ucywgUmVmUHRyPEluc3BlY3Rvcjo6 VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlR5cGVE ZXNjcmlwdGlvbj4+Jikgb3ZlcnJpZGU7CiAgICAgCiAgICAgdm9pZCBzZXRTY3JpcHREZWJ1Z1Nl cnZlcihTY3JpcHREZWJ1Z1NlcnZlciogc2NyaXB0RGVidWdTZXJ2ZXIpIHsgbV9zY3JpcHREZWJ1 Z1NlcnZlciA9IHNjcmlwdERlYnVnU2VydmVyOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvUnVudGltZS5qc29uIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24KaW5kZXggNjRkNzIzYjI1 MWU0YmI4Y2FiODhhMTFjYWY0MTMzZTY4Mjc3YzQ2MC4uOGQ4YTNkYTI4YmJjYTk3Y2UzMTcxNWUy NmQwZGQ4M2I2Mzk4ZWQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9wcm90b2NvbC9SdW50aW1lLmpzb24KQEAgLTExNiw5ICsxMTYsOSBAQAogICAgICAg ICAgICAgImlkIjogIlN0cnVjdHVyZURlc2NyaXB0aW9uIiwKICAgICAgICAgICAgICJ0eXBlIjog Im9iamVjdCIsCiAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImZpZWxkcyIsICJ0eXBlIjogImFycmF5IiwgICJpdGVtcyI6IHsgInR5cGUiOiAi c3RyaW5nIiB9LCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2Ygc3RyaW5ncywgd2hlcmUgdGhlIHN0 cmluZ3MgcmVwcmVzZW50IG9iamVjdCBwcm9wZXJ0aWVzLiIgfSwKLSAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImNvbnN0cnVjdG9yTmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJOYW1lIG9mIHRoZSBjb25zdHJ1Y3Rvci4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJwcm90b3R5cGVTdHJ1Y3R1cmUiLCAiJHJlZiI6ICJTdHJ1Y3R1cmVEZXNjcmlwdGlvbiIs ICJvcHRpb25hbCI6ICJ0cnVlIiwgImRlc2NyaXB0aW9uIjogIlBvaW50ZXIgdG8gdGhlIFN0cnVj dHVyZVJlcHJlc2VudGF0aW9uIG9mIHRoZSBwcm90b3lwZSBpZiBvbmUgZXhpc3RzLiIgfQorICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZmllbGRzIiwgInR5cGUiOiAiYXJyYXkiLCAgIml0ZW1z IjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6 ICJBcnJheSBvZiBzdHJpbmdzLCB3aGVyZSB0aGUgc3RyaW5ncyByZXByZXNlbnQgb2JqZWN0IHBy b3BlcnRpZXMuIiB9LAorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29uc3RydWN0b3JOYW1l IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk5h bWUgb2YgdGhlIGNvbnN0cnVjdG9yLiIgfSwKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBy b3RvdHlwZVN0cnVjdHVyZSIsICIkcmVmIjogIlN0cnVjdHVyZURlc2NyaXB0aW9uIiwgIm9wdGlv bmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlBvaW50ZXIgdG8gdGhlIFN0cnVjdHVyZVJlcHJl c2VudGF0aW9uIG9mIHRoZSBwcm90b3lwZSBpZiBvbmUgZXhpc3RzLiIgfQogICAgICAgICAgICAg XQogICAgICAgICB9LAogICAgICAgICB7CkBAIC0xMjcsOCArMTI3LDggQEAKICAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJDb250YWluZXIgZm9yIHR5cGUgaW5mb3JtYXRpb24gdGhhdCBoYXMg YmVlbiBnYXRoZXJlZC4iLAogICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJkaXNwbGF5VHlwZU5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiV2hhdCB0aGUgaW5zcGVjdG9yIHNob3VsZCBk aXNwbGF5IGFzIGEgc2ltcGxlIHR5cGUuIiB9LAotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi bG9jYWxQcmltaXRpdmVUeXBlTmFtZXMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5 cGUiOiAic3RyaW5nIiB9LCAib3B0aW9uYWwiOiAidHJ1ZSIsICJkZXNjcmlwdGlvbiI6ICJBcnJh eSBvZiB0eXBlIG5hbWVzIGZvciBwcmltdGl2ZSB0eXBlcyAoaW50LCBzdHJpbmcsIGV0Yykgc2Vl biBhdCBhbiBpbnN0cnVjdGlvbiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvY2Fs T2JqZWN0VHlwZU5hbWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICJ0eXBlIjogInN0 cmluZyIgfSwgIm9wdGlvbmFsIjogInRydWUiLCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2YgdHlw ZSBuYW1lcyBmb3IgYWxsIG9iamVjdCBzZWVuIGF0IGFuIGluc3RydWN0aW9uIiB9LAorICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibG9jYWxQcmltaXRpdmVUeXBlTmFtZXMiLCAidHlwZSI6ICJh cnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5nIiB9LCAib3B0aW9uYWwiOiB0cnVlLCAi ZGVzY3JpcHRpb24iOiAiQXJyYXkgb2YgdHlwZSBuYW1lcyBmb3IgcHJpbXRpdmUgdHlwZXMgKGlu dCwgc3RyaW5nLCBldGMpIHNlZW4gYXQgYW4gaW5zdHJ1Y3Rpb24iIH0sCisgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJsb2NhbE9iamVjdFR5cGVOYW1lcyIsICJ0eXBlIjogImFycmF5IiwgIml0 ZW1zIjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJBcnJheSBvZiB0eXBlIG5hbWVzIGZvciBhbGwgb2JqZWN0IHNlZW4gYXQgYW4gaW5zdHJ1 Y3Rpb24iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb2NhbFN0cnVjdHVyZXMiLCAi dHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiU3RydWN0dXJlRGVzY3JpcHRpb24i IH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJBcnJheSBvZiBkZXNjcmlwdGlv bnMgZm9yIGFsbCBzdHJ1Y3R1cmVzIHNlZW4gYXQgdGhpcyB0aGlzIGluc3RydWN0aW9uLiIgfSwK ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdsb2JhbFByaW1pdGl2ZVR5cGVOYW1lcyIsICJ0 eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJBcnJheSBvZiB0eXBlIG5hbWVzIGZvciBhbGwgcHJpbWl0 aXZlIHR5cGVzIHNlZW4gZ2xvYmFsbHkuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi Z2xvYmFsT2JqZWN0VHlwZU5hbWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICJ0eXBl IjogInN0cmluZyIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkFycmF5IG9m IHR5cGUgbmFtZXMgZm9yIGFsbCBwcmltaXRpdmUgdHlwZXMgc2VlbiBnbG9iYWxseS4iIH0sCkBA IC0yMzYsNyArMjM2LDcgQEAKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvY2F0aW9ucyIs ICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJUeXBlTG9jYXRpb24iIH0sICJk ZXNjcmlwdGlvbiI6ICJBbiBhcnJheSBvZiB0eXBlIGxvY2F0aW9ucyB3ZSdyZSByZXF1ZXN0aW5n IGluZm9ybWF0aW9uIGZvci4gUmVzdWx0cyBhcmUgZXhwZWN0ZWQgaW4gdGhlIHNhbWUgb3JkZXIg dGhleSdyZSBzZW50IGluLiJ9CiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgInJldHVybnMi OiBbCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlcyIsICJ0eXBlIjogImFycmF5Iiwg Iml0ZW0iOiB7ICIkcmVmIjogIlR5cGVEZXNjcmlwdGlvbiIsICJkZXNjcmlwdGlvbiI6ICJUeXBl cyBmb3IgcmVxdWVzdGVkIHZhcmlhYmxlLiIgfSB9CisgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJ0eXBlcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJUeXBlRGVzY3Jp cHRpb24iLCAiZGVzY3JpcHRpb24iOiAiVHlwZXMgZm9yIHJlcXVlc3RlZCB2YXJpYWJsZS4iIH0g fQogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGRl dGFpbGVkIGluZm9ybXRhdGlvbiBvbiBnaXZlbiBmdW5jdGlvbi4iCiAgICAgICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hpZ2hGaWRlbGl0eVR5cGVQcm9m aWxlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IaWdoRmlkZWxpdHlUeXBl UHJvZmlsZXIuY3BwCmluZGV4IGRjZjEwODVhODFhMmRlNDBiOWUyMzc0ZWQzY2ZlNDA0NjAyMzNm ZDAuLmZmZDFiMTFkZmFmODQyZmVmOGZmYzAzYjRiNTJmMjM2NWMzMjg5NjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hpZ2hGaWRlbGl0eVR5cGVQcm9maWxlci5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGlnaEZpZGVsaXR5VHlwZVBy b2ZpbGVyLmNwcApAQCAtNjksMjEgKzY5LDIxIEBAIHZvaWQgSGlnaEZpZGVsaXR5VHlwZVByb2Zp bGVyOjppbnNlcnROZXdMb2NhdGlvbihUeXBlTG9jYXRpb24qIGxvY2F0aW9uKQogICAgIGJ1Y2tl dC5hcHBlbmQobG9jYXRpb24pOwogfQogCi12b2lkIEhpZ2hGaWRlbGl0eVR5cGVQcm9maWxlcjo6 Z2V0VHlwZXNGb3JWYXJpYWJsZUF0T2Zmc2V0Rm9ySW5zcGVjdG9yKFR5cGVQcm9maWxlclNlYXJj aERlc2NyaXB0b3IgZGVzY3JpcHRvciwgdW5zaWduZWQgZGl2b3QsIGludHB0cl90IHNvdXJjZUlE LCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+JiByZXQpCit2b2lkIEhpZ2hGaWRl bGl0eVR5cGVQcm9maWxlcjo6Z2V0VHlwZXNGb3JWYXJpYWJsZUF0T2Zmc2V0Rm9ySW5zcGVjdG9y KFR5cGVQcm9maWxlclNlYXJjaERlc2NyaXB0b3IgZGVzY3JpcHRvciwgdW5zaWduZWQgZGl2b3Qs IGludHB0cl90IHNvdXJjZUlELCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UnVudGlt ZTo6VHlwZURlc2NyaXB0aW9uPiYgZGVzY3JpcHRpb24pCiB7CiAgICAgVHlwZUxvY2F0aW9uKiBs b2NhdGlvbiA9IGZpbmRMb2NhdGlvbihkaXZvdCwgc291cmNlSUQsIGRlc2NyaXB0b3IpOwogICAg IGlmICghbG9jYXRpb24pCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChsb2NhdGlvbi0+bV9n bG9iYWxUeXBlU2V0ICYmIGxvY2F0aW9uLT5tX2dsb2JhbFZhcmlhYmxlSUQgIT0gSGlnaEZpZGVs aXR5Tm9HbG9iYWxJREV4aXN0cykgewotICAgICAgICByZXQtPnNldFN0cmluZyhBU0NJSUxpdGVy YWwoImRpc3BsYXlUeXBlTmFtZSIpLCBsb2NhdGlvbi0+bV9nbG9iYWxUeXBlU2V0LT5kaXNwbGF5 TmFtZSgpKTsKLSAgICAgICAgcmV0LT5zZXRBcnJheShBU0NJSUxpdGVyYWwoImdsb2JhbFByaW1p dGl2ZVR5cGVOYW1lcyIpLCBsb2NhdGlvbi0+bV9nbG9iYWxUeXBlU2V0LT5hbGxQcmltaXRpdmVU eXBlTmFtZXMoKS0+YXNBcnJheSgpKTsKLSAgICAgICAgcmV0LT5zZXRBcnJheShBU0NJSUxpdGVy YWwoImdsb2JhbFN0cnVjdHVyZXMiKSwgbG9jYXRpb24tPm1fZ2xvYmFsVHlwZVNldC0+YWxsU3Ry dWN0dXJlUmVwcmVzZW50YXRpb25zKCktPmFzQXJyYXkoKSk7CisgICAgICAgIGRlc2NyaXB0aW9u LT5zZXREaXNwbGF5VHlwZU5hbWUobG9jYXRpb24tPm1fZ2xvYmFsVHlwZVNldC0+ZGlzcGxheU5h bWUoKSk7CisgICAgICAgIGRlc2NyaXB0aW9uLT5zZXRHbG9iYWxQcmltaXRpdmVUeXBlTmFtZXMo bG9jYXRpb24tPm1fZ2xvYmFsVHlwZVNldC0+YWxsUHJpbWl0aXZlVHlwZU5hbWVzKCkpOworICAg ICAgICBkZXNjcmlwdGlvbi0+c2V0R2xvYmFsU3RydWN0dXJlcyhsb2NhdGlvbi0+bV9nbG9iYWxU eXBlU2V0LT5hbGxTdHJ1Y3R1cmVSZXByZXNlbnRhdGlvbnMoKSk7CiAgICAgfSBlbHNlCi0gICAg ICAgIHJldC0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgiZGlzcGxheVR5cGVOYW1lIiksIGxvY2F0 aW9uLT5tX2luc3RydWN0aW9uVHlwZVNldC0+ZGlzcGxheU5hbWUoKSk7CisgICAgICAgIGRlc2Ny aXB0aW9uLT5zZXREaXNwbGF5VHlwZU5hbWUobG9jYXRpb24tPm1faW5zdHJ1Y3Rpb25UeXBlU2V0 LT5kaXNwbGF5TmFtZSgpKTsKIAotICAgIHJldC0+c2V0QXJyYXkoQVNDSUlMaXRlcmFsKCJsb2Nh bFByaW1pdGl2ZVR5cGVOYW1lcyIpLCBsb2NhdGlvbi0+bV9pbnN0cnVjdGlvblR5cGVTZXQtPmFs bFByaW1pdGl2ZVR5cGVOYW1lcygpLT5hc0FycmF5KCkpOwotICAgIHJldC0+c2V0QXJyYXkoQVND SUlMaXRlcmFsKCJsb2NhbFN0cnVjdHVyZXMiKSwgbG9jYXRpb24tPm1faW5zdHJ1Y3Rpb25UeXBl U2V0LT5hbGxTdHJ1Y3R1cmVSZXByZXNlbnRhdGlvbnMoKS0+YXNBcnJheSgpKTsKKyAgICBkZXNj cmlwdGlvbi0+c2V0TG9jYWxQcmltaXRpdmVUeXBlTmFtZXMobG9jYXRpb24tPm1faW5zdHJ1Y3Rp b25UeXBlU2V0LT5hbGxQcmltaXRpdmVUeXBlTmFtZXMoKSk7CisgICAgZGVzY3JpcHRpb24tPnNl dExvY2FsU3RydWN0dXJlcyhsb2NhdGlvbi0+bV9pbnN0cnVjdGlvblR5cGVTZXQtPmFsbFN0cnVj dHVyZVJlcHJlc2VudGF0aW9ucygpKTsKIH0KIAogc3RhdGljIGJvb2wgZGVzY3JpcHRvck1hdGNo ZXNUeXBlTG9jYXRpb24oVHlwZVByb2ZpbGVyU2VhcmNoRGVzY3JpcHRvciBkZXNjcmlwdG9yLCBU eXBlTG9jYXRpb24qIGxvY2F0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSGlnaEZpZGVsaXR5VHlwZVByb2ZpbGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9IaWdoRmlkZWxpdHlUeXBlUHJvZmlsZXIuaAppbmRleCAxOTU1ZDU5YTE5YjU5 YmExMzM3MTRlNTY3MDVmMTM3ZGQyODVmMWYxLi4xZDZlNmY0ODdmN2Q2MzBmZmQwZDkwMjczNDFk NzM5YzUwZDUyNDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9I aWdoRmlkZWxpdHlUeXBlUHJvZmlsZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9IaWdoRmlkZWxpdHlUeXBlUHJvZmlsZXIuaApAQCAtMzYsOSArMzYsNiBAQAogbmFtZXNw YWNlIEluc3BlY3RvciB7IG5hbWVzcGFjZSBUeXBlQnVpbGRlciAgeyBuYW1lc3BhY2UgUnVudGlt ZSB7CiBjbGFzcyBUeXBlRGVzY3JpcHRpb247CiB9fX0KLW5hbWVzcGFjZSBJbnNwZWN0b3Igewot Y2xhc3MgSW5zcGVjdG9yT2JqZWN0OwotfQogCiBuYW1lc3BhY2UgSlNDIHsKIApAQCAtOTksNyAr OTYsNyBAQCBlbnVtIFR5cGVQcm9maWxlclNlYXJjaERlc2NyaXB0b3IgewogY2xhc3MgSGlnaEZp ZGVsaXR5VHlwZVByb2ZpbGVyIHsKIHB1YmxpYzoKICAgICB2b2lkIGxvZ1R5cGVzRm9yVHlwZUxv Y2F0aW9uKFR5cGVMb2NhdGlvbiopOwotICAgIHZvaWQgZ2V0VHlwZXNGb3JWYXJpYWJsZUF0T2Zm c2V0Rm9ySW5zcGVjdG9yKFR5cGVQcm9maWxlclNlYXJjaERlc2NyaXB0b3IgZGVzY3JpcHRvciwg dW5zaWduZWQgZGl2b3QsIGludHB0cl90IHNvdXJjZUlELCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNw ZWN0b3JPYmplY3Q+Jik7CisgICAgdm9pZCBnZXRUeXBlc0ZvclZhcmlhYmxlQXRPZmZzZXRGb3JJ bnNwZWN0b3IoVHlwZVByb2ZpbGVyU2VhcmNoRGVzY3JpcHRvciBkZXNjcmlwdG9yLCB1bnNpZ25l ZCBkaXZvdCwgaW50cHRyX3Qgc291cmNlSUQsIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVy OjpSdW50aW1lOjpUeXBlRGVzY3JpcHRpb24+Jik7CiAgICAgdm9pZCBpbnNlcnROZXdMb2NhdGlv bihUeXBlTG9jYXRpb24qKTsKICAgICBGdW5jdGlvbkhhc0V4ZWN1dGVkQ2FjaGUqIGZ1bmN0aW9u SGFzRXhlY3V0ZWRDYWNoZSgpIHsgcmV0dXJuICZtX2Z1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZTsg fQogICAgIFR5cGVMb2NhdGlvbkNhY2hlKiB0eXBlTG9jYXRpb25DYWNoZSgpIHsgcmV0dXJuICZt X3R5cGVMb2NhdGlvbkNhY2hlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9UeXBlU2V0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVT ZXQuY3BwCmluZGV4IDA3NzkwZmE0NDQyM2I3YTRlY2MwYjIyMzU0MTEwNTVkOTc0YTVjYWQuLjYz NDQwYmFiY2FkZThkYTY2ZWE2ZjhhZTkwZjM1ZTg0MzgzZjRmZTAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuY3BwCkBAIC0yMzYsMTQgKzIzNiwxNCBAQCBQYXNzUmVm UHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4+IFR5cGVTZXQ6OmFsbFBy aW1pdGl2ZVR5cGVOYW1lcwogICAgIHJldHVybiBzZWVuLnJlbGVhc2UoKTsKIH0KIAotUGFzc1Jl ZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6Okluc3BlY3Rvck9i amVjdD4+IFR5cGVTZXQ6OmFsbFN0cnVjdHVyZVJlcHJlc2VudGF0aW9ucygpIGNvbnN0CitQYXNz UmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6VHlwZUJ1aWxk ZXI6OlJ1bnRpbWU6OlN0cnVjdHVyZURlc2NyaXB0aW9uPj4gVHlwZVNldDo6YWxsU3RydWN0dXJl UmVwcmVzZW50YXRpb25zKCkgY29uc3QKIHsKLSAgICBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVp bGRlcjo6QXJyYXk8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+PiByZXQgPSBJbnNwZWN0b3I6 OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD46OmNyZWF0ZSgp OworICAgIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpSdW50aW1lOjpTdHJ1Y3R1cmVEZXNjcmlwdGlvbj4+IGRlc2NyaXB0aW9uID0g SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UnVu dGltZTo6U3RydWN0dXJlRGVzY3JpcHRpb24+OjpjcmVhdGUoKTsKIAogICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgbV9zdHJ1Y3R1cmVIaXN0b3J5LT5zaXplKCk7IGkrKykKLSAgICAgICAgcmV0 LT5hZGRJdGVtKG1fc3RydWN0dXJlSGlzdG9yeS0+YXQoaSktPmluc3BlY3RvclJlcHJlc2VudGF0 aW9uKCkpOworICAgICAgICBkZXNjcmlwdGlvbi0+YWRkSXRlbShtX3N0cnVjdHVyZUhpc3Rvcnkt PmF0KGkpLT5pbnNwZWN0b3JSZXByZXNlbnRhdGlvbigpKTsKIAotICAgIHJldHVybiByZXQucmVs ZWFzZSgpOworICAgIHJldHVybiBkZXNjcmlwdGlvbi5yZWxlYXNlKCk7CiB9CiAKIFN0cmluZyBU eXBlU2V0OjpsZWFzdENvbW1vbkFuY2VzdG9yKCkgY29uc3QKQEAgLTM0MSw4ICszNDEsOCBAQCBT dHJpbmcgU3RydWN0dXJlU2hhcGU6OnN0cmluZ1JlcHJlc2VudGF0aW9uKCkKIAogICAgIHJlcHJl c2VudGF0aW9uLmFwcGVuZCgieyIpOwogICAgIHdoaWxlIChjdXJTaGFwZSkgewotICAgICAgICBm b3IgKGF1dG8gaXRlciA9IGN1clNoYXBlLT5tX2ZpZWxkcy5iZWdpbigpLCBlbmQgPSBjdXJTaGFw ZS0+bV9maWVsZHMuZW5kKCk7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpIHsKLSAgICAgICAgICAgIFN0 cmluZyBwcm9wKCgqaXRlcikuZ2V0KCkpOworICAgICAgICBmb3IgKGF1dG8gaXQgPSBjdXJTaGFw ZS0+bV9maWVsZHMuYmVnaW4oKSwgZW5kID0gY3VyU2hhcGUtPm1fZmllbGRzLmVuZCgpOyBpdCAh PSBlbmQ7ICsraXQpIHsKKyAgICAgICAgICAgIFN0cmluZyBwcm9wKCgqaXQpLmdldCgpKTsKICAg ICAgICAgICAgIHJlcHJlc2VudGF0aW9uLmFwcGVuZChwcm9wKTsKICAgICAgICAgICAgIHJlcHJl c2VudGF0aW9uLmFwcGVuZCgiLCAiKTsKICAgICAgICAgfQpAQCAtMzY0LDIzICszNjQsMjMgQEAg U3RyaW5nIFN0cnVjdHVyZVNoYXBlOjpzdHJpbmdSZXByZXNlbnRhdGlvbigpCiAgICAgcmV0dXJu IHJlcHJlc2VudGF0aW9uLnRvU3RyaW5nKCk7CiB9CiAKLVBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJ bnNwZWN0b3JPYmplY3Q+IFN0cnVjdHVyZVNoYXBlOjppbnNwZWN0b3JSZXByZXNlbnRhdGlvbigp CitQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN0cnVjdHVyZURl c2NyaXB0aW9uPiBTdHJ1Y3R1cmVTaGFwZTo6aW5zcGVjdG9yUmVwcmVzZW50YXRpb24oKQogewot ICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gYmFzZSA9IEluc3BlY3Rvcjo6 SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0 b3JPYmplY3Q+IGN1cnJlbnRPYmplY3QgPSBiYXNlOworICAgIFJlZlB0cjxJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpSdW50aW1lOjpTdHJ1Y3R1cmVEZXNjcmlwdGlvbj4gYmFzZSA9IEluc3BlY3Rv cjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN0cnVjdHVyZURlc2NyaXB0aW9uOjpjcmVhdGUoKTsK KyAgICBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UnVudGltZTo6U3RydWN0dXJlRGVz Y3JpcHRpb24+IGN1cnJlbnRPYmplY3QgPSBiYXNlOwogICAgIFJlZlB0cjxTdHJ1Y3R1cmVTaGFw ZT4gY3VycmVudFNoYXBlID0gdGhpczsKIAogICAgIHdoaWxlIChjdXJyZW50U2hhcGUpIHsKLSAg ICAgICAgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4+IGZpZWxk cyA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz46OmNyZWF0ZSgpOwotICAg ICAgICBmb3IgKGF1dG8gaXRlciA9IGN1cnJlbnRTaGFwZS0+bV9maWVsZHMuYmVnaW4oKSwgZW5k ID0gY3VycmVudFNoYXBlLT5tX2ZpZWxkcy5lbmQoKTsgaXRlciAhPSBlbmQ7ICsraXRlcikKLSAg ICAgICAgICAgIGZpZWxkcy0+YWRkSXRlbSgoKml0ZXIpLmdldCgpKTsKKyAgICAgICAgYXV0byBm aWVsZHMgPSBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+OjpjcmVhdGUoKTsK KyAgICAgICAgZm9yIChhdXRvIGl0ID0gY3VycmVudFNoYXBlLT5tX2ZpZWxkcy5iZWdpbigpLCBl bmQgPSBjdXJyZW50U2hhcGUtPm1fZmllbGRzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAg ICAgICAgICBmaWVsZHMtPmFkZEl0ZW0oKCppdCkuZ2V0KCkpOwogCi0gICAgICAgIGN1cnJlbnRP YmplY3QtPnNldEFycmF5KEFTQ0lJTGl0ZXJhbCgiZmllbGRzIiksIGZpZWxkcy0+YXNBcnJheSgp KTsKLSAgICAgICAgY3VycmVudE9iamVjdC0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgiY29uc3Ry dWN0b3JOYW1lIiksIGN1cnJlbnRTaGFwZS0+bV9jb25zdHJ1Y3Rvck5hbWUpOworICAgICAgICBj dXJyZW50T2JqZWN0LT5zZXRGaWVsZHMoZmllbGRzKTsKKyAgICAgICAgY3VycmVudE9iamVjdC0+ c2V0Q29uc3RydWN0b3JOYW1lKGN1cnJlbnRTaGFwZS0+bV9jb25zdHJ1Y3Rvck5hbWUpOwogCiAg ICAgICAgIGlmIChjdXJyZW50U2hhcGUtPm1fcHJvdG8pIHsKLSAgICAgICAgICAgIFJlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gbmV4dE9iamVjdCA9IEluc3BlY3Rvcjo6SW5zcGVj dG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICAgICAgICAgIGN1cnJlbnRPYmplY3QtPnNldE9iamVj dChBU0NJSUxpdGVyYWwoInByb3RvdHlwZVN0cnVjdHVyZSIpLCBuZXh0T2JqZWN0KTsKKyAgICAg ICAgICAgIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1lOjpTdHJ1Y3R1cmVE ZXNjcmlwdGlvbj4gbmV4dE9iamVjdCA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6 OlN0cnVjdHVyZURlc2NyaXB0aW9uOjpjcmVhdGUoKTsKKyAgICAgICAgICAgIGN1cnJlbnRPYmpl Y3QtPnNldFByb3RvdHlwZVN0cnVjdHVyZShuZXh0T2JqZWN0KTsKICAgICAgICAgICAgIGN1cnJl bnRPYmplY3QgPSBuZXh0T2JqZWN0OwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1R5cGVTZXQuaAppbmRleCAwNzBmZjFlMzZjYTEwOTg5YzVjYzQxYzk1YjQxZTUwNGY0 Y2E5Zjc0Li41NzQ3ZGRmMjliOGZmZWNjYjE3ZmJkMTFhYmQ5MDBmMTk5YzFhNDg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UeXBlU2V0LmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZVNldC5oCkBAIC0zMiwxMyArMzIsMTUgQEAKICNp bmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAK LW5hbWVzcGFjZSBJbnNwZWN0b3IgeyBuYW1lc3BhY2UgVHlwZUJ1aWxkZXIgIHsgCi10ZW1wbGF0 ZTx0eXBlbmFtZSBUPgotY2xhc3MgQXJyYXk7Ci19fQorbmFtZXNwYWNlIEluc3BlY3RvciB7Citu YW1lc3BhY2UgVHlwZUJ1aWxkZXIgIHsKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIEFycmF5 OwogCi1uYW1lc3BhY2UgSW5zcGVjdG9yIHsgCi1jbGFzcyBJbnNwZWN0b3JPYmplY3Q7CituYW1l c3BhY2UgUnVudGltZSB7CitjbGFzcyBTdHJ1Y3R1cmVEZXNjcmlwdGlvbjsKK30KKworfQogfQog CiBuYW1lc3BhY2UgSlNDIHsKQEAgLTY4LDcgKzcwLDcgQEAgcHVibGljOgogICAgIHZvaWQgbWFy a0FzRmluYWwoKTsKICAgICB2b2lkIGFkZFByb3BlcnR5KFJlZlB0cjxTdHJpbmdJbXBsPik7CiAg ICAgU3RyaW5nIHN0cmluZ1JlcHJlc2VudGF0aW9uKCk7Ci0gICAgUGFzc1JlZlB0cjxJbnNwZWN0 b3I6Okluc3BlY3Rvck9iamVjdD4gaW5zcGVjdG9yUmVwcmVzZW50YXRpb24oKTsKKyAgICBQYXNz UmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN0cnVjdHVyZURlc2NyaXB0 aW9uPiBpbnNwZWN0b3JSZXByZXNlbnRhdGlvbigpOwogICAgIHZvaWQgc2V0Q29uc3RydWN0b3JO YW1lKFN0cmluZyBuYW1lKSB7IG1fY29uc3RydWN0b3JOYW1lID0gKG5hbWUuaXNFbXB0eSgpID8g Ik9iamVjdCIgOiBuYW1lKTsgfQogICAgIFN0cmluZyBjb25zdHJ1Y3Rvck5hbWUoKSB7IHJldHVy biBtX2NvbnN0cnVjdG9yTmFtZTsgfQogICAgIHZvaWQgc2V0UHJvdG8oUGFzc1JlZlB0cjxTdHJ1 Y3R1cmVTaGFwZT4gc2hhcGUpIHsgbV9wcm90byA9IHNoYXBlOyB9CkBAIC05Myw3ICs5NSw3IEBA IHB1YmxpYzoKICAgICBKU19FWFBPUlRfUFJJVkFURSBTdHJpbmcgc2VlblR5cGVzKCkgY29uc3Q7 CiAgICAgU3RyaW5nIGRpc3BsYXlOYW1lKCkgY29uc3Q7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+PiBhbGxQcmltaXRpdmVUeXBlTmFtZXMoKSBj b25zdDsKLSAgICBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3Bl Y3Rvcjo6SW5zcGVjdG9yT2JqZWN0Pj4gYWxsU3RydWN0dXJlUmVwcmVzZW50YXRpb25zKCkgY29u c3Q7CisgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpSdW50aW1lOjpTdHJ1Y3R1cmVEZXNjcmlwdGlvbj4+IGFsbFN0cnVj dHVyZVJlcHJlc2VudGF0aW9ucygpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0cmluZyBsZWFz dENvbW1vbkFuY2VzdG9yKCkgY29uc3Q7Cg==