148543 2015-08-27 16:15:10 -0700 Add module loader "resolve" hook for local file system to test the loader in JSC shell 2015-08-27 16:48:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki darin fpizlo ggaren mark.lam saam oldest_to_newest 1121472 0 ysuzuki 2015-08-27 16:15:10 -0700 Add module loader "resolve" hook for local file system to test the loader in JSC shell 1121476 1 260095 ysuzuki 2015-08-27 16:22:15 -0700 Created attachment 260095 Patch 1121486 2 ysuzuki 2015-08-27 16:48:29 -0700 Committed r189071: <http://trac.webkit.org/changeset/189071> 260095 2015-08-27 16:22:15 -0700 2015-08-27 16:46:04 -0700 Patch bug-148543-20150827162203.patch text/plain 15792 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj OWZhM2I5YWU1ZDQzYTQ5MzljODFmZDNjN2MzMzIyZTU3MmQ1ZmJlLi5jNGM0MDM4M2Y1ODM0MjZm YTY2ZWNiZGFkZmI4ZDM4ZWJmN2ViOWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNS0wOC0yNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBBZGQgbW9kdWxlIGxvYWRlciAicmVzb2x2ZSIgaG9vayBmb3IgbG9j YWwgZmlsZSBzeXN0ZW0gdG8gdGVzdCB0aGUgbG9hZGVyIGluIEpTQyBzaGVsbAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTQzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBtb2R1bGUgbG9h ZGVyICJyZXNvbHZlIiBob29rIHRvIHRoZSBKU0Mgc2hlbGwuCisgICAgICAgIEl0IHRha2VzIHRo ZSBtb2R1bGUgbmFtZSBhbmQgdGhlIHJlZmVycmVyIG1vZHVsZSBrZXkgYW5kIHJlc29sdmVzIHRo ZSBuYW1lIHRvIHRoZSB1bmlxdWUgbW9kdWxlIGtleS4KKworICAgICAgICByZXNvbHZlKE1vZHVs ZU5hbWUgbW9kdWxlTmFtZSwgTW9kdWxlS2V5IHJlZmVycmVyKSAtPiBQcm9taXNlPE1vZHVsZUtl eT4KKworICAgICAgICBJbiB0aGUgSlNDIHNoZWxsLCBzaW5jZSB3ZSBsb2FkIHRoZSBtb2R1bGUg ZnJvbSB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0sIHdlIHRyZWF0IGFuIGFic29sdXRlIGZpbGUgcGF0 aAorICAgICAgICBhcyBhIG1vZHVsZSBrZXkuIFNvLCBpbiB0aGlzIHBhdGNoLCB3ZSBpbXBsZW1l bnQgdGhlICJyZXNvbHZlIiBob29rIHRoYXQgcmVzb2x2ZXMgdGhlIG1vZHVsZSBuYW1lIHRvCisg ICAgICAgIHRoZSBhYnNvbHV0ZSBmaWxlIHBhdGguCisKKyAgICAgICAgVGhpcyBsb2NhbCBmaWxl IHN5c3RlbSAicmVzb2x2ZSIgZnVuY3Rpb25hbGl0eSBtYWtlcyBKU0Mgc2hlbGwgZWFzeSB0byB0 ZXN0IHRoZSBtb2R1bGUgbG9hZGVyLgorCisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKEds b2JhbE9iamVjdDo6ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAoR2xvYmFsT2JqZWN0Ojptb2R1 bGVMb2FkZXJGZXRjaCk6CisgICAgICAgIChwYXRoU2VwYXJhdG9yKToKKyAgICAgICAgKGV4dHJh Y3REaXJlY3RvcnlOYW1lKToKKyAgICAgICAgKGN1cnJlbnRXb3JraW5nRGlyZWN0b3J5KToKKyAg ICAgICAgKHJlc29sdmVQYXRoKToKKyAgICAgICAgKEdsb2JhbE9iamVjdDo6bW9kdWxlTG9hZGVy UmVzb2x2ZSk6CisgICAgICAgIChmdW5jdGlvbkRyYWluTWljcm90YXNrcyk6CisgICAgICAgICog cnVudGltZS9KU0ludGVybmFsUHJvbWlzZURlZmVycmVkLmNwcDoKKyAgICAgICAgKEpTQzo6SlNJ bnRlcm5hbFByb21pc2VEZWZlcnJlZDo6cmVzb2x2ZSk6CisgICAgICAgIChKU0M6OkpTSW50ZXJu YWxQcm9taXNlRGVmZXJyZWQ6OnJlamVjdCk6CisgICAgICAgICogcnVudGltZS9KU0ludGVybmFs UHJvbWlzZURlZmVycmVkLmg6CisgICAgICAgICogdGVzdHMvc3RyZXNzL3BhdGhuYW1lLXJlc29s dmUuanM6IEFkZGVkLgorICAgICAgICAoc2hvdWxkQmUpOgorICAgICAgICAoc2hvdWxkVGhyb3cp OgorCiAyMDE1LTA4LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgSXNvbGF0ZSBTb3VyY2UgZGlyZWN0b3JpZXMgaW4gQ01ha2UgYnVpbGQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2pzYy5jcHAKaW5kZXggMDMzZTY5Njg2MjVhOGI1YzlmMGVmMDIxYzIxZDQwZjdj ZmExNmZiOS4uZWZhZWIwNDI1OTc0NThiMmRkM2RkMTkwOGY5ZWU2YTU4MGNmMWMzNCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2pzYy5jcHAKQEAgLTY0LDcgKzY0LDkgQEAKICNpbmNsdWRlIDx3dGYvU3RyaW5nUHJp bnRTdHJlYW0uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKLSNpZiAh T1MoV0lORE9XUykKKyNpZiBPUyhXSU5ET1dTKQorI2luY2x1ZGUgPGRpcmVjdC5oPgorI2Vsc2UK ICNpbmNsdWRlIDx1bmlzdGQuaD4KICNlbmRpZgogCkBAIC00OTEsNiArNDkzLDcgQEAgc3RhdGlj IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25SZXR1cm5UeXBlRm9yKEV4ZWNT dGF0ZSopOwogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25EdW1w QmFzaWNCbG9ja0V4ZWN1dGlvblJhbmdlcyhFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uSGFzQmFzaWNCbG9ja0V4ZWN1dGVkKEV4ZWNTdGF0 ZSopOwogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25FbmFibGVF eGNlcHRpb25GdXp6KEV4ZWNTdGF0ZSopOworc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgZnVuY3Rpb25EcmFpbk1pY3JvdGFza3MoRXhlY1N0YXRlKik7CiAjaWYgRU5BQkxFKFdF QkFTU0VNQkxZKQogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25M b2FkV2ViQXNzZW1ibHkoRXhlY1N0YXRlKik7CiAjZW5kaWYKQEAgLTY2Niw3ICs2NjksOSBAQCBj bGFzcyBHbG9iYWxPYmplY3QgOiBwdWJsaWMgSlNHbG9iYWxPYmplY3QgewogICAgICAgICBhZGRG dW5jdGlvbih2bSwgImhhc0Jhc2ljQmxvY2tFeGVjdXRlZCIsIGZ1bmN0aW9uSGFzQmFzaWNCbG9j a0V4ZWN1dGVkLCAyKTsKIAogICAgICAgICBhZGRGdW5jdGlvbih2bSwgImVuYWJsZUV4Y2VwdGlv bkZ1enoiLCBmdW5jdGlvbkVuYWJsZUV4Y2VwdGlvbkZ1enosIDApOwotICAgICAgICAKKworICAg ICAgICBhZGRGdW5jdGlvbih2bSwgImRyYWluTWljcm90YXNrcyIsIGZ1bmN0aW9uRHJhaW5NaWNy b3Rhc2tzLCAwKTsKKwogI2lmIEVOQUJMRShXRUJBU1NFTUJMWSkKICAgICAgICAgYWRkRnVuY3Rp b24odm0sICJsb2FkV2ViQXNzZW1ibHkiLCBmdW5jdGlvbkxvYWRXZWJBc3NlbWJseSwgMSk7CiAj ZW5kaWYKQEAgLTY5NCw2ICs2OTksOCBAQCBjbGFzcyBHbG9iYWxPYmplY3QgOiBwdWJsaWMgSlNH bG9iYWxPYmplY3QgewogICAgICAgICBwdXREaXJlY3Qodm0sIGlkZW50aWZpZXIsIEpTRnVuY3Rp b246OmNyZWF0ZSh2bSwgdGhpcywgYXJndW1lbnRzLCBpZGVudGlmaWVyLnN0cmluZygpLCBmdW5j dGlvbiwgTm9JbnRyaW5zaWMsIGZ1bmN0aW9uKSk7CiAgICAgfQogCisgICAgc3RhdGljIEpTSW50 ZXJuYWxQcm9taXNlKiBtb2R1bGVMb2FkZXJSZXNvbHZlKEpTR2xvYmFsT2JqZWN0KiwgRXhlY1N0 YXRlKiwgSlNWYWx1ZSwgSlNWYWx1ZSk7CisKICAgICBzdGF0aWMgSlNJbnRlcm5hbFByb21pc2Uq IG1vZHVsZUxvYWRlckZldGNoKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEV4ZWNTdGF0 ZSogZXhlYywgSlNWYWx1ZSBrZXkpCiAgICAgewogICAgICAgICBKU0ludGVybmFsUHJvbWlzZURl ZmVycmVkKiBkZWZlcnJlZCA9IEpTSW50ZXJuYWxQcm9taXNlRGVmZXJyZWQ6OmNyZWF0ZShleGVj LCBnbG9iYWxPYmplY3QpOwpAQCAtNzAxLDIzICs3MDgsMjAgQEAgY2xhc3MgR2xvYmFsT2JqZWN0 IDogcHVibGljIEpTR2xvYmFsT2JqZWN0IHsKICAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlv bigpKSB7CiAgICAgICAgICAgICBKU1ZhbHVlIGV4Y2VwdGlvbiA9IGV4ZWMtPmV4Y2VwdGlvbigp OwogICAgICAgICAgICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKLSAgICAgICAgICAgIGRlZmVy cmVkLT5yZWplY3QoZXhlYywgZXhjZXB0aW9uKTsKLSAgICAgICAgICAgIHJldHVybiBkZWZlcnJl ZC0+cHJvbWlzZSgpOworICAgICAgICAgICAgcmV0dXJuIGRlZmVycmVkLT5yZWplY3QoZXhlYywg ZXhjZXB0aW9uKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEhlcmUsIG5vdyB3ZSBjb25zaWRl ciBtb2R1bGVLZXkgYXMgdGhlIGZpbGVOYW1lLgogICAgICAgICBWZWN0b3I8Y2hhcj4gdXRmODsK LSAgICAgICAgaWYgKCFmaWxsQnVmZmVyV2l0aENvbnRlbnRzT2ZGaWxlKG1vZHVsZUtleSwgdXRm OCkpIHsKLSAgICAgICAgICAgIGRlZmVycmVkLT5yZWplY3QoZXhlYywgY3JlYXRlRXJyb3IoZXhl YywgbWFrZVN0cmluZygiQ291bGQgbm90IG9wZW4gZmlsZSAnIiwgbW9kdWxlS2V5LCAiJy4iKSkp OwotICAgICAgICAgICAgcmV0dXJuIGRlZmVycmVkLT5wcm9taXNlKCk7Ci0gICAgICAgIH0KLSAg ICAgICAgZGVmZXJyZWQtPnJlc29sdmUoZXhlYywganNTdHJpbmcoZXhlYywgc3RyaW5nRnJvbVVU Rih1dGY4LmRhdGEoKSkpKTsKLSAgICAgICAgcmV0dXJuIGRlZmVycmVkLT5wcm9taXNlKCk7Cisg ICAgICAgIGlmICghZmlsbEJ1ZmZlcldpdGhDb250ZW50c09mRmlsZShtb2R1bGVLZXksIHV0Zjgp KQorICAgICAgICAgICAgcmV0dXJuIGRlZmVycmVkLT5yZWplY3QoZXhlYywgY3JlYXRlRXJyb3Io ZXhlYywgbWFrZVN0cmluZygiQ291bGQgbm90IG9wZW4gZmlsZSAnIiwgbW9kdWxlS2V5LCAiJy4i KSkpOworCisgICAgICAgIHJldHVybiBkZWZlcnJlZC0+cmVzb2x2ZShleGVjLCBqc1N0cmluZyhl eGVjLCBzdHJpbmdGcm9tVVRGKHV0ZjguZGF0YSgpKSkpOwogICAgIH0KIH07CiAKIGNvbnN0IENs YXNzSW5mbyBHbG9iYWxPYmplY3Q6OnNfaW5mbyA9IHsgImdsb2JhbCIsICZKU0dsb2JhbE9iamVj dDo6c19pbmZvLCBudWxscHRyLCBDUkVBVEVfTUVUSE9EX1RBQkxFKEdsb2JhbE9iamVjdCkgfTsK LWNvbnN0IEdsb2JhbE9iamVjdE1ldGhvZFRhYmxlIEdsb2JhbE9iamVjdDo6c19nbG9iYWxPYmpl Y3RNZXRob2RUYWJsZSA9IHsgJmFsbG93c0FjY2Vzc0Zyb20sICZzdXBwb3J0c1Byb2ZpbGluZywg JnN1cHBvcnRzUmljaFNvdXJjZUluZm8sICZzaG91bGRJbnRlcnJ1cHRTY3JpcHQsICZqYXZhU2Ny aXB0UnVudGltZUZsYWdzLCAwLCAmc2hvdWxkSW50ZXJydXB0U2NyaXB0QmVmb3JlVGltZW91dCwg bnVsbHB0ciwgJm1vZHVsZUxvYWRlckZldGNoLCBudWxscHRyLCBudWxscHRyIH07Citjb25zdCBH bG9iYWxPYmplY3RNZXRob2RUYWJsZSBHbG9iYWxPYmplY3Q6OnNfZ2xvYmFsT2JqZWN0TWV0aG9k VGFibGUgPSB7ICZhbGxvd3NBY2Nlc3NGcm9tLCAmc3VwcG9ydHNQcm9maWxpbmcsICZzdXBwb3J0 c1JpY2hTb3VyY2VJbmZvLCAmc2hvdWxkSW50ZXJydXB0U2NyaXB0LCAmamF2YVNjcmlwdFJ1bnRp bWVGbGFncywgMCwgJnNob3VsZEludGVycnVwdFNjcmlwdEJlZm9yZVRpbWVvdXQsICZtb2R1bGVM b2FkZXJSZXNvbHZlLCAmbW9kdWxlTG9hZGVyRmV0Y2gsIG51bGxwdHIsIG51bGxwdHIgfTsKIAog CiBHbG9iYWxPYmplY3Q6Okdsb2JhbE9iamVjdChWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJl KQpAQCAtNzI1LDYgKzcyOSwxMjkgQEAgR2xvYmFsT2JqZWN0OjpHbG9iYWxPYmplY3QoVk0mIHZt LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKIHsKIH0KIAorc3RhdGljIFVDaGFyIHBhdGhTZXBhcmF0 b3IoKQoreworI2lmIE9TKFdJTkRPV1MpCisgICAgcmV0dXJuICdcXCc7CisjZWxzZQorICAgIHJl dHVybiAnLyc7CisjZW5kaWYKK30KKworc3RydWN0IERpcmVjdG9yeU5hbWUgeworICAgIC8vIElu IHVuaXgsIGl0IGlzICIvIi4gSW4gV2luZG93cywgaXQgYmVjb21lcyBhIGRyaXZlIGxldHRlciBs aWtlICJDOlwiCisgICAgU3RyaW5nIHJvb3ROYW1lOworCisgICAgLy8gSWYgdGhlIGRpcmVjdG9y eSBuYW1lIGlzICIvaG9tZS9XZWJLaXQiLCB0aGlzIGJlY29tZXMgImhvbWUvV2ViS2l0Ii4gSWYg dGhlIGRpcmVjdG9yeSBuYW1lIGlzICIvIiwgdGhpcyBiZWNvbWVzICIiLgorICAgIFN0cmluZyBx dWVyeU5hbWU7Cit9OworCitzdGF0aWMgYm9vbCBleHRyYWN0RGlyZWN0b3J5TmFtZShjb25zdCBT dHJpbmcmIGFic29sdXRlUGF0aFRvRmlsZSwgRGlyZWN0b3J5TmFtZSYgZGlyZWN0b3J5TmFtZSkK K3sKKyAgICBzaXplX3QgZmlyc3RTZXBhcmF0b3JQb3NpdGlvbiA9IGFic29sdXRlUGF0aFRvRmls ZS5maW5kKHBhdGhTZXBhcmF0b3IoKSk7CisgICAgaWYgKGZpcnN0U2VwYXJhdG9yUG9zaXRpb24g PT0gbm90Rm91bmQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBkaXJlY3RvcnlOYW1lLnJv b3ROYW1lID0gYWJzb2x1dGVQYXRoVG9GaWxlLnN1YnN0cmluZygwLCBmaXJzdFNlcGFyYXRvclBv c2l0aW9uICsgMSk7IC8vIEluY2x1ZGUgdGhlIHNlcGFyYXRvci4KKyAgICBzaXplX3QgbGFzdFNl cGFyYXRvclBvc2l0aW9uID0gYWJzb2x1dGVQYXRoVG9GaWxlLnJldmVyc2VGaW5kKHBhdGhTZXBh cmF0b3IoKSk7CisgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShsYXN0U2VwYXJhdG9yUG9zaXRpb24g IT0gbm90Rm91bmQsICJJZiB0aGUgc2VwYXJhdG9yIGlzIG5vdCBmb3VuZCwgdGhpcyBmdW5jdGlv biBhbHJlYWR5IHJldHVybnMgd2hlbiBwZXJmb3JtaW5nIHRoZSBmb3J3YXJkIHNlYXJjaC4iKTsK KyAgICBpZiAoZmlyc3RTZXBhcmF0b3JQb3NpdGlvbiA9PSBsYXN0U2VwYXJhdG9yUG9zaXRpb24p CisgICAgICAgIGRpcmVjdG9yeU5hbWUucXVlcnlOYW1lID0gU3RyaW5nSW1wbDo6ZW1wdHkoKTsK KyAgICBlbHNlCisgICAgICAgIGRpcmVjdG9yeU5hbWUucXVlcnlOYW1lID0gYWJzb2x1dGVQYXRo VG9GaWxlLnN1YnN0cmluZyhmaXJzdFNlcGFyYXRvclBvc2l0aW9uICsgMSwgbGFzdFNlcGFyYXRv clBvc2l0aW9uKTsgLy8gTm90IGluY2x1ZGUgdGhlIHNlcGFyYXRvci4KKyAgICByZXR1cm4gdHJ1 ZTsKK30KKworc3RhdGljIGJvb2wgY3VycmVudFdvcmtpbmdEaXJlY3RvcnkoRGlyZWN0b3J5TmFt ZSYgZGlyZWN0b3J5TmFtZSkKK3sKKyNpZiBPUyhXSU5ET1dTKQorICAgIC8vIGh0dHBzOi8vbXNk bi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvc2Y5OGJkNHkuYXNweAorICAgIGNoYXIqIGJ1 ZmZlciA9IG51bGxwdHI7CisgICAgaWYgKCEoYnVmZmVyID0gX2dldGN3ZChudWxscHRyLCAwKSkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBTdHJpbmcgZGlyZWN0b3J5U3RyaW5nID0gU3Ry aW5nOjpmcm9tVVRGOChidWZmZXIpOworICAgIGZyZWUoYnVmZmVyKTsKKyNlbHNlCisgICAgYXV0 byBidWZmZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPGNoYXJbXT4oUEFUSF9NQVgpOworICAgIGlmICgh Z2V0Y3dkKGJ1ZmZlci5nZXQoKSwgUEFUSF9NQVgpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgU3RyaW5nIGRpcmVjdG9yeVN0cmluZyA9IFN0cmluZzo6ZnJvbVVURjgoYnVmZmVyLmdldCgp KTsKKyNlbmRpZgorICAgIGlmIChkaXJlY3RvcnlTdHJpbmcuaXNFbXB0eSgpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoZGlyZWN0b3J5U3RyaW5nW2RpcmVjdG9yeVN0cmluZy5s ZW5ndGgoKSAtIDFdID09IHBhdGhTZXBhcmF0b3IoKSkKKyAgICAgICAgcmV0dXJuIGV4dHJhY3RE aXJlY3RvcnlOYW1lKGRpcmVjdG9yeVN0cmluZywgZGlyZWN0b3J5TmFtZSk7CisgICAgLy8gQXBw ZW5kIHRoZSBzZXBlcmF0b3IgdG8gcmVwcmVzZW50cyB0aGUgZmlsZSBuYW1lLiBleHRyYWN0RGly ZWN0b3J5TmFtZSBvbmx5IGFjY2VwdHMgdGhlIGFic29sdXRlIGZpbGUgbmFtZS4KKyAgICByZXR1 cm4gZXh0cmFjdERpcmVjdG9yeU5hbWUobWFrZVN0cmluZyhkaXJlY3RvcnlTdHJpbmcsIHBhdGhT ZXBhcmF0b3IoKSksIGRpcmVjdG9yeU5hbWUpOworfQorCitzdGF0aWMgU3RyaW5nIHJlc29sdmVQ YXRoKGNvbnN0IERpcmVjdG9yeU5hbWUmIGRpcmVjdG9yeU5hbWUsIGNvbnN0IFN0cmluZyYgcXVl cnkpCit7CisgICAgVmVjdG9yPFN0cmluZz4gZGlyZWN0b3J5UGllY2VzOworICAgIGRpcmVjdG9y eU5hbWUucXVlcnlOYW1lLnNwbGl0KHBhdGhTZXBhcmF0b3IoKSwgZmFsc2UsIGRpcmVjdG9yeVBp ZWNlcyk7CisKKyAgICBWZWN0b3I8U3RyaW5nPiBxdWVyeVBpZWNlczsKKyAgICBxdWVyeS5zcGxp dChwYXRoU2VwYXJhdG9yKCksIHRydWUsIHF1ZXJ5UGllY2VzKTsKKworICAgIC8vIE9ubHkgZmly c3QgJy8nIGlzIHJlY29nbml6ZWQgYXMgdGhlIHBhdGggZnJvbSB0aGUgcm9vdC4KKyAgICBpZiAo IXF1ZXJ5UGllY2VzLmlzRW1wdHkoKSAmJiBxdWVyeVBpZWNlc1swXS5pc0VtcHR5KCkpCisgICAg ICAgIGRpcmVjdG9yeVBpZWNlcy5jbGVhcigpOworCisgICAgZm9yIChjb25zdCBhdXRvJiBxdWVy eSA6IHF1ZXJ5UGllY2VzKSB7CisgICAgICAgIGlmIChxdWVyeSA9PSBTdHJpbmcoQVNDSUlMaXRl cmFsKCIuLiIpKSkgeworICAgICAgICAgICAgaWYgKCFkaXJlY3RvcnlQaWVjZXMuaXNFbXB0eSgp KQorICAgICAgICAgICAgICAgIGRpcmVjdG9yeVBpZWNlcy5yZW1vdmVMYXN0KCk7CisgICAgICAg IH0gZWxzZSBpZiAoIXF1ZXJ5LmlzRW1wdHkoKSAmJiBxdWVyeSAhPSBTdHJpbmcoQVNDSUlMaXRl cmFsKCIuIikpKQorICAgICAgICAgICAgZGlyZWN0b3J5UGllY2VzLmFwcGVuZChxdWVyeSk7Cisg ICAgfQorCisgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxkZXIuYXBwZW5kKGRp cmVjdG9yeU5hbWUucm9vdE5hbWUpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZGlyZWN0 b3J5UGllY2VzLnNpemUoKTsgKytpKSB7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGRpcmVjdG9y eVBpZWNlc1tpXSk7CisgICAgICAgIGlmIChpICsgMSAhPSBkaXJlY3RvcnlQaWVjZXMuc2l6ZSgp KQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQocGF0aFNlcGFyYXRvcigpKTsKKyAgICB9Cisg ICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKK30KKworSlNJbnRlcm5hbFByb21pc2UqIEds b2JhbE9iamVjdDo6bW9kdWxlTG9hZGVyUmVzb2x2ZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0LCBFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUga2V5VmFsdWUsIEpTVmFsdWUgcmVmZXJyZXJW YWx1ZSkKK3sKKyAgICBKU0ludGVybmFsUHJvbWlzZURlZmVycmVkKiBkZWZlcnJlZCA9IEpTSW50 ZXJuYWxQcm9taXNlRGVmZXJyZWQ6OmNyZWF0ZShleGVjLCBnbG9iYWxPYmplY3QpOworICAgIGNv bnN0IElkZW50aWZpZXIga2V5ID0ga2V5VmFsdWUudG9Qcm9wZXJ0eUtleShleGVjKTsKKyAgICBp ZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpIHsKKyAgICAgICAgSlNWYWx1ZSBleGNlcHRpb24gPSBl eGVjLT5leGNlcHRpb24oKTsKKyAgICAgICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKKyAgICAg ICAgcmV0dXJuIGRlZmVycmVkLT5yZWplY3QoZXhlYywgZXhjZXB0aW9uKTsKKyAgICB9CisKKyAg ICBpZiAoa2V5LmlzU3ltYm9sKCkpCisgICAgICAgIHJldHVybiBkZWZlcnJlZC0+cmVzb2x2ZShl eGVjLCBrZXlWYWx1ZSk7CisKKyAgICBEaXJlY3RvcnlOYW1lIGRpcmVjdG9yeU5hbWU7CisgICAg aWYgKHJlZmVycmVyVmFsdWUuaXNVbmRlZmluZWQoKSkgeworICAgICAgICBpZiAoIWN1cnJlbnRX b3JraW5nRGlyZWN0b3J5KGRpcmVjdG9yeU5hbWUpKQorICAgICAgICAgICAgcmV0dXJuIGRlZmVy cmVkLT5yZWplY3QoZXhlYywgY3JlYXRlRXJyb3IoZXhlYywgQVNDSUlMaXRlcmFsKCJDb3VsZCBu b3QgcmVzb2x2ZSB0aGUgY3VycmVudCB3b3JraW5nIGRpcmVjdG9yeS4iKSkpOworICAgIH0gZWxz ZSB7CisgICAgICAgIGNvbnN0IElkZW50aWZpZXIgcmVmZXJyZXIgPSByZWZlcnJlclZhbHVlLnRv UHJvcGVydHlLZXkoZXhlYyk7CisgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgewor ICAgICAgICAgICAgSlNWYWx1ZSBleGNlcHRpb24gPSBleGVjLT5leGNlcHRpb24oKTsKKyAgICAg ICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisgICAgICAgICAgICByZXR1cm4gZGVmZXJy ZWQtPnJlamVjdChleGVjLCBleGNlcHRpb24pOworICAgICAgICB9CisgICAgICAgIGlmIChyZWZl cnJlci5pc1N5bWJvbCgpKSB7CisgICAgICAgICAgICBpZiAoIWN1cnJlbnRXb3JraW5nRGlyZWN0 b3J5KGRpcmVjdG9yeU5hbWUpKQorICAgICAgICAgICAgICAgIHJldHVybiBkZWZlcnJlZC0+cmVq ZWN0KGV4ZWMsIGNyZWF0ZUVycm9yKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiQ291bGQgbm90IHJlc29s dmUgdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkuIikpKTsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIC8vIElmIHRoZSByZWZlcnJlciBleGlzdHMsIHdlIGFzc3VtZSB0aGF0IHRo ZSByZWZlcnJlciBpcyB0aGUgY29ycmVjdCBhYnNvbHV0ZSBwYXRoLgorICAgICAgICAgICAgaWYg KCFleHRyYWN0RGlyZWN0b3J5TmFtZShyZWZlcnJlci5pbXBsKCksIGRpcmVjdG9yeU5hbWUpKQor ICAgICAgICAgICAgICAgIHJldHVybiBkZWZlcnJlZC0+cmVqZWN0KGV4ZWMsIGNyZWF0ZUVycm9y KGV4ZWMsIG1ha2VTdHJpbmcoIkNvdWxkIG5vdCByZXNvbHZlIHRoZSByZWZlcnJlciBuYW1lICci LCBTdHJpbmcocmVmZXJyZXIuaW1wbCgpKSwgIicuIikpKTsKKyAgICAgICAgfQorICAgIH0KKwor ICAgIHJldHVybiBkZWZlcnJlZC0+cmVzb2x2ZShleGVjLCBqc1N0cmluZyhleGVjLCByZXNvbHZl UGF0aChkaXJlY3RvcnlOYW1lLCBrZXkuaW1wbCgpKSkpOworfQorCiBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGZ1bmN0aW9uUHJpbnQoRXhlY1N0YXRlKiBleGVjKQogewogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBleGVjLT5hcmd1bWVudENvdW50KCk7ICsraSkgewpAQCAtMTIw Miw2ICsxMzI5LDEyIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25FbmFi bGVFeGNlcHRpb25GdXp6KEV4ZWNTdGF0ZSopCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShq c1VuZGVmaW5lZCgpKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlv bkRyYWluTWljcm90YXNrcyhFeGVjU3RhdGUqIGV4ZWMpCit7CisgICAgZXhlYy0+dm0oKS5kcmFp bk1pY3JvdGFza3MoKTsKKyAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkp OworfQorCiAjaWYgRU5BQkxFKFdFQkFTU0VNQkxZKQogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1Rf Q0FMTCBmdW5jdGlvbkxvYWRXZWJBc3NlbWJseShFeGVjU3RhdGUqIGV4ZWMpCiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0ludGVybmFsUHJvbWlzZURlZmVy cmVkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTSW50ZXJuYWxQcm9taXNl RGVmZXJyZWQuY3BwCmluZGV4IDlmODhmMTk1OTFmZTRlNmY3MjgyYWVjYzE0YThiODgzZDEyMDUy NzUuLjRlNjdhOGM3ZDkxNzQ4ZDk1Y2I4OTY0ZjBjNDg4NDQ5ZWFmMDc2ZDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTSW50ZXJuYWxQcm9taXNlRGVmZXJyZWQu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTSW50ZXJuYWxQcm9taXNl RGVmZXJyZWQuY3BwCkBAIC02Niw0ICs2NiwxNiBAQCBKU0ludGVybmFsUHJvbWlzZSogSlNJbnRl cm5hbFByb21pc2VEZWZlcnJlZDo6cHJvbWlzZSgpIGNvbnN0CiAgICAgcmV0dXJuIGpzQ2FzdDxK U0ludGVybmFsUHJvbWlzZSo+KEJhc2U6OnByb21pc2UoKSk7CiB9CiAKK0pTSW50ZXJuYWxQcm9t aXNlKiBKU0ludGVybmFsUHJvbWlzZURlZmVycmVkOjpyZXNvbHZlKEV4ZWNTdGF0ZSogZXhlYywg SlNWYWx1ZSB2YWx1ZSkKK3sKKyAgICBCYXNlOjpyZXNvbHZlKGV4ZWMsIHZhbHVlKTsKKyAgICBy ZXR1cm4gcHJvbWlzZSgpOworfQorCitKU0ludGVybmFsUHJvbWlzZSogSlNJbnRlcm5hbFByb21p c2VEZWZlcnJlZDo6cmVqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSByZWFzb24pCit7Cisg ICAgQmFzZTo6cmVqZWN0KGV4ZWMsIHJlYXNvbik7CisgICAgcmV0dXJuIHByb21pc2UoKTsKK30K KwogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0ludGVybmFsUHJvbWlzZURlZmVycmVkLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0ludGVybmFsUHJvbWlzZURlZmVycmVkLmgKaW5kZXggNTQwZGFkZTFkNzNh NDEyN2UxZjMwYzE2ZTA0MTNiOTc3NzZhZDBjYi4uNjYyYTI3NzQwMWZjNjM5MzRkMGQ2YTJhNDAy ZTI5NGMxNTE1MDIyNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNJbnRlcm5hbFByb21pc2VEZWZlcnJlZC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTSW50ZXJuYWxQcm9taXNlRGVmZXJyZWQuaApAQCAtNDcsNiArNDcsOCBAQCBjbGFz cyBKU0ludGVybmFsUHJvbWlzZURlZmVycmVkIGZpbmFsIDogcHVibGljIEpTUHJvbWlzZURlZmVy cmVkIHsKICAgICBERUNMQVJFX0VYUE9SVF9JTkZPOwogCiAgICAgSlNfRVhQT1JUX1BSSVZBVEUg SlNJbnRlcm5hbFByb21pc2UqIHByb21pc2UoKSBjb25zdDsKKyAgICBKU19FWFBPUlRfUFJJVkFU RSBKU0ludGVybmFsUHJvbWlzZSogcmVzb2x2ZShFeGVjU3RhdGUqLCBKU1ZhbHVlKTsKKyAgICBK U19FWFBPUlRfUFJJVkFURSBKU0ludGVybmFsUHJvbWlzZSogcmVqZWN0KEV4ZWNTdGF0ZSosIEpT VmFsdWUpOwogCiBwcml2YXRlOgogICAgIEpTSW50ZXJuYWxQcm9taXNlRGVmZXJyZWQoVk0mKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcGF0aG5hbWUt cmVzb2x2ZS5qcyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcGF0aG5hbWUt cmVzb2x2ZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YTJjYTZiMzZjMTJjMWE3ZjU5ZTMyODViZGNjZTJiMTVk Y2NjY2RkCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0 cmVzcy9wYXRobmFtZS1yZXNvbHZlLmpzCkBAIC0wLDAgKzEsNjQgQEAKKy8vQCBza2lwCisvLyBU byBleGVjdXRlIHRoaXMgdGVzdCwgbmVlZCB0byBzcGVjaWZ5IHRoZSBKU0NfZXhwb3NlSW50ZXJu YWxNb2R1bGVMb2FkZXIgZW52aXJvbm1lbnQgdmFyaWFibGUgYW5kIGV4ZWN1dGUgaXQgb24gbm9u IFdpbmRvd3MgcGxhdGZvcm0uCitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7 CisgICAgaWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcihg YmFkIHZhbHVlOiAke1N0cmluZyhhY3R1YWwpfWApOworfQorCitmdW5jdGlvbiBzaG91bGRSZXNv bHZlKG5hbWUsIHJlZmVycmVyLCBleHBlY3RlZCkKK3sKKyAgICB2YXIgcHJvbWlzZSA9IExvYWRl ci5yZXNvbHZlKG5hbWUsIHJlZmVycmVyKTsKKyAgICByZXR1cm4gcHJvbWlzZS50aGVuKGZ1bmN0 aW9uIChhY3R1YWwpIHsKKyAgICAgICAgc2hvdWxkQmUoYWN0dWFsLCBleHBlY3RlZCk7CisgICAg fSk7Cit9CisKK2Z1bmN0aW9uIHNob3VsZFRocm93KG5hbWUsIHJlZmVycmVyLCBlcnJvck1lc3Nh Z2UpCit7CisgICAgdmFyIG5vdFRocm93biA9IGZhbHNlOworICAgIHJldHVybiBMb2FkZXIucmVz b2x2ZShuYW1lLCByZWZlcnJlcikudGhlbihmdW5jdGlvbiAoZXJyb3IpIHsKKyAgICAgICAgbm90 VGhyb3duID0gdHJ1ZTsKKyAgICB9KS5jYXRjaChmdW5jdGlvbiAoZXJyb3IpIHsKKyAgICAgICAg c2hvdWxkQmUoU3RyaW5nKGVycm9yKSwgZXJyb3JNZXNzYWdlKTsKKyAgICB9KS50aGVuKGZ1bmN0 aW9uICgpIHsKKyAgICAgICAgaWYgKG5vdFRocm93bikKKyAgICAgICAgICAgIHRocm93IG5ldyBF cnJvcigibm90IHRocm93biIpOworICAgIH0pOworfQorCit2YXIgZXJyb3IgPSBudWxsOworCisv LyBPbiB3aW5kb3dzIHBsYXRmb3JtLCBhbGwgIi8iIGJlY29tZXMgIlwiLgorUHJvbWlzZS5hbGwo WworICAgIHNob3VsZFJlc29sdmUoJ3RtcC5qcycsICcvaG9tZS9XZWJLaXQvJywgJy9ob21lL1dl YktpdC90bXAuanMnKSwKKyAgICBzaG91bGRSZXNvbHZlKCd0bXAuanMnLCAnL2hvbWUvJywgJy9o b21lL3RtcC5qcycpLAorICAgIHNob3VsZFJlc29sdmUoJy90bXAuanMnLCAnL2hvbWUvV2ViS2l0 LycsICcvdG1wLmpzJyksCisgICAgc2hvdWxkUmVzb2x2ZSgnLy8vdG1wLmpzJywgJy9ob21lL1dl YktpdC8nLCAnL3RtcC5qcycpLAorICAgIHNob3VsZFJlc29sdmUoJy4vLy90bXAuanMnLCAnL2hv bWUvV2ViS2l0LycsICcvaG9tZS9XZWJLaXQvdG1wLmpzJyksCisgICAgc2hvdWxkUmVzb2x2ZSgn Li8uLi90bXAuanMnLCAnL2hvbWUvV2ViS2l0LycsICcvaG9tZS90bXAuanMnKSwKKyAgICBzaG91 bGRSZXNvbHZlKCcuLy4uLy4uL3RtcC5qcycsICcvaG9tZS9XZWJLaXQvJywgJy90bXAuanMnKSwK KyAgICBzaG91bGRSZXNvbHZlKCcuLy4uLy4uLy4uL3RtcC5qcycsICcvaG9tZS9XZWJLaXQvJywg Jy90bXAuanMnKSwKKyAgICBzaG91bGRSZXNvbHZlKCcuLy4uLy4uL2hvbWUvLi4vdG1wLmpzJywg Jy9ob21lL1dlYktpdC8nLCAnL3RtcC5qcycpLAorICAgIHNob3VsZFJlc29sdmUoJy4vLi4vLi4v Li4vaG9tZS9XZWJLaXQvLi4vdG1wLmpzJywgJy9ob21lL1dlYktpdC8nLCAnL2hvbWUvdG1wLmpz JyksCisgICAgc2hvdWxkUmVzb2x2ZSgnLi4vaG9tZS9XZWJLaXQvdG1wLmpzJywgJy9ob21lL1dl YktpdC8nLCAnL2hvbWUvaG9tZS9XZWJLaXQvdG1wLmpzJyksCisgICAgc2hvdWxkUmVzb2x2ZSgn Li4vaG9tZS9XZWJLaXQvLi4vdG1wLmpzJywgJy9ob21lL1dlYktpdC8nLCAnL2hvbWUvaG9tZS90 bXAuanMnKSwKKyAgICBzaG91bGRSZXNvbHZlKCcuL3RtcC5qcycsICcvaG9tZS9XZWJLaXQvaGVs bG8uanMnLCAnL2hvbWUvV2ViS2l0L3RtcC5qcycpLAorCisgICAgc2hvdWxkUmVzb2x2ZSgnLi90 bXAuanMnLCAnQzovJywgJ0M6L3RtcC5qcycpLAorICAgIHNob3VsZFJlc29sdmUoJy4vdG1wLmpz JywgJ0M6L2hvbWUvJywgJ0M6L2hvbWUvdG1wLmpzJyksCisgICAgc2hvdWxkUmVzb2x2ZSgnLi4v dG1wLmpzJywgJ0M6L2hvbWUvJywgJ0M6L3RtcC5qcycpLAorICAgIHNob3VsZFJlc29sdmUoJy4u Ly4uL3RtcC5qcycsICdDOi9ob21lLycsICdDOi90bXAuanMnKSwKKyAgICBzaG91bGRSZXNvbHZl KCcuL2hlbGxvL3RtcC5qcycsICdDOi9ob21lLycsICdDOi9ob21lL2hlbGxvL3RtcC5qcycpLAor ICAgIHNob3VsZFJlc29sdmUoJy90bXAuanMnLCAnQzovaG9tZS8nLCAnQzovdG1wLmpzJyksCisK KyAgICBzaG91bGRUaHJvdygnL3RtcC5qcycsICcnLCBgRXJyb3I6IENvdWxkIG5vdCByZXNvbHZl IHRoZSByZWZlcnJlciBuYW1lICcnLmApLAorICAgIHNob3VsZFRocm93KCcvdG1wLmpzJywgJ2hl bGxvJywgYEVycm9yOiBDb3VsZCBub3QgcmVzb2x2ZSB0aGUgcmVmZXJyZXIgbmFtZSAnaGVsbG8n LmApLAorICAgIHNob3VsZFRocm93KCd0bXAuanMnLCAnaGVsbG8nLCBgRXJyb3I6IENvdWxkIG5v dCByZXNvbHZlIHRoZSByZWZlcnJlciBuYW1lICdoZWxsbycuYCksCitdKS5jYXRjaChmdW5jdGlv biAoZSkgeworICAgIGVycm9yID0gZTsKK30pOworCisvLyBGb3JjZSB0byBydW4gYWxsIHBlbmRp bmcgdGFza3MuCitkcmFpbk1pY3JvdGFza3MoKTsKK2lmIChlcnJvcikKKyAgICB0aHJvdyBlcnJv cjsK