102746 2012-11-19 17:26:20 -0800 In the IDL parser, we should rename $dataNode to $interface 2012-11-19 18:18:56 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet timothy webkit.review.bot oldest_to_newest 771260 0 haraken 2012-11-19 17:26:20 -0800 $dataNode is misnamed. It should be $interface. 771262 1 175091 haraken 2012-11-19 17:27:23 -0800 Created attachment 175091 Patch 771276 2 175091 abarth 2012-11-19 17:36:17 -0800 Comment on attachment 175091 Patch ok 771280 3 timothy 2012-11-19 17:37:42 -0800 This is fine for us. 771347 4 175091 webkit.review.bot 2012-11-19 18:18:53 -0800 Comment on attachment 175091 Patch Clearing flags on attachment: 175091 Committed r135229: <http://trac.webkit.org/changeset/135229> 771348 5 webkit.review.bot 2012-11-19 18:18:56 -0800 All reviewed patches have been landed. Closing bug. 175091 2012-11-19 17:27:23 -0800 2012-11-19 18:18:53 -0800 Patch bug-102746-20121120102513.patch text/plain 19185 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY1NjgwMDcyZjhhZTE4 NjYwZWJkMTlhNjg1OTlkNjNjMzNlM2M2Zi4uNTgxZmEzNTc0OGNjODcyOWEzZTBiOTBlYTE3NTUw YTdmMzUxNDk0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTExLTE5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbiB0aGUgSURMIHBh cnNlciwgd2Ugc2hvdWxkIHJlbmFtZSAkZGF0YU5vZGUgdG8gJGludGVyZmFjZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNzQ2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgJGRhdGFOb2RlIGlzIG1pc25h bWVkLiBJdCBzaG91bGQgYmUgJGludGVyZmFjZS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hh bmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIu cG06CisgICAgICAgIChwYXJzZUludGVyZmFjZSk6CisgICAgICAgIChwYXJzZUV4Y2VwdGlvbik6 CisgICAgICAgIChwYXJzZUF0dHJpYnV0ZU9yT3BlcmF0aW9uUmVzdCk6CisgICAgICAgIChwYXJz ZU9wZXJhdGlvbk9ySXRlcmF0b3IpOgorICAgICAgICAocGFyc2VTcGVjaWFsT3BlcmF0aW9uKToK KyAgICAgICAgKHBhcnNlSW50ZXJmYWNlT2xkKToKKyAgICAgICAgKHBhcnNlRXhjZXB0aW9uT2xk KToKKyAgICAgICAgKHBhcnNlQXR0cmlidXRlT3JPcGVyYXRpb25Pckl0ZXJhdG9yT2xkKToKKyAg ICAgICAgKHBhcnNlQXR0cmlidXRlT3JPcGVyYXRpb25SZXN0T2xkKToKKyAgICAgICAgKGFwcGx5 TWVtYmVyTGlzdCk6CisgICAgICAgIChhcHBseUV4dGVuZGVkQXR0cmlidXRlTGlzdCk6CisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbDoKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbDoKKyAgICAgICAgKGNoZWNrSURMQXR0 cmlidXRlcyk6CisKIDIwMTItMTEtMTkgIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4K IAogICAgICAgICBOb3QgcmV2aWV3ZWQuIEJ1aWxkIGZpeCBmb3IgQ2hyb21pdW0uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbSBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCmluZGV4IGY4NmQ2ZjdlN2M2 YWQ0ZGMyMTY5NTE5NWQ4ZjYxZWE1ODIxNjA1YjYuLjU1MDJlZmJhYWE3YzgxODAwNmU0NmYyMjY1 YzlhNjA3ZGFiM2RiYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvSURMUGFyc2VyLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURM UGFyc2VyLnBtCkBAIC0zNzYsMTkgKzM3NiwxOSBAQCBzdWIgcGFyc2VJbnRlcmZhY2UKIAogICAg IG15ICRuZXh0ID0gJHNlbGYtPm5leHRUb2tlbigpOwogICAgIGlmICgkbmV4dC0+dmFsdWUoKSBl cSAiaW50ZXJmYWNlIikgewotICAgICAgICBteSAkZGF0YU5vZGUgPSBkb21JbnRlcmZhY2UtPm5l dygpOworICAgICAgICBteSAkaW50ZXJmYWNlID0gZG9tSW50ZXJmYWNlLT5uZXcoKTsKICAgICAg ICAgJHNlbGYtPmFzc2VydFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICJpbnRlcmZhY2Ui LCBfX0xJTkVfXyk7CiAgICAgICAgIG15ICRpbnRlcmZhY2VOYW1lVG9rZW4gPSAkc2VsZi0+Z2V0 VG9rZW4oKTsKICAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVHlwZSgkaW50ZXJmYWNlTmFtZVRv a2VuLCBJZGVudGlmaWVyVG9rZW4pOwotICAgICAgICAkZGF0YU5vZGUtPm5hbWUoJGludGVyZmFj ZU5hbWVUb2tlbi0+dmFsdWUoKSk7Ci0gICAgICAgIHB1c2goQHskZGF0YU5vZGUtPnBhcmVudHN9 LCBAeyRzZWxmLT5wYXJzZUluaGVyaXRhbmNlKCl9KTsKKyAgICAgICAgJGludGVyZmFjZS0+bmFt ZSgkaW50ZXJmYWNlTmFtZVRva2VuLT52YWx1ZSgpKTsKKyAgICAgICAgcHVzaChAeyRpbnRlcmZh Y2UtPnBhcmVudHN9LCBAeyRzZWxmLT5wYXJzZUluaGVyaXRhbmNlKCl9KTsKICAgICAgICAgJHNl bGYtPmFzc2VydFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICJ7IiwgX19MSU5FX18pOwog ICAgICAgICBteSAkaW50ZXJmYWNlTWVtYmVycyA9ICRzZWxmLT5wYXJzZUludGVyZmFjZU1lbWJl cnMoKTsKICAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCks ICJ9IiwgX19MSU5FX18pOwogICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+ Z2V0VG9rZW4oKSwgIjsiLCBfX0xJTkVfXyk7Ci0gICAgICAgIGFwcGx5TWVtYmVyTGlzdCgkZGF0 YU5vZGUsICRpbnRlcmZhY2VNZW1iZXJzKTsKLSAgICAgICAgYXBwbHlFeHRlbmRlZEF0dHJpYnV0 ZUxpc3QoJGRhdGFOb2RlLCAkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KTsKLSAgICAgICAgcmV0dXJu ICRkYXRhTm9kZTsKKyAgICAgICAgYXBwbHlNZW1iZXJMaXN0KCRpbnRlcmZhY2UsICRpbnRlcmZh Y2VNZW1iZXJzKTsKKyAgICAgICAgYXBwbHlFeHRlbmRlZEF0dHJpYnV0ZUxpc3QoJGludGVyZmFj ZSwgJGV4dGVuZGVkQXR0cmlidXRlTGlzdCk7CisgICAgICAgIHJldHVybiAkaW50ZXJmYWNlOwog ICAgIH0KICAgICAkc2VsZi0+YXNzZXJ0VW5leHBlY3RlZFRva2VuKCRuZXh0LT52YWx1ZSgpLCBf X0xJTkVfXyk7CiB9CkBAIC01NzYsMjAgKzU3NiwyMCBAQCBzdWIgcGFyc2VFeGNlcHRpb24KIAog ICAgIG15ICRuZXh0ID0gJHNlbGYtPm5leHRUb2tlbigpOwogICAgIGlmICgkbmV4dC0+dmFsdWUo KSBlcSAiZXhjZXB0aW9uIikgewotICAgICAgICBteSAkZGF0YU5vZGUgPSBkb21JbnRlcmZhY2Ut Pm5ldygpOworICAgICAgICBteSAkaW50ZXJmYWNlID0gZG9tSW50ZXJmYWNlLT5uZXcoKTsKICAg ICAgICAgJHNlbGYtPmFzc2VydFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICJleGNlcHRp b24iLCBfX0xJTkVfXyk7CiAgICAgICAgIG15ICRleGNlcHRpb25OYW1lVG9rZW4gPSAkc2VsZi0+ Z2V0VG9rZW4oKTsKICAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVHlwZSgkZXhjZXB0aW9uTmFt ZVRva2VuLCBJZGVudGlmaWVyVG9rZW4pOwotICAgICAgICAkZGF0YU5vZGUtPm5hbWUoJGV4Y2Vw dGlvbk5hbWVUb2tlbi0+dmFsdWUoKSk7Ci0gICAgICAgICRkYXRhTm9kZS0+aXNFeGNlcHRpb24o MSk7Ci0gICAgICAgIHB1c2goQHskZGF0YU5vZGUtPnBhcmVudHN9LCBAeyRzZWxmLT5wYXJzZUlu aGVyaXRhbmNlKCl9KTsKKyAgICAgICAgJGludGVyZmFjZS0+bmFtZSgkZXhjZXB0aW9uTmFtZVRv a2VuLT52YWx1ZSgpKTsKKyAgICAgICAgJGludGVyZmFjZS0+aXNFeGNlcHRpb24oMSk7CisgICAg ICAgIHB1c2goQHskaW50ZXJmYWNlLT5wYXJlbnRzfSwgQHskc2VsZi0+cGFyc2VJbmhlcml0YW5j ZSgpfSk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVlKCRzZWxmLT5nZXRUb2tlbigp LCAieyIsIF9fTElORV9fKTsKICAgICAgICAgbXkgJGV4Y2VwdGlvbk1lbWJlcnMgPSAkc2VsZi0+ cGFyc2VFeGNlcHRpb25NZW1iZXJzKCk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVl KCRzZWxmLT5nZXRUb2tlbigpLCAifSIsIF9fTElORV9fKTsKICAgICAgICAgJHNlbGYtPmFzc2Vy dFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICI7IiwgX19MSU5FX18pOwotICAgICAgICBh cHBseU1lbWJlckxpc3QoJGRhdGFOb2RlLCAkZXhjZXB0aW9uTWVtYmVycyk7Ci0gICAgICAgIGFw cGx5RXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KCRkYXRhTm9kZSwgJGV4dGVuZGVkQXR0cmlidXRlTGlz dCk7Ci0gICAgICAgIHJldHVybiAkZGF0YU5vZGU7CisgICAgICAgIGFwcGx5TWVtYmVyTGlzdCgk aW50ZXJmYWNlLCAkZXhjZXB0aW9uTWVtYmVycyk7CisgICAgICAgIGFwcGx5RXh0ZW5kZWRBdHRy aWJ1dGVMaXN0KCRpbnRlcmZhY2UsICRleHRlbmRlZEF0dHJpYnV0ZUxpc3QpOworICAgICAgICBy ZXR1cm4gJGludGVyZmFjZTsKICAgICB9CiAgICAgJHNlbGYtPmFzc2VydFVuZXhwZWN0ZWRUb2tl bigkbmV4dC0+dmFsdWUoKSwgX19MSU5FX18pOwogfQpAQCAtOTcwLDExICs5NzAsMTEgQEAgc3Vi IHBhcnNlQXR0cmlidXRlT3JPcGVyYXRpb25SZXN0CiAgICAgfQogICAgIGlmICgkbmV4dC0+dHlw ZSgpID09IElkZW50aWZpZXJUb2tlbiB8fCAkbmV4dC0+dmFsdWUoKSA9fiAvJG5leHRBdHRyaWJ1 dGVPck9wZXJhdGlvblJlc3RfMS8pIHsKICAgICAgICAgbXkgJHJldHVyblR5cGUgPSAkc2VsZi0+ cGFyc2VSZXR1cm5UeXBlKCk7Ci0gICAgICAgIG15ICRkYXRhTm9kZSA9ICRzZWxmLT5wYXJzZU9w ZXJhdGlvblJlc3QoJGV4dGVuZGVkQXR0cmlidXRlTGlzdCk7Ci0gICAgICAgIGlmIChkZWZpbmVk ICgkZGF0YU5vZGUpKSB7Ci0gICAgICAgICAgICAkZGF0YU5vZGUtPnNpZ25hdHVyZS0+dHlwZSgk cmV0dXJuVHlwZSk7CisgICAgICAgIG15ICRpbnRlcmZhY2UgPSAkc2VsZi0+cGFyc2VPcGVyYXRp b25SZXN0KCRleHRlbmRlZEF0dHJpYnV0ZUxpc3QpOworICAgICAgICBpZiAoZGVmaW5lZCAoJGlu dGVyZmFjZSkpIHsKKyAgICAgICAgICAgICRpbnRlcmZhY2UtPnNpZ25hdHVyZS0+dHlwZSgkcmV0 dXJuVHlwZSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuICRkYXRhTm9kZTsKKyAgICAgICAg cmV0dXJuICRpbnRlcmZhY2U7CiAgICAgfQogICAgICRzZWxmLT5hc3NlcnRVbmV4cGVjdGVkVG9r ZW4oJG5leHQtPnZhbHVlKCksIF9fTElORV9fKTsKIH0KQEAgLTEwNTYsMTEgKzEwNTYsMTEgQEAg c3ViIHBhcnNlT3BlcmF0aW9uT3JJdGVyYXRvcgogICAgIH0KICAgICBpZiAoJG5leHQtPnR5cGUo KSA9PSBJZGVudGlmaWVyVG9rZW4gfHwgJG5leHQtPnZhbHVlKCkgPX4gLyRuZXh0QXR0cmlidXRl T3JPcGVyYXRpb25SZXN0XzEvKSB7CiAgICAgICAgIG15ICRyZXR1cm5UeXBlID0gJHNlbGYtPnBh cnNlUmV0dXJuVHlwZSgpOwotICAgICAgICBteSAkZGF0YU5vZGUgPSAkc2VsZi0+cGFyc2VPcGVy YXRpb25Pckl0ZXJhdG9yUmVzdCgkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KTsKLSAgICAgICAgaWYg KGRlZmluZWQgKCRkYXRhTm9kZSkpIHsKLSAgICAgICAgICAgICRkYXRhTm9kZS0+c2lnbmF0dXJl LT50eXBlKCRyZXR1cm5UeXBlKTsKKyAgICAgICAgbXkgJGludGVyZmFjZSA9ICRzZWxmLT5wYXJz ZU9wZXJhdGlvbk9ySXRlcmF0b3JSZXN0KCRleHRlbmRlZEF0dHJpYnV0ZUxpc3QpOworICAgICAg ICBpZiAoZGVmaW5lZCAoJGludGVyZmFjZSkpIHsKKyAgICAgICAgICAgICRpbnRlcmZhY2UtPnNp Z25hdHVyZS0+dHlwZSgkcmV0dXJuVHlwZSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuICRk YXRhTm9kZTsKKyAgICAgICAgcmV0dXJuICRpbnRlcmZhY2U7CiAgICAgfQogICAgICRzZWxmLT5h c3NlcnRVbmV4cGVjdGVkVG9rZW4oJG5leHQtPnZhbHVlKCksIF9fTElORV9fKTsKIH0KQEAgLTEw NzUsMTEgKzEwNzUsMTEgQEAgc3ViIHBhcnNlU3BlY2lhbE9wZXJhdGlvbgogICAgICAgICAkc2Vs Zi0+cGFyc2VTcGVjaWFsKCk7CiAgICAgICAgICRzZWxmLT5wYXJzZVNwZWNpYWxzKCk7CiAgICAg ICAgIG15ICRyZXR1cm5UeXBlID0gJHNlbGYtPnBhcnNlUmV0dXJuVHlwZSgpOwotICAgICAgICBt eSAkZGF0YU5vZGUgPSAkc2VsZi0+cGFyc2VPcGVyYXRpb25SZXN0KCRleHRlbmRlZEF0dHJpYnV0 ZUxpc3QpOwotICAgICAgICBpZiAoZGVmaW5lZCAoJGRhdGFOb2RlKSkgewotICAgICAgICAgICAg JGRhdGFOb2RlLT5zaWduYXR1cmUtPnR5cGUoJHJldHVyblR5cGUpOworICAgICAgICBteSAkaW50 ZXJmYWNlID0gJHNlbGYtPnBhcnNlT3BlcmF0aW9uUmVzdCgkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0 KTsKKyAgICAgICAgaWYgKGRlZmluZWQgKCRpbnRlcmZhY2UpKSB7CisgICAgICAgICAgICAkaW50 ZXJmYWNlLT5zaWduYXR1cmUtPnR5cGUoJHJldHVyblR5cGUpOwogICAgICAgICB9Ci0gICAgICAg IHJldHVybiAkZGF0YU5vZGU7CisgICAgICAgIHJldHVybiAkaW50ZXJmYWNlOwogICAgIH0KICAg ICAkc2VsZi0+YXNzZXJ0VW5leHBlY3RlZFRva2VuKCRuZXh0LT52YWx1ZSgpLCBfX0xJTkVfXyk7 CiB9CkBAIC0yMTE4LDIxICsyMTE4LDIxIEBAIHN1YiBwYXJzZUludGVyZmFjZU9sZAogICAgIG15 ICRzZWxmID0gc2hpZnQ7CiAgICAgbXkgJG5leHQgPSAkc2VsZi0+bmV4dFRva2VuKCk7CiAgICAg aWYgKCRuZXh0LT52YWx1ZSgpIGVxICJpbnRlcmZhY2UiKSB7Ci0gICAgICAgIG15ICRkYXRhTm9k ZSA9IGRvbUludGVyZmFjZS0+bmV3KCk7CisgICAgICAgIG15ICRpbnRlcmZhY2UgPSBkb21JbnRl cmZhY2UtPm5ldygpOwogICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+Z2V0 VG9rZW4oKSwgImludGVyZmFjZSIsIF9fTElORV9fKTsKICAgICAgICAgbXkgJGV4dGVuZGVkQXR0 cmlidXRlTGlzdCA9ICRzZWxmLT5wYXJzZUV4dGVuZGVkQXR0cmlidXRlTGlzdEFsbG93RW1wdHko KTsKICAgICAgICAgbXkgJHRva2VuID0gJHNlbGYtPmdldFRva2VuKCk7CiAgICAgICAgICRzZWxm LT5hc3NlcnRUb2tlblR5cGUoJHRva2VuLCBJZGVudGlmaWVyVG9rZW4pOwotICAgICAgICAkZGF0 YU5vZGUtPm5hbWUoJHRva2VuLT52YWx1ZSgpKTsKLSAgICAgICAgJGRhdGFOb2RlLT5pc0V4Y2Vw dGlvbigwKTsKLSAgICAgICAgcHVzaChAeyRkYXRhTm9kZS0+cGFyZW50c30sIEB7JHNlbGYtPnBh cnNlSW5oZXJpdGFuY2UoKX0pOworICAgICAgICAkaW50ZXJmYWNlLT5uYW1lKCR0b2tlbi0+dmFs dWUoKSk7CisgICAgICAgICRpbnRlcmZhY2UtPmlzRXhjZXB0aW9uKDApOworICAgICAgICBwdXNo KEB7JGludGVyZmFjZS0+cGFyZW50c30sIEB7JHNlbGYtPnBhcnNlSW5oZXJpdGFuY2UoKX0pOwog ICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+Z2V0VG9rZW4oKSwgInsiLCBf X0xJTkVfXyk7CiAgICAgICAgIG15ICRpbnRlcmZhY2VNZW1iZXJzID0gJHNlbGYtPnBhcnNlSW50 ZXJmYWNlTWVtYmVycygpOwogICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+ Z2V0VG9rZW4oKSwgIn0iLCBfX0xJTkVfXyk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZh bHVlKCRzZWxmLT5nZXRUb2tlbigpLCAiOyIsIF9fTElORV9fKTsKLSAgICAgICAgYXBwbHlNZW1i ZXJMaXN0KCRkYXRhTm9kZSwgJGludGVyZmFjZU1lbWJlcnMpOwotICAgICAgICBhcHBseUV4dGVu ZGVkQXR0cmlidXRlTGlzdCgkZGF0YU5vZGUsICRleHRlbmRlZEF0dHJpYnV0ZUxpc3QpOwotICAg ICAgICByZXR1cm4gJGRhdGFOb2RlOworICAgICAgICBhcHBseU1lbWJlckxpc3QoJGludGVyZmFj ZSwgJGludGVyZmFjZU1lbWJlcnMpOworICAgICAgICBhcHBseUV4dGVuZGVkQXR0cmlidXRlTGlz dCgkaW50ZXJmYWNlLCAkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KTsKKyAgICAgICAgcmV0dXJuICRp bnRlcmZhY2U7CiAgICAgfQogICAgICRzZWxmLT5hc3NlcnRVbmV4cGVjdGVkVG9rZW4oJG5leHQt PnZhbHVlKCksIF9fTElORV9fKTsKIH0KQEAgLTIxODgsMjIgKzIxODgsMjIgQEAgc3ViIHBhcnNl RXhjZXB0aW9uT2xkCiAgICAgbXkgJHNlbGYgPSBzaGlmdDsKICAgICBteSAkbmV4dCA9ICRzZWxm LT5uZXh0VG9rZW4oKTsKICAgICBpZiAoJG5leHQtPnZhbHVlKCkgZXEgImV4Y2VwdGlvbiIpIHsK LSAgICAgICAgbXkgJGRhdGFOb2RlID0gZG9tSW50ZXJmYWNlLT5uZXcoKTsKKyAgICAgICAgbXkg JGludGVyZmFjZSA9IGRvbUludGVyZmFjZS0+bmV3KCk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRU b2tlblZhbHVlKCRzZWxmLT5nZXRUb2tlbigpLCAiZXhjZXB0aW9uIiwgX19MSU5FX18pOwogICAg ICAgICBteSAkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0ID0gJHNlbGYtPnBhcnNlRXh0ZW5kZWRBdHRy aWJ1dGVMaXN0QWxsb3dFbXB0eSgpOwogICAgICAgICBteSAkdG9rZW4gPSAkc2VsZi0+Z2V0VG9r ZW4oKTsKICAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVHlwZSgkdG9rZW4sIElkZW50aWZpZXJU b2tlbik7Ci0gICAgICAgICRkYXRhTm9kZS0+bmFtZSgkdG9rZW4tPnZhbHVlKCkpOwotICAgICAg ICAkZGF0YU5vZGUtPmlzRXhjZXB0aW9uKDEpOwotICAgICAgICBwdXNoKEB7JGRhdGFOb2RlLT5w YXJlbnRzfSwgQHskc2VsZi0+cGFyc2VJbmhlcml0YW5jZSgpfSk7CisgICAgICAgICRpbnRlcmZh Y2UtPm5hbWUoJHRva2VuLT52YWx1ZSgpKTsKKyAgICAgICAgJGludGVyZmFjZS0+aXNFeGNlcHRp b24oMSk7CisgICAgICAgIHB1c2goQHskaW50ZXJmYWNlLT5wYXJlbnRzfSwgQHskc2VsZi0+cGFy c2VJbmhlcml0YW5jZSgpfSk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVlKCRzZWxm LT5nZXRUb2tlbigpLCAieyIsIF9fTElORV9fKTsKICAgICAgICAgbXkgJGV4Y2VwdGlvbk1lbWJl cnMgPSAkc2VsZi0+cGFyc2VJbnRlcmZhY2VNZW1iZXJzKCk7CiAgICAgICAgICMkc2VsZi0+cGFy c2VFeGNlcHRpb25NZW1iZXJzKCk7CiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVlKCRz ZWxmLT5nZXRUb2tlbigpLCAifSIsIF9fTElORV9fKTsKICAgICAgICAgJHNlbGYtPmFzc2VydFRv a2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICI7IiwgX19MSU5FX18pOwotICAgICAgICBhcHBs eU1lbWJlckxpc3QoJGRhdGFOb2RlLCAkZXhjZXB0aW9uTWVtYmVycyk7Ci0gICAgICAgIGFwcGx5 RXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KCRkYXRhTm9kZSwgJGV4dGVuZGVkQXR0cmlidXRlTGlzdCk7 Ci0gICAgICAgIHJldHVybiAkZGF0YU5vZGU7CisgICAgICAgIGFwcGx5TWVtYmVyTGlzdCgkaW50 ZXJmYWNlLCAkZXhjZXB0aW9uTWVtYmVycyk7CisgICAgICAgIGFwcGx5RXh0ZW5kZWRBdHRyaWJ1 dGVMaXN0KCRpbnRlcmZhY2UsICRleHRlbmRlZEF0dHJpYnV0ZUxpc3QpOworICAgICAgICByZXR1 cm4gJGludGVyZmFjZTsKICAgICB9CiAgICAgJHNlbGYtPmFzc2VydFVuZXhwZWN0ZWRUb2tlbigk bmV4dC0+dmFsdWUoKSwgX19MSU5FX18pOwogfQpAQCAtMjIzNCwxMSArMjIzNCwxMSBAQCBzdWIg cGFyc2VBdHRyaWJ1dGVPck9wZXJhdGlvbk9ySXRlcmF0b3JPbGQKICAgICB9CiAgICAgaWYgKCRu ZXh0LT52YWx1ZSgpID1+IC8kbmV4dEF0dHJpYnV0ZU9yT3BlcmF0aW9uT3JJdGVyYXRvcl8xLykg ewogICAgICAgICBteSAkcXVhbGlmaWVyID0gJHNlbGYtPnBhcnNlUXVhbGlmaWVyKCk7Ci0gICAg ICAgIG15ICRkYXRhTm9kZSA9ICRzZWxmLT5wYXJzZUF0dHJpYnV0ZU9yT3BlcmF0aW9uUmVzdE9s ZCgpOwotICAgICAgICBpZiAoZGVmaW5lZCAoJGRhdGFOb2RlKSAmJiAkcXVhbGlmaWVyIGVxICJz dGF0aWMiKSB7Ci0gICAgICAgICAgICAkZGF0YU5vZGUtPmlzU3RhdGljKDEpOworICAgICAgICBt eSAkaW50ZXJmYWNlID0gJHNlbGYtPnBhcnNlQXR0cmlidXRlT3JPcGVyYXRpb25SZXN0T2xkKCk7 CisgICAgICAgIGlmIChkZWZpbmVkICgkaW50ZXJmYWNlKSAmJiAkcXVhbGlmaWVyIGVxICJzdGF0 aWMiKSB7CisgICAgICAgICAgICAkaW50ZXJmYWNlLT5pc1N0YXRpYygxKTsKICAgICAgICAgfQot ICAgICAgICByZXR1cm4gJGRhdGFOb2RlOworICAgICAgICByZXR1cm4gJGludGVyZmFjZTsKICAg ICB9CiAgICAgaWYgKCRuZXh0LT52YWx1ZSgpID1+IC8kbmV4dEF0dHJpYnV0ZU9sZF8xLykgewog ICAgICAgICByZXR1cm4gJHNlbGYtPnBhcnNlQXR0cmlidXRlT2xkKCk7CkBAIC0yMjYyLDExICsy MjYyLDExIEBAIHN1YiBwYXJzZUF0dHJpYnV0ZU9yT3BlcmF0aW9uUmVzdE9sZAogICAgIH0KICAg ICBpZiAoJG5leHQtPnR5cGUoKSA9PSBJZGVudGlmaWVyVG9rZW4gfHwgJG5leHQtPnZhbHVlKCkg PX4gLyRuZXh0QXR0cmlidXRlT3JPcGVyYXRpb25SZXN0XzEvKSB7CiAgICAgICAgIG15ICRyZXR1 cm5UeXBlID0gJHNlbGYtPnBhcnNlUmV0dXJuVHlwZSgpOwotICAgICAgICBteSAkZGF0YU5vZGUg PSAkc2VsZi0+cGFyc2VPcGVyYXRpb25SZXN0KHt9KTsKLSAgICAgICAgaWYgKGRlZmluZWQgKCRk YXRhTm9kZSkpIHsKLSAgICAgICAgICAgICRkYXRhTm9kZS0+c2lnbmF0dXJlLT50eXBlKCRyZXR1 cm5UeXBlKTsKKyAgICAgICAgbXkgJGludGVyZmFjZSA9ICRzZWxmLT5wYXJzZU9wZXJhdGlvblJl c3Qoe30pOworICAgICAgICBpZiAoZGVmaW5lZCAoJGludGVyZmFjZSkpIHsKKyAgICAgICAgICAg ICRpbnRlcmZhY2UtPnNpZ25hdHVyZS0+dHlwZSgkcmV0dXJuVHlwZSk7CiAgICAgICAgIH0KLSAg ICAgICAgcmV0dXJuICRkYXRhTm9kZTsKKyAgICAgICAgcmV0dXJuICRpbnRlcmZhY2U7CiAgICAg fQogICAgICRzZWxmLT5hc3NlcnRVbmV4cGVjdGVkVG9rZW4oJG5leHQtPnZhbHVlKCksIF9fTElO RV9fKTsKIH0KQEAgLTI0MjEsMjAgKzI0MjEsMjAgQEAgc3ViIHBhcnNlU2NvcGVkTmFtZXMKIAog c3ViIGFwcGx5TWVtYmVyTGlzdAogewotICAgIG15ICRkYXRhTm9kZSA9IHNoaWZ0OworICAgIG15 ICRpbnRlcmZhY2UgPSBzaGlmdDsKICAgICBteSAkbWVtYmVycyA9IHNoaWZ0OwogCiAgICAgZm9y IG15ICRpdGVtIChAeyRtZW1iZXJzfSkgewogICAgICAgICBpZiAocmVmKCRpdGVtKSBlcSAiZG9t QXR0cmlidXRlIikgewotICAgICAgICAgICAgcHVzaChAeyRkYXRhTm9kZS0+YXR0cmlidXRlc30s ICRpdGVtKTsKKyAgICAgICAgICAgIHB1c2goQHskaW50ZXJmYWNlLT5hdHRyaWJ1dGVzfSwgJGl0 ZW0pOwogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfQogICAgICAgICBpZiAocmVmKCRpdGVt KSBlcSAiZG9tQ29uc3RhbnQiKSB7Ci0gICAgICAgICAgICBwdXNoKEB7JGRhdGFOb2RlLT5jb25z dGFudHN9LCAkaXRlbSk7CisgICAgICAgICAgICBwdXNoKEB7JGludGVyZmFjZS0+Y29uc3RhbnRz fSwgJGl0ZW0pOwogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfQogICAgICAgICBpZiAocmVm KCRpdGVtKSBlcSAiZG9tRnVuY3Rpb24iKSB7Ci0gICAgICAgICAgICBwdXNoKEB7JGRhdGFOb2Rl LT5mdW5jdGlvbnN9LCAkaXRlbSk7CisgICAgICAgICAgICBwdXNoKEB7JGludGVyZmFjZS0+ZnVu Y3Rpb25zfSwgJGl0ZW0pOwogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfQogICAgIH0KQEAg LTI0NDIsNyArMjQ0Miw3IEBAIHN1YiBhcHBseU1lbWJlckxpc3QKIAogc3ViIGFwcGx5RXh0ZW5k ZWRBdHRyaWJ1dGVMaXN0CiB7Ci0gICAgbXkgJGRhdGFOb2RlID0gc2hpZnQ7CisgICAgbXkgJGlu dGVyZmFjZSA9IHNoaWZ0OwogICAgIG15ICRleHRlbmRlZEF0dHJpYnV0ZUxpc3QgPSBzaGlmdDsK IAogICAgIGlmIChkZWZpbmVkICRleHRlbmRlZEF0dHJpYnV0ZUxpc3QtPnsiQ29uc3RydWN0b3Jz In0pIHsKQEAgLTI0NTUsNyArMjQ1NSw3IEBAIHN1YiBhcHBseUV4dGVuZGVkQXR0cmlidXRlTGlz dAogICAgICAgICAgICAgJGNvbnN0cnVjdG9yLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cygkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KTsKICAgICAgICAgICAgICRjb25zdHJ1Y3Rvci0+cGFy YW1ldGVycygkcGFyYW0pOwogICAgICAgICAgICAgJGNvbnN0cnVjdG9yLT57b3ZlcmxvYWRlZElu ZGV4fSA9ICRpbmRleCsrOwotICAgICAgICAgICAgcHVzaChAeyRkYXRhTm9kZS0+Y29uc3RydWN0 b3JzfSwgJGNvbnN0cnVjdG9yKTsKKyAgICAgICAgICAgIHB1c2goQHskaW50ZXJmYWNlLT5jb25z dHJ1Y3RvcnN9LCAkY29uc3RydWN0b3IpOwogICAgICAgICB9CiAgICAgICAgIGRlbGV0ZSAkZXh0 ZW5kZWRBdHRyaWJ1dGVMaXN0LT57IkNvbnN0cnVjdG9ycyJ9OwogICAgICAgICAkZXh0ZW5kZWRB dHRyaWJ1dGVMaXN0LT57IkNvbnN0cnVjdG9yIn0gPSAiVkFMVUVfSVNfTUlTU0lORyI7CkBAIC0y NDY5LDkgKzI0NjksOSBAQCBzdWIgYXBwbHlFeHRlbmRlZEF0dHJpYnV0ZUxpc3QKICAgICAgICAg bXkgJGNvbnN0cnVjdG9yTmFtZSA9ICRhdHRyaWJ1dGVLZXlzWzBdOwogICAgICAgICBwdXNoKEB7 JG5ld0RhdGFOb2RlLT5wYXJhbWV0ZXJzfSwgQHskYXR0cmlidXRlc3skY29uc3RydWN0b3JOYW1l fX0pOwogICAgICAgICAkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0LT57Ik5hbWVkQ29uc3RydWN0b3Ii fSA9ICRjb25zdHJ1Y3Rvck5hbWU7Ci0gICAgICAgIHB1c2goQHskZGF0YU5vZGUtPmNvbnN0cnVj dG9yc30sICRuZXdEYXRhTm9kZSk7CisgICAgICAgIHB1c2goQHskaW50ZXJmYWNlLT5jb25zdHJ1 Y3RvcnN9LCAkbmV3RGF0YU5vZGUpOwogICAgIH0KLSAgICAkZGF0YU5vZGUtPmV4dGVuZGVkQXR0 cmlidXRlcygkZXh0ZW5kZWRBdHRyaWJ1dGVMaXN0KTsKKyAgICAkaW50ZXJmYWNlLT5leHRlbmRl ZEF0dHJpYnV0ZXMoJGV4dGVuZGVkQXR0cmlidXRlTGlzdCk7CiB9CiAKIDE7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbAppbmRl eCA5NmZmMmY1NmQ3MmNkYjEwZGM4ODE4YWZlZmZhOWMwYWZmOTc1ZWNmLi44YmVjZTBmZmQyY2Zj NWFmMDM3OTk3YTQ1YjJjMzYyMzllZjliYmExIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwKQEAgLTEzNyw4ICsxMzcsOCBA QCBmb3JlYWNoIG15ICRpZGxGaWxlIChAc3VwcGxlbWVudGVkSWRsRmlsZXMpIHsKICAgICBteSAk cGFyc2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKICAgICBteSAkZG9jdW1lbnQgPSAk cGFyc2VyLT5QYXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOwogCi0gICAg Zm9yZWFjaCBteSAkZGF0YU5vZGUgKEB7JGRvY3VtZW50LT5pbnRlcmZhY2VzfSkgewotICAgICAg ICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0gYW5k ICRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGVxICR0YXJn ZXRJbnRlcmZhY2VOYW1lKSB7CisgICAgZm9yZWFjaCBteSAkaW50ZXJmYWNlIChAeyRkb2N1bWVu dC0+aW50ZXJmYWNlc30pIHsKKyAgICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJTdXBwbGVtZW50YWwifSBhbmQgJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IlN1cHBsZW1lbnRhbCJ9IGVxICR0YXJnZXRJbnRlcmZhY2VOYW1lKSB7CiAgICAgICAgICAg ICBteSAkdGFyZ2V0RGF0YU5vZGU7CiAgICAgICAgICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2Ug KEB7JHRhcmdldERvY3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICAgICAgICAgIGlmICgk aW50ZXJmYWNlLT5uYW1lIGVxICR0YXJnZXRJbnRlcmZhY2VOYW1lKSB7CkBAIC0xNDksNDAgKzE0 OSw0MCBAQCBmb3JlYWNoIG15ICRpZGxGaWxlIChAc3VwcGxlbWVudGVkSWRsRmlsZXMpIHsKICAg ICAgICAgICAgIGRpZSAiTm90IGZvdW5kIGFuIGludGVyZmFjZSAke3RhcmdldEludGVyZmFjZU5h bWV9IGluICR7dGFyZ2V0SW50ZXJmYWNlTmFtZX0uaWRsLiIgdW5sZXNzIGRlZmluZWQgJHRhcmdl dERhdGFOb2RlOwogCiAgICAgICAgICAgICAjIFN1cHBvcnQgW1N1cHBsZW1lbnRhbF0gZm9yIGF0 dHJpYnV0ZXMuCi0gICAgICAgICAgICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7JGRhdGFOb2Rl LT5hdHRyaWJ1dGVzfSkgeworICAgICAgICAgICAgZm9yZWFjaCBteSAkYXR0cmlidXRlIChAeyRp bnRlcmZhY2UtPmF0dHJpYnV0ZXN9KSB7CiAgICAgICAgICAgICAgICAgIyBSZWNvcmQgdGhhdCB0 aGlzIGF0dHJpYnV0ZSBpcyBpbXBsZW1lbnRlZCBieSAkaW50ZXJmYWNlTmFtZS4KICAgICAgICAg ICAgICAgICAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBs ZW1lbnRlZEJ5In0gPSAkaW50ZXJmYWNlTmFtZTsKIAogICAgICAgICAgICAgICAgICMgQWRkIGlu dGVyZmFjZS13aWRlIGV4dGVuZGVkIGF0dHJpYnV0ZXMgdG8gZWFjaCBhdHRyaWJ1dGUuCi0gICAg ICAgICAgICAgICAgZm9yZWFjaCBteSAkZXh0ZW5kZWRBdHRyaWJ1dGVOYW1lIChrZXlzICV7JGRh dGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXN9KSB7CisgICAgICAgICAgICAgICAgZm9yZWFjaCBt eSAkZXh0ZW5kZWRBdHRyaWJ1dGVOYW1lIChrZXlzICV7JGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzfSkgewogICAgICAgICAgICAgICAgICAgICBuZXh0IGlmICgkZXh0ZW5kZWRBdHRyaWJ1 dGVOYW1lIGVxICJTdXBwbGVtZW50YWwiKTsKLSAgICAgICAgICAgICAgICAgICAgJGF0dHJpYnV0 ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVOYW1l fSA9ICRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57JGV4dGVuZGVkQXR0cmlidXRlTmFt ZX07CisgICAgICAgICAgICAgICAgICAgICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57JGV4dGVuZGVkQXR0cmlidXRlTmFtZX0gPSAkaW50ZXJmYWNlLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVOYW1lfTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgcHVzaChAeyR0YXJnZXREYXRhTm9kZS0+YXR0cmlidXRlc30sICRh dHRyaWJ1dGUpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAjIFN1cHBvcnQgW1N1cHBs ZW1lbnRhbF0gZm9yIG1ldGhvZHMuCi0gICAgICAgICAgICBmb3JlYWNoIG15ICRmdW5jdGlvbiAo QHskZGF0YU5vZGUtPmZ1bmN0aW9uc30pIHsKKyAgICAgICAgICAgIGZvcmVhY2ggbXkgJGZ1bmN0 aW9uIChAeyRpbnRlcmZhY2UtPmZ1bmN0aW9uc30pIHsKICAgICAgICAgICAgICAgICAjIFJlY29y ZCB0aGF0IHRoaXMgbWV0aG9kIGlzIGltcGxlbWVudGVkIGJ5ICRpbnRlcmZhY2VOYW1lLgogICAg ICAgICAgICAgICAgICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi SW1wbGVtZW50ZWRCeSJ9ID0gJGludGVyZmFjZU5hbWU7CiAKICAgICAgICAgICAgICAgICAjIEFk ZCBpbnRlcmZhY2Utd2lkZSBleHRlbmRlZCBhdHRyaWJ1dGVzIHRvIGVhY2ggbWV0aG9kLgotICAg ICAgICAgICAgICAgIGZvcmVhY2ggbXkgJGV4dGVuZGVkQXR0cmlidXRlTmFtZSAoa2V5cyAleyRk YXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzfSkgeworICAgICAgICAgICAgICAgIGZvcmVhY2gg bXkgJGV4dGVuZGVkQXR0cmlidXRlTmFtZSAoa2V5cyAleyRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0 cmlidXRlc30pIHsKICAgICAgICAgICAgICAgICAgICAgbmV4dCBpZiAoJGV4dGVuZGVkQXR0cmli dXRlTmFtZSBlcSAiU3VwcGxlbWVudGFsIik7Ci0gICAgICAgICAgICAgICAgICAgICRmdW5jdGlv bi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVOYW1l fSA9ICRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57JGV4dGVuZGVkQXR0cmlidXRlTmFt ZX07CisgICAgICAgICAgICAgICAgICAgICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0 dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVOYW1lfSA9ICRpbnRlcmZhY2UtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyRleHRlbmRlZEF0dHJpYnV0ZU5hbWV9OwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICBwdXNoKEB7JHRhcmdldERhdGFOb2RlLT5mdW5jdGlvbnN9LCAkZnVu Y3Rpb24pOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAjIFN1cHBvcnQgW1N1cHBsZW1l bnRhbF0gZm9yIGNvbnN0YW50cy4KLSAgICAgICAgICAgIGZvcmVhY2ggbXkgJGNvbnN0YW50IChA eyRkYXRhTm9kZS0+Y29uc3RhbnRzfSkgeworICAgICAgICAgICAgZm9yZWFjaCBteSAkY29uc3Rh bnQgKEB7JGludGVyZmFjZS0+Y29uc3RhbnRzfSkgewogICAgICAgICAgICAgICAgICMgUmVjb3Jk IHRoYXQgdGhpcyBjb25zdGFudCBpcyBpbXBsZW1lbnRlZCBieSAkaW50ZXJmYWNlTmFtZS4KICAg ICAgICAgICAgICAgICAkY29uc3RhbnQtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBsZW1lbnRl ZEJ5In0gPSAkaW50ZXJmYWNlTmFtZTsKIAogICAgICAgICAgICAgICAgICMgQWRkIGludGVyZmFj ZS13aWRlIGV4dGVuZGVkIGF0dHJpYnV0ZXMgdG8gZWFjaCBjb25zdGFudC4KLSAgICAgICAgICAg ICAgICBmb3JlYWNoIG15ICRleHRlbmRlZEF0dHJpYnV0ZU5hbWUgKGtleXMgJXskZGF0YU5vZGUt PmV4dGVuZGVkQXR0cmlidXRlc30pIHsKKyAgICAgICAgICAgICAgICBmb3JlYWNoIG15ICRleHRl bmRlZEF0dHJpYnV0ZU5hbWUgKGtleXMgJXskaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXN9 KSB7CiAgICAgICAgICAgICAgICAgICAgIG5leHQgaWYgKCRleHRlbmRlZEF0dHJpYnV0ZU5hbWUg ZXEgIlN1cHBsZW1lbnRhbCIpOwotICAgICAgICAgICAgICAgICAgICAkY29uc3RhbnQtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyRleHRlbmRlZEF0dHJpYnV0ZU5hbWV9ID0gJGRhdGFOb2RlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVOYW1lfTsKKyAgICAgICAgICAgICAg ICAgICAgJGNvbnN0YW50LT5leHRlbmRlZEF0dHJpYnV0ZXMtPnskZXh0ZW5kZWRBdHRyaWJ1dGVO YW1lfSA9ICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyRleHRlbmRlZEF0dHJpYnV0 ZU5hbWV9OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBwdXNoKEB7JHRhcmdl dERhdGFOb2RlLT5jb25zdGFudHN9LCAkY29uc3RhbnQpOwogICAgICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzLWlkbHMucGwg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbAppbmRl eCAwNDI5NzMyZmZiOTk3ZmVkOTNkZjBiYmRlYjgxNjRkZjgyNWI2NjBkLi4yZjIwYzFhNjM4Njlk NTE0NGRhNTExNWM1MjRhNjk1M2ExNzdmOWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbApAQCAtODAsOSArODAsOSBAQCBmb3Jl YWNoIG15ICRpZGxGaWxlIChrZXlzICVkb2N1bWVudHMpIHsKICAgICAkc3VwcGxlbWVudGFsc3sk aWRsRmlsZX0gPSBbXTsKIH0KIGZvcmVhY2ggbXkgJGlkbEZpbGUgKGtleXMgJWRvY3VtZW50cykg ewotICAgIGZvcmVhY2ggbXkgJGRhdGFOb2RlIChAeyRkb2N1bWVudHN7JGlkbEZpbGV9LT5pbnRl cmZhY2VzfSkgewotICAgICAgICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi U3VwcGxlbWVudGFsIn0pIHsKLSAgICAgICAgICAgIG15ICR0YXJnZXRJZGxGaWxlID0gJGludGVy ZmFjZU5hbWVUb0lkbEZpbGV7JGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiU3VwcGxl bWVudGFsIn19OworICAgIGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnRzeyRpZGxG aWxlfS0+aW50ZXJmYWNlc30pIHsKKyAgICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0 cmlidXRlcy0+eyJTdXBwbGVtZW50YWwifSkgeworICAgICAgICAgICAgbXkgJHRhcmdldElkbEZp bGUgPSAkaW50ZXJmYWNlTmFtZVRvSWRsRmlsZXskaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiU3VwcGxlbWVudGFsIn19OwogICAgICAgICAgICAgcHVzaChAeyRzdXBwbGVtZW50YWxz eyR0YXJnZXRJZGxGaWxlfX0sICRpZGxGaWxlKTsKICAgICAgICAgICAgICMgVHJlYXRzIGFzIGlm IHRoaXMgSURMIGZpbGUgZG9lcyBub3QgZXhpc3QuCiAgICAgICAgICAgICBkZWxldGUgJHN1cHBs ZW1lbnRhbHN7JGlkbEZpbGV9OwpAQCAtMTY4LDE0ICsxNjgsMTQgQEAgc3ViIGNoZWNrSURMQXR0 cmlidXRlcwogICAgIG15ICRkb2N1bWVudCA9IHNoaWZ0OwogICAgIG15ICRpZGxGaWxlID0gc2hp ZnQ7CiAKLSAgICBmb3JlYWNoIG15ICRkYXRhTm9kZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9 KSB7Ci0gICAgICAgIGNoZWNrSWZJRExBdHRyaWJ1dGVzRXhpc3RzKCRpZGxBdHRyaWJ1dGVzLCAk ZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcywgJGlkbEZpbGUpOworICAgIGZvcmVhY2ggbXkg JGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9KSB7CisgICAgICAgIGNoZWNrSWZJ RExBdHRyaWJ1dGVzRXhpc3RzKCRpZGxBdHRyaWJ1dGVzLCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0 dHJpYnV0ZXMsICRpZGxGaWxlKTsKIAotICAgICAgICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7 JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfSkgeworICAgICAgICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUg KEB7JGludGVyZmFjZS0+YXR0cmlidXRlc30pIHsKICAgICAgICAgICAgIGNoZWNrSWZJRExBdHRy aWJ1dGVzRXhpc3RzKCRpZGxBdHRyaWJ1dGVzLCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVu ZGVkQXR0cmlidXRlcywgJGlkbEZpbGUpOwogICAgICAgICB9CiAKLSAgICAgICAgZm9yZWFjaCBt eSAkZnVuY3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7CisgICAgICAgIGZvcmVhY2gg bXkgJGZ1bmN0aW9uIChAeyRpbnRlcmZhY2UtPmZ1bmN0aW9uc30pIHsKICAgICAgICAgICAgIGNo ZWNrSWZJRExBdHRyaWJ1dGVzRXhpc3RzKCRpZGxBdHRyaWJ1dGVzLCAkZnVuY3Rpb24tPnNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLCAkaWRsRmlsZSk7CiAgICAgICAgICAgICBmb3JlYWNo IG15ICRwYXJhbWV0ZXIgKEB7JGZ1bmN0aW9uLT5wYXJhbWV0ZXJzfSkgewogICAgICAgICAgICAg ICAgIGNoZWNrSWZJRExBdHRyaWJ1dGVzRXhpc3RzKCRpZGxBdHRyaWJ1dGVzLCAkcGFyYW1ldGVy LT5leHRlbmRlZEF0dHJpYnV0ZXMsICRpZGxGaWxlKTsK