102639 2012-11-18 21:42:48 -0800 [V8] Make more use of $v8Interface in CodeGeneratorV8.pm 2012-11-18 23:27:16 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 770333 0 haraken 2012-11-18 21:42:48 -0800 We can replace hard-coded "V8${interfaceName}" with $v8Interface. 770343 1 174889 haraken 2012-11-18 21:51:23 -0800 Created attachment 174889 Patch 770384 2 174889 webkit.review.bot 2012-11-18 23:27:13 -0800 Comment on attachment 174889 Patch Clearing flags on attachment: 174889 Committed r135113: <http://trac.webkit.org/changeset/135113> 770385 3 webkit.review.bot 2012-11-18 23:27:16 -0800 All reviewed patches have been landed. Closing bug. 174889 2012-11-18 21:51:23 -0800 2012-11-18 23:27:13 -0800 Patch bug-102639-20121119144914.patch text/plain 18723 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFhNmZjOTEzNzA3YjYy YzVlMjViMDU0ZmFkZDVjYzljNTRlNjgyMC4uMWE4OGRiMWViYzliZTBjMDg2NTBkNmY0MTI1MTc1 MzdkMTFhMTEwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTExLTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIE1ha2UgbW9y ZSB1c2Ugb2YgJHY4SW50ZXJmYWNlIGluIENvZGVHZW5lcmF0b3JWOC5wbQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNjM5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY2FuIHJlcGxhY2UgaGFyZC1j b2RlZCAiVjgke2ludGVyZmFjZU5hbWV9IiB3aXRoICR2OEludGVyZmFjZS4KKworICAgICAgICBO byB0ZXN0cy4gTm8gY2hhbmdlIGluIGdlbmVyYXRlZCBjb2RlLgorCisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChHZW5lcmF0ZU5vcm1hbEF0 dHJHZXR0ZXIpOgorICAgICAgICAoR2VuZXJhdGVOb3JtYWxBdHRyU2V0dGVyKToKKyAgICAgICAg KEdlbmVyYXRlRnVuY3Rpb25DYWxsYmFjayk6CisgICAgICAgIChHZW5lcmF0ZU5hbWVkQ29uc3Ry dWN0b3JDYWxsYmFjayk6CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uSW5kZXhlcik6 CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uTmFtZWRQcm9wZXJ0eUdldHRlcik6Cisg ICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKwogMjAxMi0xMS0xOCAgQW5kcmVhcyBL bGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU3R5bGVkRWxlbWVudDogTWFrZSBo YW5kbGluZyB0aGUgInN0eWxlIiBhdHRyaWJ1dGUgYSBsaXR0ZSBmYXN0ZXIuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IDhh Y2NiN2FkNjIzZjgwZmVlMGNkOGE3NDYyODkxMDRmYjg1MDI5OTAuLmRjM2ZkZGUxYjI1MDFjZjlh YTJmY2M4YWZjNjBlZjQ3Y2M0ZWZkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC04NzYsNiArODc2LDcgQEAgc3ViIEdl bmVyYXRlTm9ybWFsQXR0ckdldHRlcgogICAgIG15ICRkYXRhTm9kZSA9IHNoaWZ0OwogCiAgICAg bXkgJGludGVyZmFjZU5hbWUgPSAkZGF0YU5vZGUtPm5hbWU7CisgICAgbXkgJHY4SW50ZXJmYWNl TmFtZSA9ICJWOCRpbnRlcmZhY2VOYW1lIjsKICAgICBteSAkYXR0ckV4dCA9ICRhdHRyaWJ1dGUt PnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzOwogICAgIG15ICRhdHRyTmFtZSA9ICRhdHRy aWJ1dGUtPnNpZ25hdHVyZS0+bmFtZTsKICAgICBteSAkYXR0clR5cGUgPSAkYXR0cmlidXRlLT5z aWduYXR1cmUtPnR5cGU7CkBAIC05MDAsMTEgKzkwMSwxMSBAQCBFTkQKICAgICAgICAgbXkgJHN2 Z1dyYXBwZWROYXRpdmVUeXBlID0gJGNvZGVHZW5lcmF0b3ItPkdldFNWR1dyYXBwZWRUeXBlTmVl ZGluZ1RlYXJPZmYoJGludGVyZmFjZU5hbWUpOwogICAgICAgICBpZiAoJHN2Z1dyYXBwZWROYXRp dmVUeXBlID1+IC9MaXN0LykgewogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywg PDxFTkQpOwotICAgICRzdmdOYXRpdmVUeXBlKiBpbXAgPSBWOCR7aW50ZXJmYWNlTmFtZX06OnRv TmF0aXZlKGluZm8uSG9sZGVyKCkpOworICAgICRzdmdOYXRpdmVUeXBlKiBpbXAgPSAke3Y4SW50 ZXJmYWNlTmFtZX06OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwogRU5ECiAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7Ci0gICAgJHN2 Z05hdGl2ZVR5cGUqIHdyYXBwZXIgPSBWOCR7aW50ZXJmYWNlTmFtZX06OnRvTmF0aXZlKGluZm8u SG9sZGVyKCkpOworICAgICRzdmdOYXRpdmVUeXBlKiB3cmFwcGVyID0gJHt2OEludGVyZmFjZU5h bWV9Ojp0b05hdGl2ZShpbmZvLkhvbGRlcigpKTsKICAgICAkc3ZnV3JhcHBlZE5hdGl2ZVR5cGUm IGltcEluc3RhbmNlID0gd3JhcHBlci0+cHJvcGVydHlSZWZlcmVuY2UoKTsKIEVORAogICAgICAg ICAgICAgaWYgKCRnZXR0ZXJTdHJpbmdVc2VzSW1wKSB7CkBAIC05MjEsMTMgKzkyMiwxMyBAQCBF TkQKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICMgcGVyZm9ybSBsb29rdXAgZmlyc3QK ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsKLSAgICB2ODo6SGFu ZGxlPHY4OjpPYmplY3Q+IGhvbGRlciA9IFY4RE9NV3JhcHBlcjo6bG9va3VwRE9NV3JhcHBlcihW OCR7aW50ZXJmYWNlTmFtZX06OkdldFRlbXBsYXRlKCksIGluZm8uVGhpcygpKTsKKyAgICB2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+IGhvbGRlciA9IFY4RE9NV3JhcHBlcjo6bG9va3VwRE9NV3JhcHBl cigke3Y4SW50ZXJmYWNlTmFtZX06OkdldFRlbXBsYXRlKCksIGluZm8uVGhpcygpKTsKICAgICBp ZiAoaG9sZGVyLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7CiBFTkQK ICAgICAgICAgfQogICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7Ci0gICAg JHtpbnRlcmZhY2VOYW1lfSogaW1wID0gVjgke2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShob2xk ZXIpOworICAgICR7aW50ZXJmYWNlTmFtZX0qIGltcCA9ICR7djhJbnRlcmZhY2VOYW1lfTo6dG9O YXRpdmUoaG9sZGVyKTsKIEVORAogICAgIH0gZWxzZSB7CiAgICAgICAgIG15ICRyZWZsZWN0ID0g JGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiUmVmbGVjdCJ9OwpA QCAtOTU0LDcgKzk1NSw3IEBAIEVORAogICAgICAgICB9CiAgICAgICAgIGlmICghJGF0dHJpYnV0 ZS0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5E KTsKLSAgICAke2ludGVyZmFjZU5hbWV9KiBpbXAgPSBWOCR7aW50ZXJmYWNlTmFtZX06OnRvTmF0 aXZlKGluZm8uSG9sZGVyKCkpOworICAgICR7aW50ZXJmYWNlTmFtZX0qIGltcCA9ICR7djhJbnRl cmZhY2VOYW1lfTo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7CiBFTkQKICAgICAgICAgfQogICAg IH0KQEAgLTExNjYsNiArMTE2Nyw3IEBAIHN1YiBHZW5lcmF0ZU5vcm1hbEF0dHJTZXR0ZXIKICAg ICBteSAkZGF0YU5vZGUgPSBzaGlmdDsKIAogICAgIG15ICRpbnRlcmZhY2VOYW1lID0gJGRhdGFO b2RlLT5uYW1lOworICAgIG15ICR2OEludGVyZmFjZU5hbWUgPSAiVjgkaW50ZXJmYWNlTmFtZSI7 CiAgICAgbXkgJGF0dHJOYW1lID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lOwogICAgIG15 ICRhdHRyRXh0ID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXM7CiAK QEAgLTExOTYsMTEgKzExOTgsMTEgQEAgc3ViIEdlbmVyYXRlTm9ybWFsQXR0clNldHRlcgogICAg ICAgICBteSAkc3ZnV3JhcHBlZE5hdGl2ZVR5cGUgPSAkY29kZUdlbmVyYXRvci0+R2V0U1ZHV3Jh cHBlZFR5cGVOZWVkaW5nVGVhck9mZigkaW50ZXJmYWNlTmFtZSk7CiAgICAgICAgIGlmICgkc3Zn V3JhcHBlZE5hdGl2ZVR5cGUgPX4gL0xpc3QkLykgewogICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnREZWNscywgPDxFTkQpOwotICAgICRzdmdOYXRpdmVUeXBlKiBpbXAgPSBWOCR7aW50ZXJm YWNlTmFtZX06OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOworICAgICRzdmdOYXRpdmVUeXBlKiBp bXAgPSAke3Y4SW50ZXJmYWNlTmFtZX06OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwogRU5ECiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiRXhjZXB0aW9u Q29kZS5oIik7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICRzdmdO YXRpdmVUeXBlKiB3cmFwcGVyID0gVjgke2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShpbmZvLkhv bGRlcigpKTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICAk c3ZnTmF0aXZlVHlwZSogd3JhcHBlciA9ICR7djhJbnRlcmZhY2VOYW1lfTo6dG9OYXRpdmUoaW5m by5Ib2xkZXIoKSk7XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIg ICAgaWYgKHdyYXBwZXItPmlzUmVhZE9ubHkoKSkge1xuIik7CiAgICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudERlY2xzLCAiICAgICAgICBzZXRET01FeGNlcHRpb24oTk9fTU9ESUZJQ0FUSU9O X0FMTE9XRURfRVJSLCBpbmZvLkdldElzb2xhdGUoKSk7XG4iKTsKICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybjtcbiIpOwpAQCAtMTIxMCw3ICsxMjEy LDcgQEAgRU5ECiAgICAgICAgIH0KICAgICB9IGVsc2lmICgkYXR0ckV4dC0+eyJWOE9uUHJvdG8i fSkgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7Ci0gICAgJHtpbnRl cmZhY2VOYW1lfSogaW1wID0gVjgke2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShpbmZvLkhvbGRl cigpKTsKKyAgICAke2ludGVyZmFjZU5hbWV9KiBpbXAgPSAke3Y4SW50ZXJmYWNlTmFtZX06OnRv TmF0aXZlKGluZm8uSG9sZGVyKCkpOwogRU5ECiAgICAgfSBlbHNlIHsKICAgICAgICAgbXkgJGF0 dHJUeXBlID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT50eXBlOwpAQCAtMTIzMSw3ICsxMjMzLDcg QEAgRU5ECiAKICAgICAgICAgaWYgKCEkYXR0cmlidXRlLT5pc1N0YXRpYykgewogICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwotICAgICR7aW50ZXJmYWNlTmFtZX0q IGltcCA9IFY4JHtpbnRlcmZhY2VOYW1lfTo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7CisgICAg JHtpbnRlcmZhY2VOYW1lfSogaW1wID0gJHt2OEludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShpbmZv LkhvbGRlcigpKTsKIEVORAogICAgICAgICB9CiAgICAgfQpAQCAtMTI3NSw3ICsxMjc3LDcgQEAg RU5ECiAgICAgICAgICAgICBteSAkaW1wbFNldHRlckZ1bmN0aW9uTmFtZSA9ICRjb2RlR2VuZXJh dG9yLT5XS191Y2ZpcnN0KCRhdHRyTmFtZSk7CiAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRl cygiVjhBYnN0cmFjdEV2ZW50TGlzdGVuZXIuaCIpOwogICAgICAgICAgICAgaWYgKCEkY29kZUdl bmVyYXRvci0+SXNTdWJUeXBlKCRkYXRhTm9kZSwgIk5vZGUiKSkgewotICAgICAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgdHJhbnNmZXJIaWRkZW5EZXBlbmRlbmN5KGlu Zm8uSG9sZGVyKCksIGltcC0+JGF0dHJOYW1lKCksIHZhbHVlLCBWOCR7aW50ZXJmYWNlTmFtZX06 OmV2ZW50TGlzdGVuZXJDYWNoZUluZGV4KTtcbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50RGVjbHMsICIgICAgdHJhbnNmZXJIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVy KCksIGltcC0+JGF0dHJOYW1lKCksIHZhbHVlLCAke3Y4SW50ZXJmYWNlTmFtZX06OmV2ZW50TGlz dGVuZXJDYWNoZUluZGV4KTtcbiIpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCRp bnRlcmZhY2VOYW1lIGVxICJXb3JrZXJDb250ZXh0IiBhbmQgJGF0dHJpYnV0ZS0+c2lnbmF0dXJl LT5uYW1lIGVxICJvbmVycm9yIikgewogICAgICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVz KCJWOEV2ZW50TGlzdGVuZXJMaXN0LmgiKTsKQEAgLTE1MDYsNiArMTUwOCw3IEBAIHN1YiBHZW5l cmF0ZUZ1bmN0aW9uQ2FsbGJhY2sKICAgICBteSAkZGF0YU5vZGUgPSBzaGlmdDsKIAogICAgIG15 ICRpbnRlcmZhY2VOYW1lID0gJGRhdGFOb2RlLT5uYW1lOworICAgIG15ICR2OEludGVyZmFjZU5h bWUgPSAiVjgkaW50ZXJmYWNlTmFtZSI7CiAgICAgbXkgJG5hbWUgPSAkZnVuY3Rpb24tPnNpZ25h dHVyZS0+bmFtZTsKIAogICAgIGlmIChAeyRmdW5jdGlvbi0+e292ZXJsb2Fkc319ID4gMSkgewpA QCAtMTUzOCw3ICsxNTQxLDcgQEAgRU5ECiAgICAgaWYgKCRuYW1lIGVxICJzZXQiIGFuZCAkZGF0 YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJUeXBlZEFycmF5In0pIHsKICAgICAgICAgQWRk VG9JbXBsSW5jbHVkZXMoIlY4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgiKTsKICAgICAgICAgcHVz aChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwotICAgIHJldHVybiBzZXRXZWJHTEFycmF5SGVs cGVyPCRpbnRlcmZhY2VOYW1lLCBWOCR7aW50ZXJmYWNlTmFtZX0+KGFyZ3MpOworICAgIHJldHVy biBzZXRXZWJHTEFycmF5SGVscGVyPCRpbnRlcmZhY2VOYW1lLCAke3Y4SW50ZXJmYWNlTmFtZX0+ KGFyZ3MpOwogfQogCiBFTkQKQEAgLTE1NTAsMTAgKzE1NTMsMTAgQEAgRU5ECiAgICAgaWYgKCRz dmdOYXRpdmVUeXBlKSB7CiAgICAgICAgIG15ICRuYXRpdmVDbGFzc05hbWUgPSBHZXROYXRpdmVU eXBlKCRpbnRlcmZhY2VOYW1lKTsgCiAgICAgICAgIGlmICgkaW50ZXJmYWNlTmFtZSA9fiAvTGlz dCQvKSB7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICRuYXRpdmVD bGFzc05hbWUgaW1wID0gVjgke2ludGVyZmFjZU5hbWV9Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigp KTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICAkbmF0aXZl Q2xhc3NOYW1lIGltcCA9ICR7djhJbnRlcmZhY2VOYW1lfTo6dG9OYXRpdmUoYXJncy5Ib2xkZXIo KSk7XG4iKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVz KCJFeGNlcHRpb25Db2RlLmgiKTsKLSAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMs ICIgICAgJG5hdGl2ZUNsYXNzTmFtZSB3cmFwcGVyID0gVjgke2ludGVyZmFjZU5hbWV9Ojp0b05h dGl2ZShhcmdzLkhvbGRlcigpKTtcbiIpOworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnRE ZWNscywgIiAgICAkbmF0aXZlQ2xhc3NOYW1lIHdyYXBwZXIgPSAke3Y4SW50ZXJmYWNlTmFtZX06 OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpO1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudERlY2xzLCAiICAgIGlmICh3cmFwcGVyLT5pc1JlYWRPbmx5KCkpXG4iKTsKICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybiBzZXRET01FeGNlcHRp b24oTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7XG4iKTsK ICAgICAgICAgICAgIG15ICRzdmdXcmFwcGVkTmF0aXZlVHlwZSA9ICRjb2RlR2VuZXJhdG9yLT5H ZXRTVkdXcmFwcGVkVHlwZU5lZWRpbmdUZWFyT2ZmKCRpbnRlcmZhY2VOYW1lKTsKQEAgLTE1NjIs NyArMTU2NSw3IEBAIEVORAogICAgICAgICB9CiAgICAgfSBlbHNpZiAoISRmdW5jdGlvbi0+aXNT dGF0aWMpIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwotICAgICR7 aW50ZXJmYWNlTmFtZX0qIGltcCA9IFY4JHtpbnRlcmZhY2VOYW1lfTo6dG9OYXRpdmUoYXJncy5I b2xkZXIoKSk7CisgICAgJHtpbnRlcmZhY2VOYW1lfSogaW1wID0gJHt2OEludGVyZmFjZU5hbWV9 Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKIEVORAogICAgIH0KIApAQCAtMjA5MSw2ICsyMDk0 LDcgQEAgc3ViIEdlbmVyYXRlTmFtZWRDb25zdHJ1Y3RvckNhbGxiYWNrCiAgICAgbXkgJGRhdGFO b2RlID0gc2hpZnQ7CiAKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9ICRkYXRhTm9kZS0+bmFtZTsK KyAgICBteSAkdjhJbnRlcmZhY2VOYW1lID0gIlY4JGludGVyZmFjZU5hbWUiOwogICAgIG15ICRy YWlzZXNFeGNlcHRpb25zID0gQHskZnVuY3Rpb24tPnJhaXNlc0V4Y2VwdGlvbnN9OwogICAgIGlm ICgkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25zdHJ1Y3RvclJhaXNlc0V4Y2Vw dGlvbiJ9KSB7CiAgICAgICAgICRyYWlzZXNFeGNlcHRpb25zID0gMTsKQEAgLTIxMTAsMTQgKzIx MTQsMTQgQEAgc3ViIEdlbmVyYXRlTmFtZWRDb25zdHJ1Y3RvckNhbGxiYWNrCiAKICAgICBteSAk dG9BY3RpdmVET01PYmplY3QgPSAiMCI7CiAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkFjdGl2ZURPTU9iamVjdCJ9KSB7Ci0gICAgICAgICR0b0FjdGl2ZURPTU9iamVj dCA9ICJWOCR7aW50ZXJmYWNlTmFtZX06OnRvQWN0aXZlRE9NT2JqZWN0IjsKKyAgICAgICAgJHRv QWN0aXZlRE9NT2JqZWN0ID0gIiR7djhJbnRlcmZhY2VOYW1lfTo6dG9BY3RpdmVET01PYmplY3Qi OwogICAgIH0KICAgICBBZGRUb0ltcGxJbmNsdWRlcygiRnJhbWUuaCIpOwogCiAgICAgcHVzaChA aW1wbENvbnRlbnQsIDw8RU5EKTsKLVdyYXBwZXJUeXBlSW5mbyBWOCR7aW50ZXJmYWNlTmFtZX1D b25zdHJ1Y3Rvcjo6aW5mbyA9IHsgVjgke2ludGVyZmFjZU5hbWV9Q29uc3RydWN0b3I6OkdldFRl bXBsYXRlLCBWOCR7aW50ZXJmYWNlTmFtZX06OmRlcmVmT2JqZWN0LCAke3RvQWN0aXZlRE9NT2Jq ZWN0fSwgMCwgVjgke2ludGVyZmFjZU5hbWV9OjppbnN0YWxsUGVyQ29udGV4dFByb3RvdHlwZVBy b3BlcnRpZXMsIDAsIFdyYXBwZXJUeXBlT2JqZWN0UHJvdG90eXBlIH07CitXcmFwcGVyVHlwZUlu Zm8gJHt2OEludGVyZmFjZU5hbWV9Q29uc3RydWN0b3I6OmluZm8gPSB7ICR7djhJbnRlcmZhY2VO YW1lfUNvbnN0cnVjdG9yOjpHZXRUZW1wbGF0ZSwgJHt2OEludGVyZmFjZU5hbWV9OjpkZXJlZk9i amVjdCwgJHt0b0FjdGl2ZURPTU9iamVjdH0sIDAsICR7djhJbnRlcmZhY2VOYW1lfTo6aW5zdGFs bFBlckNvbnRleHRQcm90b3R5cGVQcm9wZXJ0aWVzLCAwLCBXcmFwcGVyVHlwZU9iamVjdFByb3Rv dHlwZSB9OwogCi1zdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4JHtpbnRlcmZhY2VOYW1l fUNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKK3N0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gJHt2OEludGVyZmFjZU5hbWV9Q29uc3RydWN0b3JDYWxsYmFj ayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAgIElOQ19TVEFUUygiRE9NLiR7aW50 ZXJmYWNlTmFtZX0uQ29uc3RydWN0b3IiKTsKICAgICAke21heWJlT2JzZXJ2ZUZlYXR1cmV9CkBA IC0yMTc2LDcgKzIxODAsNyBAQCBFTkQKIAogICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7 CiAKLSAgICBWOERPTVdyYXBwZXI6OmNyZWF0ZURPTVdyYXBwZXIoaW1wbC5yZWxlYXNlKCksICZW OCR7aW50ZXJmYWNlTmFtZX1Db25zdHJ1Y3Rvcjo6aW5mbywgd3JhcHBlciwgYXJncy5HZXRJc29s YXRlKCkpOworICAgIFY4RE9NV3JhcHBlcjo6Y3JlYXRlRE9NV3JhcHBlcihpbXBsLnJlbGVhc2Uo KSwgJiR7djhJbnRlcmZhY2VOYW1lfUNvbnN0cnVjdG9yOjppbmZvLCB3cmFwcGVyLCBhcmdzLkdl dElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHdyYXBwZXI7CiBFTkQKIApAQCAtMjE4OSwxOSArMjE5 MywxOSBAQCBFTkQKIAogICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CiAKLXY4OjpQZXJz aXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOCR7aW50ZXJmYWNlTmFtZX1Db25zdHJ1Y3Rv cjo6R2V0VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+ICR7 djhJbnRlcmZhY2VOYW1lfUNvbnN0cnVjdG9yOjpHZXRUZW1wbGF0ZSgpCiB7CiAgICAgc3RhdGlj IHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBjYWNoZWRUZW1wbGF0ZTsKICAg ICBpZiAoIWNhY2hlZFRlbXBsYXRlLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGNhY2hlZFRl bXBsYXRlOwogCiAgICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwotICAgIHY4OjpMb2NhbDx2ODo6 RnVuY3Rpb25UZW1wbGF0ZT4gcmVzdWx0ID0gdjg6OkZ1bmN0aW9uVGVtcGxhdGU6Ok5ldyhWOCR7 aW50ZXJmYWNlTmFtZX1Db25zdHJ1Y3RvckNhbGxiYWNrKTsKKyAgICB2ODo6TG9jYWw8djg6OkZ1 bmN0aW9uVGVtcGxhdGU+IHJlc3VsdCA9IHY4OjpGdW5jdGlvblRlbXBsYXRlOjpOZXcoJHt2OElu dGVyZmFjZU5hbWV9Q29uc3RydWN0b3JDYWxsYmFjayk7CiAKICAgICB2ODo6TG9jYWw8djg6Ok9i amVjdFRlbXBsYXRlPiBpbnN0YW5jZSA9IHJlc3VsdC0+SW5zdGFuY2VUZW1wbGF0ZSgpOwotICAg IGluc3RhbmNlLT5TZXRJbnRlcm5hbEZpZWxkQ291bnQoVjgke2ludGVyZmFjZU5hbWV9OjppbnRl cm5hbEZpZWxkQ291bnQpOworICAgIGluc3RhbmNlLT5TZXRJbnRlcm5hbEZpZWxkQ291bnQoJHt2 OEludGVyZmFjZU5hbWV9OjppbnRlcm5hbEZpZWxkQ291bnQpOwogICAgIHJlc3VsdC0+U2V0Q2xh c3NOYW1lKHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiJHtpbnRlcmZhY2VOYW1lfSIpKTsKLSAgICBy ZXN1bHQtPkluaGVyaXQoVjgke2ludGVyZmFjZU5hbWV9OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICBy ZXN1bHQtPkluaGVyaXQoJHt2OEludGVyZmFjZU5hbWV9OjpHZXRUZW1wbGF0ZSgpKTsKIAogICAg IGNhY2hlZFRlbXBsYXRlID0gdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+OjpO ZXcocmVzdWx0KTsKICAgICByZXR1cm4gY2FjaGVkVGVtcGxhdGU7CkBAIC0yNDQxLDYgKzI0NDUs NyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkluZGV4ZXIKICAgICBteSAkZGF0YU5vZGUg PSBzaGlmdDsKICAgICBteSAkaW5kZXhlciA9IHNoaWZ0OwogICAgIG15ICRpbnRlcmZhY2VOYW1l ID0gJGRhdGFOb2RlLT5uYW1lOworICAgIG15ICR2OEludGVyZmFjZU5hbWUgPSAiVjgkaW50ZXJm YWNlTmFtZSI7CiAKICAgICAjIEZJWE1FOiBGaWd1cmUgb3V0IHdoYXQgTnVtZXJpY0luZGV4ZWRH ZXR0ZXIgaXMgcmVhbGx5IHN1cHBvc2VkIHRvIGRvLiBSaWdodCBub3csIGl0J3Mgb25seSBzZXQg b24gV2ViR0wtcmVsYXRlZCBmaWxlcy4KICAgICBteSAkaGFzQ3VzdG9tU2V0dGVyID0gJGRhdGFO b2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tSW5kZXhlZFNldHRlciJ9ICYmICEkZGF0 YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJOdW1lcmljSW5kZXhlZEdldHRlciJ9OwpAQCAt MjUxNywxMCArMjUyMiwxMCBAQCBFTkQKICAgICAgICAgJGhhc0RlbGV0ZXIgPSAwOwogICAgIH0K IAotICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGRlc2MtPiR7c2V0T259VGVtcGxhdGUoKS0+ U2V0SW5kZXhlZFByb3BlcnR5SGFuZGxlcihWOCR7aW50ZXJmYWNlTmFtZX06OmluZGV4ZWRQcm9w ZXJ0eUdldHRlciIpOwotICAgIHB1c2goQGltcGxDb250ZW50LCAkaGFzQ3VzdG9tU2V0dGVyID8g IiwgVjgke2ludGVyZmFjZU5hbWV9OjppbmRleGVkUHJvcGVydHlTZXR0ZXIiIDogIiwgMCIpOwor ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGRlc2MtPiR7c2V0T259VGVtcGxhdGUoKS0+U2V0 SW5kZXhlZFByb3BlcnR5SGFuZGxlcigke3Y4SW50ZXJmYWNlTmFtZX06OmluZGV4ZWRQcm9wZXJ0 eUdldHRlciIpOworICAgIHB1c2goQGltcGxDb250ZW50LCAkaGFzQ3VzdG9tU2V0dGVyID8gIiwg JHt2OEludGVyZmFjZU5hbWV9OjppbmRleGVkUHJvcGVydHlTZXR0ZXIiIDogIiwgMCIpOwogICAg IHB1c2goQGltcGxDb250ZW50LCAiLCAwIik7ICMgSW5kZXhlZFByb3BlcnR5UXVlcnkgLS0gbm90 IGJlaW5nIHVzZWQgYXQgdGhlIG1vbWVudC4KLSAgICBwdXNoKEBpbXBsQ29udGVudCwgJGhhc0Rl bGV0ZXIgPyAiLCBWOCR7aW50ZXJmYWNlTmFtZX06OmluZGV4ZWRQcm9wZXJ0eURlbGV0ZXIiIDog IiwgMCIpOworICAgIHB1c2goQGltcGxDb250ZW50LCAkaGFzRGVsZXRlciA/ICIsICR7djhJbnRl cmZhY2VOYW1lfTo6aW5kZXhlZFByb3BlcnR5RGVsZXRlciIgOiAiLCAwIik7CiAgICAgcHVzaChA aW1wbENvbnRlbnQsICIsIG5vZGVDb2xsZWN0aW9uSW5kZXhlZFByb3BlcnR5RW51bWVyYXRvcjwk e2ludGVyZmFjZU5hbWV9PiIpIGlmICRoYXNFbnVtZXJhdG9yOwogICAgIHB1c2goQGltcGxDb250 ZW50LCAiKTtcbiIpOwogfQpAQCAtMjUzMCw2ICsyNTM1LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVt ZW50YXRpb25OYW1lZFByb3BlcnR5R2V0dGVyCiAgICAgbXkgJGRhdGFOb2RlID0gc2hpZnQ7CiAg ICAgbXkgJG5hbWVkUHJvcGVydHlHZXR0ZXIgPSBzaGlmdDsKICAgICBteSAkaW50ZXJmYWNlTmFt ZSA9ICRkYXRhTm9kZS0+bmFtZTsKKyAgICBteSAkdjhJbnRlcmZhY2VOYW1lID0gIlY4JGludGVy ZmFjZU5hbWUiOwogICAgIG15ICRoYXNDdXN0b21OYW1lZEdldHRlciA9ICRkYXRhTm9kZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbU5hbWVkR2V0dGVyIn0gfHwgJGRhdGFOb2RlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tR2V0T3duUHJvcGVydHlTbG90In07CiAKICAgICBpZiAo JGludGVyZmFjZU5hbWUgZXEgIkhUTUxBcHBsZXRFbGVtZW50IiB8fCAkaW50ZXJmYWNlTmFtZSBl cSAiSFRNTEVtYmVkRWxlbWVudCIgfHwgJGludGVyZmFjZU5hbWUgZXEgIkhUTUxPYmplY3RFbGVt ZW50IikgewpAQCAtMjU3MywxMiArMjU3OSwxMiBAQCBFTkQKICAgICAgICAgJGhhc0VudW1lcmF0 b3IgPSAwOwogICAgIH0KIAotICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGRlc2MtPiR7c2V0 T259VGVtcGxhdGUoKS0+U2V0TmFtZWRQcm9wZXJ0eUhhbmRsZXIoVjgke2ludGVyZmFjZU5hbWV9 OjpuYW1lZFByb3BlcnR5R2V0dGVyLCAiKTsKLSAgICBwdXNoKEBpbXBsQ29udGVudCwgJGhhc0N1 c3RvbU5hbWVkU2V0dGVyID8gIlY4JHtpbnRlcmZhY2VOYW1lfTo6bmFtZWRQcm9wZXJ0eVNldHRl ciwgIiA6ICIwLCAiKTsKKyAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBkZXNjLT4ke3NldE9u fVRlbXBsYXRlKCktPlNldE5hbWVkUHJvcGVydHlIYW5kbGVyKCR7djhJbnRlcmZhY2VOYW1lfTo6 bmFtZWRQcm9wZXJ0eUdldHRlciwgIik7CisgICAgcHVzaChAaW1wbENvbnRlbnQsICRoYXNDdXN0 b21OYW1lZFNldHRlciA/ICIke3Y4SW50ZXJmYWNlTmFtZX06Om5hbWVkUHJvcGVydHlTZXR0ZXIs ICIgOiAiMCwgIik7CiAgICAgIyBJZiB0aGVyZSBpcyBhIGN1c3RvbSBlbnVtZXJhdG9yLCB0aGVy ZSBNVVNUIGJlIGN1c3RvbSBxdWVyeSB0byBwcm9wZXJseSBjb21tdW5pY2F0ZSBwcm9wZXJ0eSBh dHRyaWJ1dGVzLgotICAgIHB1c2goQGltcGxDb250ZW50LCAkaGFzRW51bWVyYXRvciA/ICJWOCR7 aW50ZXJmYWNlTmFtZX06Om5hbWVkUHJvcGVydHlRdWVyeSwgIiA6ICIwLCAiKTsKLSAgICBwdXNo KEBpbXBsQ29udGVudCwgJGhhc0RlbGV0ZXIgPyAiVjgke2ludGVyZmFjZU5hbWV9OjpuYW1lZFBy b3BlcnR5RGVsZXRlciwgIiA6ICIwLCAiKTsKLSAgICBwdXNoKEBpbXBsQ29udGVudCwgJGhhc0Vu dW1lcmF0b3IgPyAiVjgke2ludGVyZmFjZU5hbWV9OjpuYW1lZFByb3BlcnR5RW51bWVyYXRvciIg OiAiMCIpOworICAgIHB1c2goQGltcGxDb250ZW50LCAkaGFzRW51bWVyYXRvciA/ICIke3Y4SW50 ZXJmYWNlTmFtZX06Om5hbWVkUHJvcGVydHlRdWVyeSwgIiA6ICIwLCAiKTsKKyAgICBwdXNoKEBp bXBsQ29udGVudCwgJGhhc0RlbGV0ZXIgPyAiJHt2OEludGVyZmFjZU5hbWV9OjpuYW1lZFByb3Bl cnR5RGVsZXRlciwgIiA6ICIwLCAiKTsKKyAgICBwdXNoKEBpbXBsQ29udGVudCwgJGhhc0VudW1l cmF0b3IgPyAiJHt2OEludGVyZmFjZU5hbWV9OjpuYW1lZFByb3BlcnR5RW51bWVyYXRvciIgOiAi MCIpOwogICAgIHB1c2goQGltcGxDb250ZW50LCAiKTtcbiIpOwogfQogCkBAIC0yNzExLDcgKzI3 MTcsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogdjg6OkhhbmRsZTx2ODo6T2JqZWN0 PiB3cmFwKCRpbnRlcmZhY2VOYW1lKiBpbXBsLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGNyZWF0 aW9uQ29udGV4dCwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAgICAgQVNTRVJUKGltcGwpOwot ICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9IFY4JHtpbnRlcmZhY2VOYW1lfTo6 Y3JlYXRlV3JhcHBlcihpbXBsLCBjcmVhdGlvbkNvbnRleHQsIGlzb2xhdGUpOworICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9ICR7djhJbnRlcmZhY2VOYW1lfTo6Y3JlYXRlV3Jh cHBlcihpbXBsLCBjcmVhdGlvbkNvbnRleHQsIGlzb2xhdGUpOwogICAgIGlmICghd3JhcHBlci5J c0VtcHR5KCkpCiAgICAgICAgIHdyYXBwZXItPlNldEluZGV4ZWRQcm9wZXJ0aWVzVG9FeHRlcm5h bEFycmF5RGF0YShpbXBsLT5iYXNlQWRkcmVzcygpLCAkdmlld1R5cGUsIGltcGwtPmxlbmd0aCgp KTsKICAgICByZXR1cm4gd3JhcHBlcjsKQEAgLTI3OTgsNyArMjgwNCw3IEBAIEVORAogICAgIG15 ICRoYXNfYXR0cmlidXRlcyA9IDA7CiAgICAgaWYgKEAkYXR0cmlidXRlcykgewogICAgICAgICAk aGFzX2F0dHJpYnV0ZXMgPSAxOwotICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgInN0YXRpYyBj b25zdCBWOERPTUNvbmZpZ3VyYXRpb246OkJhdGNoZWRBdHRyaWJ1dGUgVjgke2ludGVyZmFjZU5h bWV9QXR0cnNbXSA9IHtcbiIpOworICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgInN0YXRpYyBj b25zdCBWOERPTUNvbmZpZ3VyYXRpb246OkJhdGNoZWRBdHRyaWJ1dGUgJHt2OEludGVyZmFjZU5h bWV9QXR0cnNbXSA9IHtcbiIpOwogICAgICAgICBHZW5lcmF0ZUJhdGNoZWRBdHRyaWJ1dGVEYXRh KCRkYXRhTm9kZSwgJGF0dHJpYnV0ZXMpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn07 XG5cbiIpOwogICAgIH0KQEAgLTI4MTMsNyArMjgxOSw3IEBAIEVORAogICAgICAgICBuZXh0IGlm ICFJc1N0YW5kYXJkRnVuY3Rpb24oJGRhdGFOb2RlLCAkZnVuY3Rpb24pOwogICAgICAgICBpZiAo ISRoYXNfY2FsbGJhY2tzKSB7CiAgICAgICAgICAgICAkaGFzX2NhbGxiYWNrcyA9IDE7Ci0gICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgInN0YXRpYyBjb25zdCBWOERPTUNvbmZpZ3VyYXRp b246OkJhdGNoZWRDYWxsYmFjayBWOCR7aW50ZXJmYWNlTmFtZX1DYWxsYmFja3NbXSA9IHtcbiIp OworICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJzdGF0aWMgY29uc3QgVjhET01Db25m aWd1cmF0aW9uOjpCYXRjaGVkQ2FsbGJhY2sgJHt2OEludGVyZmFjZU5hbWV9Q2FsbGJhY2tzW10g PSB7XG4iKTsKICAgICAgICAgfQogICAgICAgICBteSAkbmFtZSA9ICRmdW5jdGlvbi0+c2lnbmF0 dXJlLT5uYW1lOwogICAgICAgICBteSAkY2FsbGJhY2sgPSBHZXRGdW5jdGlvblRlbXBsYXRlQ2Fs bGJhY2tOYW1lKCRmdW5jdGlvbiwgJGludGVyZmFjZU5hbWUpOwpAQCAtMjgzMiw3ICsyODM4LDcg QEAgRU5ECiAgICAgbXkgQGNvbnN0YW50c0VuYWJsZWRBdFJ1bnRpbWU7CiAgICAgaWYgKEB7JGRh dGFOb2RlLT5jb25zdGFudHN9KSB7CiAgICAgICAgICRoYXNfY29uc3RhbnRzID0gMTsKLSAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICJzdGF0aWMgY29uc3QgVjhET01Db25maWd1cmF0aW9uOjpC YXRjaGVkQ29uc3RhbnQgVjgke2ludGVyZmFjZU5hbWV9Q29uc3RzW10gPSB7XG4iKTsKKyAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICJzdGF0aWMgY29uc3QgVjhET01Db25maWd1cmF0aW9uOjpC YXRjaGVkQ29uc3RhbnQgJHt2OEludGVyZmFjZU5hbWV9Q29uc3RzW10gPSB7XG4iKTsKICAgICB9 CiAgICAgZm9yZWFjaCBteSAkY29uc3RhbnQgKEB7JGRhdGFOb2RlLT5jb25zdGFudHN9KSB7CiAg ICAgICAgIG15ICRuYW1lID0gJGNvbnN0YW50LT5uYW1lOwpAQCAtMjg3OCw3ICsyODg0LDcgQEAg RU5ECiAKICAgICBteSAkYWNjZXNzX2NoZWNrID0gIiI7CiAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkNoZWNrU2VjdXJpdHkifSAmJiAhKCRpbnRlcmZhY2VOYW1lIGVx ICJET01XaW5kb3ciKSkgewotICAgICAgICAkYWNjZXNzX2NoZWNrID0gImluc3RhbmNlLT5TZXRB Y2Nlc3NDaGVja0NhbGxiYWNrcyhWOCR7aW50ZXJmYWNlTmFtZX06Om5hbWVkU2VjdXJpdHlDaGVj aywgVjgke2ludGVyZmFjZU5hbWV9OjppbmRleGVkU2VjdXJpdHlDaGVjaywgdjg6OkV4dGVybmFs OjpOZXcoJlY4JHtpbnRlcmZhY2VOYW1lfTo6aW5mbykpOyI7CisgICAgICAgICRhY2Nlc3NfY2hl Y2sgPSAiaW5zdGFuY2UtPlNldEFjY2Vzc0NoZWNrQ2FsbGJhY2tzKCR7djhJbnRlcmZhY2VOYW1l fTo6bmFtZWRTZWN1cml0eUNoZWNrLCAke3Y4SW50ZXJmYWNlTmFtZX06OmluZGV4ZWRTZWN1cml0 eUNoZWNrLCB2ODo6RXh0ZXJuYWw6Ok5ldygmJHt2OEludGVyZmFjZU5hbWV9OjppbmZvKSk7IjsK ICAgICB9CiAKICAgICAjIEZvciB0aGUgRE9NV2luZG93IGludGVyZmFjZSwgZ2VuZXJhdGUgdGhl IHNoYWRvdyBvYmplY3QgdGVtcGxhdGUKQEAgLTI5MTMsMTcgKzI5MTksMTcgQEAgRU5ECiAgICAg ICAgIG15ICRlbmFibGVfZnVuY3Rpb24gPSBHZXRSdW50aW1lRW5hYmxlRnVuY3Rpb25OYW1lKCRk YXRhTm9kZSk7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CiAgICAgaWYgKCEk e2VuYWJsZV9mdW5jdGlvbn0oKSkKLSAgICAgICAgZGVmYXVsdFNpZ25hdHVyZSA9IFY4RE9NQ29u ZmlndXJhdGlvbjo6Y29uZmlndXJlVGVtcGxhdGUoZGVzYywgXCJcIiwgJHBhcmVudENsYXNzVGVt cGxhdGUsIFY4JHtpbnRlcmZhY2VOYW1lfTo6aW50ZXJuYWxGaWVsZENvdW50LCAwLCAwLCAwLCAw KTsKKyAgICAgICAgZGVmYXVsdFNpZ25hdHVyZSA9IFY4RE9NQ29uZmlndXJhdGlvbjo6Y29uZmln dXJlVGVtcGxhdGUoZGVzYywgXCJcIiwgJHBhcmVudENsYXNzVGVtcGxhdGUsICR7djhJbnRlcmZh Y2VOYW1lfTo6aW50ZXJuYWxGaWVsZENvdW50LCAwLCAwLCAwLCAwKTsKICAgICBlbHNlCiBFTkQK ICAgICB9CiAgICAgcHVzaChAaW1wbENvbnRlbnQsICA8PEVORCk7Ci0gICAgZGVmYXVsdFNpZ25h dHVyZSA9IFY4RE9NQ29uZmlndXJhdGlvbjo6Y29uZmlndXJlVGVtcGxhdGUoZGVzYywgXCIke3Zp c2libGVJbnRlcmZhY2VOYW1lfVwiLCAkcGFyZW50Q2xhc3NUZW1wbGF0ZSwgVjgke2ludGVyZmFj ZU5hbWV9OjppbnRlcm5hbEZpZWxkQ291bnQsCisgICAgZGVmYXVsdFNpZ25hdHVyZSA9IFY4RE9N Q29uZmlndXJhdGlvbjo6Y29uZmlndXJlVGVtcGxhdGUoZGVzYywgXCIke3Zpc2libGVJbnRlcmZh Y2VOYW1lfVwiLCAkcGFyZW50Q2xhc3NUZW1wbGF0ZSwgJHt2OEludGVyZmFjZU5hbWV9OjppbnRl cm5hbEZpZWxkQ291bnQsCiBFTkQKICAgICAjIFNldCB1cCBvdXIgYXR0cmlidXRlcyBpZiB3ZSBo YXZlIHRoZW0KICAgICBpZiAoJGhhc19hdHRyaWJ1dGVzKSB7CiAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCA8PEVORCk7Ci0gICAgICAgIFY4JHtpbnRlcmZhY2VOYW1lfUF0dHJzLCBXVEZfQVJS QVlfTEVOR1RIKFY4JHtpbnRlcmZhY2VOYW1lfUF0dHJzKSwKKyAgICAgICAgJHt2OEludGVyZmFj ZU5hbWV9QXR0cnMsIFdURl9BUlJBWV9MRU5HVEgoJHt2OEludGVyZmFjZU5hbWV9QXR0cnMpLAog RU5ECiAgICAgfSBlbHNlIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsKQEAg LTI5MzMsNyArMjkzOSw3IEBAIEVORAogCiAgICAgaWYgKCRoYXNfY2FsbGJhY2tzKSB7CiAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7Ci0gICAgICAgIFY4JHtpbnRlcmZhY2VOYW1l fUNhbGxiYWNrcywgV1RGX0FSUkFZX0xFTkdUSChWOCR7aW50ZXJmYWNlTmFtZX1DYWxsYmFja3Mp KTsKKyAgICAgICAgJHt2OEludGVyZmFjZU5hbWV9Q2FsbGJhY2tzLCBXVEZfQVJSQVlfTEVOR1RI KCR7djhJbnRlcmZhY2VOYW1lfUNhbGxiYWNrcykpOwogRU5ECiAgICAgfSBlbHNlIHsKICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsKQEAgLTI5NDgsNyArMjk1NCw3IEBAIEVORAog CiAgICAgaWYgKElzQ29uc3RydWN0YWJsZSgkZGF0YU5vZGUpKSB7CiAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCA8PEVORCk7Ci0gICAgZGVzYy0+U2V0Q2FsbEhhbmRsZXIoVjgke2ludGVyZmFj ZU5hbWV9Ojpjb25zdHJ1Y3RvckNhbGxiYWNrKTsKKyAgICBkZXNjLT5TZXRDYWxsSGFuZGxlcigk e3Y4SW50ZXJmYWNlTmFtZX06OmNvbnN0cnVjdG9yQ2FsbGJhY2spOwogRU5ECiAgICAgfQogCkBA IC0zMDE1LDcgKzMwMjEsNyBAQCBFTkQKIAogICAgIGlmICgkaGFzX2NvbnN0YW50cykgewogICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgPDxFTkQpOwotICAgIFY4RE9NQ29uZmlndXJhdGlvbjo6 YmF0Y2hDb25maWd1cmVDb25zdGFudHMoZGVzYywgcHJvdG8sIFY4JHtpbnRlcmZhY2VOYW1lfUNv bnN0cywgV1RGX0FSUkFZX0xFTkdUSChWOCR7aW50ZXJmYWNlTmFtZX1Db25zdHMpKTsKKyAgICBW OERPTUNvbmZpZ3VyYXRpb246OmJhdGNoQ29uZmlndXJlQ29uc3RhbnRzKGRlc2MsIHByb3RvLCAk e3Y4SW50ZXJmYWNlTmFtZX1Db25zdHMsIFdURl9BUlJBWV9MRU5HVEgoJHt2OEludGVyZmFjZU5h bWV9Q29uc3RzKSk7CiBFTkQKICAgICB9CiAK