10693 2006-09-02 12:55:46 -0700 Convert JavaScript arrays to AppleScript lists 2006-09-03 12:04:29 -0700 1 1 1 Unclassified WebKit WebKit API 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 7012 1 ap ap oldest_to_newest 54649 0 ap 2006-09-02 12:55:46 -0700 Bug 7012 didn't include support for arrays, because I thought that those are too different between JS and AS. I think I've been misunderstanding it. The attached patch doesn't map circular dependencies (falling back to toString() instead), not sure if that would be desired or not. 54650 1 10367 ap 2006-09-02 13:11:37 -0700 Created attachment 10367 proposed patch 54674 2 timothy 2006-09-02 23:12:47 -0700 Looking good.. one comment. +                    unsigned numItems = array->getLength(); +                    for (unsigned i = 0; i < numItems; ++i) +                        [aeDesc insertDescriptor:aeDescFromJSValue(exec, array->getItem(i)) atIndex:0]; Should this be atIndex:i? 54675 3 ap 2006-09-03 00:08:39 -0700 (In reply to comment #2) > Should this be atIndex:i? It could be atIndex:i+1 (AE lists are one-based), but zero also works: "Specifying an index of 0 or count + 1 causes appending to the end of the list." BTW, on a second thought, it seems that it's impossible to create circular dependencies in AE lists anyway, as elements are stored by value, rather than by reference. 54707 4 10367 timothy 2006-09-03 11:38:30 -0700 Comment on attachment 10367 proposed patch Great, r=me 54714 5 ap 2006-09-03 12:04:29 -0700 Committed revision 16200. 10367 2006-09-02 13:11:37 -0700 2006-09-03 11:38:30 -0700 proposed patch 10693r1_patch.txt text/plain 12489 ap SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTk0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDYtMDktMDIgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBueXBvcC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3df YnVnLmNnaT9pZD0xMDY5MworICAgICAgICBDb252ZXJ0IEphdmFTY3JpcHQgYXJyYXlzIHRvIEFw cGxlU2NyaXB0IGxpc3RzCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6IEV4cG9ydCBB cnJheUluc3RhbmNlOjppbmZvIGFuZCBBcnJheUluc3RhbmNlOjpnZXRJdGVtKCkuCisgICAgICAg ICoga2pzL2FycmF5X2luc3RhbmNlLmg6CisgICAgICAgICoga2pzL2FycmF5X29iamVjdC5jcHA6 CisgICAgICAgIChBcnJheUluc3RhbmNlOjpnZXRJdGVtKTogQWRkZWQgYSBtZXRob2QgdG8gYWNj ZXNzIGFycmF5IGl0ZW1zIGZyb20gQysrLgorCiAyMDA2LTA5LTAyICBLcnp5c3p0b2YgS293YWxj enlrICA8a2tvd2FsY3p5a0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEgu CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCShyZXZpc2lvbiAxNjE5MSkKKysrIEph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDYg KzE0MSw3IEBAIF9fWk4zS0pTMTFQcm9wZXJ0eU1hcEQxRXYKIF9fWk4zS0pTMTJEYXRlSW5zdGFu Y2U0aW5mb0UKIF9fWk4zS0pTMTJQcm9wZXJ0eVNsb3QxNXVuZGVmaW5lZEdldHRlckVQTlNfOUV4 ZWNTdGF0ZUVQTlNfOEpTT2JqZWN0RVJLTlNfMTBJZGVudGlmaWVyRVJLUzBfCiBfX1pOM0tKUzEy anNOdW1iZXJDZWxsRWQKK19fWk4zS0pTMTNBcnJheUluc3RhbmNlNGluZm9FCiBfX1pOM0tKUzEz U2F2ZWRCdWlsdGluc0MxRXYKIF9fWk4zS0pTMTNTYXZlZEJ1aWx0aW5zRDFFdgogX19aTjNLSlMx NFN0cmluZ0luc3RhbmNlMTRkZWxldGVQcm9wZXJ0eUVQTlNfOUV4ZWNTdGF0ZUVSS05TXzEwSWRl bnRpZmllckUKQEAgLTIzNSw2ICsyMzYsNyBAQCBfX1pOSzNLSlMxMUludGVycHJldGVyMjRidWls dGluRnVuY3Rpb25QCiBfX1pOSzNLSlMxMVByb3BlcnR5TWFwM2dldEVSS05TXzEwSWRlbnRpZmll ckUKIF9fWk5LM0tKUzExUHJvcGVydHlNYXA0c2F2ZUVSTlNfMTVTYXZlZFByb3BlcnRpZXNFCiBf X1pOSzNLSlMxMkRhdGVJbnN0YW5jZTdnZXRUaW1lRVJkUmkKK19fWk5LM0tKUzEzQXJyYXlJbnN0 YW5jZTdnZXRJdGVtRWoKIF9fWk5LM0tKUzE5SW50ZXJuYWxGdW5jdGlvbkltcDE0aW1wbGVtZW50 c0NhbGxFdgogX19aTkszS0pTMTlJbnRlcm5hbEZ1bmN0aW9uSW1wMjFpbXBsZW1lbnRzSGFzSW5z dGFuY2VFdgogX19aTkszS0pTNExpc3QyYXRFaQpJbmRleDogSmF2YVNjcmlwdENvcmUva2pzL2Fy cmF5X2luc3RhbmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUva2pzL2FycmF5X2lu c3RhbmNlLmgJKHJldmlzaW9uIDE2MTkxKQorKysgSmF2YVNjcmlwdENvcmUva2pzL2FycmF5X2lu c3RhbmNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAgbmFtZXNwYWNlIEtKUyB7 CiAgICAgc3RhdGljIGNvbnN0IENsYXNzSW5mbyBpbmZvOwogICAgIAogICAgIHVuc2lnbmVkIGdl dExlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIGxlbmd0aDsgfQorICAgIEpTVmFsdWUqIGdldEl0ZW0o dW5zaWduZWQpIGNvbnN0OwogICAgIAogICAgIHZvaWQgc29ydChFeGVjU3RhdGUgKmV4ZWMpOwog ICAgIHZvaWQgc29ydChFeGVjU3RhdGUgKmV4ZWMsIEpTT2JqZWN0ICpjb21wYXJlRnVuY3Rpb24p OwpJbmRleDogSmF2YVNjcmlwdENvcmUva2pzL2FycmF5X29iamVjdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gSmF2YVNjcmlwdENvcmUva2pzL2FycmF5X29iamVjdC5jcHAJKHJldmlzaW9uIDE2MTkxKQor KysgSmF2YVNjcmlwdENvcmUva2pzL2FycmF5X29iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQsNiArNCw3IEBACiAgKiAgQ29weXJpZ2h0IChDKSAxOTk5LTIwMDAgSGFycmkgUG9ydGVuIChw b3J0ZW5Aa2RlLm9yZykKICAqICBDb3B5cmlnaHQgKEMpIDIwMDMgQXBwbGUgQ29tcHV0ZXIsIElu Yy4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDMgUGV0ZXIgS2VsbHkgKHBta0Bwb3N0LmNvbSkKKyAq ICBDb3B5cmlnaHQgKEMpIDIwMDYgQWxleGV5IFByb3NrdXJ5YWtvdiAoYXBAbnlwb3AuY29tKQog ICoKICAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExl c3NlciBHZW5lcmFsIFB1YmxpYwpAQCAtNjksNiArNzAsMTggQEAgQXJyYXlJbnN0YW5jZTo6fkFy cmF5SW5zdGFuY2UoKQogICBmYXN0RnJlZShzdG9yYWdlKTsKIH0KIAorSlNWYWx1ZSogQXJyYXlJ bnN0YW5jZTo6Z2V0SXRlbSh1bnNpZ25lZCBpKSBjb25zdAoreworICAgIGlmIChpID49IGxlbmd0 aCkKKyAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisgICAgCisgICAgSlNWYWx1ZSogdmFs ID0gKGkgPCBzdG9yYWdlTGVuZ3RoKSA/IAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0 b3JhZ2VbaV0gOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdldERpcmVjdChJZGVudGlm aWVyOjpmcm9tKGkpKTsKKworICAgIHJldHVybiB2YWwgPyB2YWwgOiBqc1VuZGVmaW5lZCgpOwor fQorCiBKU1ZhbHVlICpBcnJheUluc3RhbmNlOjpsZW5ndGhHZXR0ZXIoRXhlY1N0YXRlKiwgSlNP YmplY3QqLCBjb25zdCBJZGVudGlmaWVyJiwgY29uc3QgUHJvcGVydHlTbG90JiBzbG90KQogewog ICByZXR1cm4ganNOdW1iZXIoc3RhdGljX2Nhc3Q8QXJyYXlJbnN0YW5jZSAqPihzbG90LnNsb3RC YXNlKCkpLT5sZW5ndGgpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxOTQpCisrKyBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwNi0wOS0wMiAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQG55cG9wLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3Bl bmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjkzCisgICAgICAgIENvbnZlcnQgSmF2YVNj cmlwdCBhcnJheXMgdG8gQXBwbGVTY3JpcHQgbGlzdHMKKworICAgICAgICAqIGZhc3QvQXBwbGVT Y3JpcHQvYXJyYXktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvQXBwbGVTY3JpcHQvYXJy YXkuaHRtbDogVXBkYXRlZCByZXN1bHRzLCBhZGRlZCBhIHRlc3QgZm9yCisgICAgICAgIGNpcmN1 bGFyIGRlcGVuZGVuY2llcy4KKwogMjAwNi0wOS0wMiAgR3JhaGFtIERlbm5pcyAgPGdyYWhhbS5k ZW5uaXNAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEp1c3Rpbi4KSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvQXBwbGVTY3JpcHQvYXJyYXktZXhwZWN0ZWQudHh0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvQXBwbGVTY3JpcHQvYXJyYXktZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAxNjE5MSkKKysrIExheW91dFRlc3RzL2Zhc3QvQXBwbGVTY3JpcHQvYXJyYXktZXhwZWN0 ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAotQXQgdGhlIG1vbWVudCwgdG9T dHJpbmcoKSBpcyBqdXN0IHVzZWQuIFBlcmhhcHMsIHNvbWUgYXJyYXlzIHNob3VsZCBiZSBjb252 ZXJ0ZWQgdG8gQXBwbGVTY3JpcHQgbGlzdHMuCi0xLDIsdGhyZWUgKCd1dHh0JykKLSwsMiAoJ3V0 eHQnKQorKDEsIDIsIHRocmVlKSAoJ2xpc3QnKQorKDw+LCA8PiwgMikgKCdsaXN0JykKKygwLCAi MCwiKSAoJ2xpc3QnKQogCiAKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvQXBwbGVTY3JpcHQvYXJy YXkuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L0FwcGxlU2NyaXB0L2FycmF5 Lmh0bWwJKHJldmlzaW9uIDE2MTkxKQorKysgTGF5b3V0VGVzdHMvZmFzdC9BcHBsZVNjcmlwdC9h cnJheS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0zLDcgKzMsNiBAQAogPHRpdGxlPmRvIEphdmFT Y3JpcHQgLSBjb252ZXJ0aW5nIEphdmFTY3JpcHQgYXJyYXlzIHRvIEFwcGxlU2NyaXB0PC90aXRs ZT4KIDwvaGVhZD4KIDxib2R5PgotQXQgdGhlIG1vbWVudCwgdG9TdHJpbmcoKSBpcyBqdXN0IHVz ZWQuIFBlcmhhcHMsIHNvbWUgYXJyYXlzIHNob3VsZCBiZSBjb252ZXJ0ZWQgdG8gQXBwbGVTY3Jp cHQgbGlzdHMuCiA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CiAKICAgICB2YXIgY29u c29sZV9tZXNzYWdlcyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CkBAIC0yMiw2ICsy MSwxMCBAQCBBdCB0aGUgbW9tZW50LCB0b1N0cmluZygpIGlzIGp1c3QgdXNlZC4gCiAgICAgICAg ICAgICAKICAgICAgICAgICAgIGxvZyhhcHBsZVNjcmlwdENvbnRyb2xsZXIuZG9KYXZhU2NyaXB0 KCJuZXcgQXJyYXkoMSwgMiwgJ3RocmVlJyk7IikpOwogICAgICAgICAgICAgbG9nKGFwcGxlU2Ny aXB0Q29udHJvbGxlci5kb0phdmFTY3JpcHQoImFyciA9IG5ldyBBcnJheTsgYXJyWydhJ10gPSAn YSc7IGFyclsyXSA9IDI7IGFycjsiKSk7CisgICAgICAgICAgICBsb2coYXBwbGVTY3JpcHRDb250 cm9sbGVyLmRvSmF2YVNjcmlwdCgiYXJyID0gbmV3IEFycmF5OyBhcnJbMF0gPSAwOyBhcnJbMV0g PSBhcnI7IGFycjsiKSk7CisKKy8vIFRoaXMgdGFrZXMgfjEwIHNlY29uZHMgb24gbXkgRzQvMS4y NQorLy8gICAgICAgICAgICBsb2coYXBwbGVTY3JpcHRDb250cm9sbGVyLmRvSmF2YVNjcmlwdCgi YXJyID0gbmV3IEFycmF5OyBhcnJbMV0gPSAxOyBhcnJbMTAwMDFdID0gMTAwMDE7IGFycjsiKSk7 CiAgICAgICAgICAgICAKICAgICAgICAgfSBjYXRjaCAoZXgpIHsKICAgICAgICAgICAgIGxvZygi RXhjZXB0aW9uOiAiICsgZXguZGVzY3JpcHRpb24pOwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTk0KQorKysgV2Vi Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAwNi0wOS0w MiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQG55cG9wLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjkzCisgICAgICAgIENvbnZlcnQgSmF2YVNjcmlwdCBh cnJheXMgdG8gQXBwbGVTY3JpcHQgbGlzdHMKKworICAgICAgICBUZXN0OiBmYXN0L0FwcGxlU2Ny aXB0L2FycmF5Lmh0bWwKKworICAgICAgICAqIGJyaWRnZS9tYWMvV2ViQ29yZUZyYW1lQnJpZGdl Lm1tOgorICAgICAgICAoYWVEZXNjRnJvbUpTVmFsdWUpOiBBZGRlZCBhIGNhc2UgZm9yIEFycmF5 SW5zdGFuY2UuCisKIDIwMDYtMDktMDIgIEdyYWhhbSBEZW5uaXMgIDxncmFoYW0uZGVubmlzQGdt YWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKdXN0aW4uCkluZGV4OiBXZWJDb3JlL2Jy aWRnZS9tYWMvV2ViQ29yZUZyYW1lQnJpZGdlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJp ZGdlL21hYy9XZWJDb3JlRnJhbWVCcmlkZ2UubW0JKHJldmlzaW9uIDE2MTkxKQorKysgV2ViQ29y ZS9icmlkZ2UvbWFjL1dlYkNvcmVGcmFtZUJyaWRnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNzUs NiArNzUsNyBAQAogI2ltcG9ydCAibWFya3VwLmgiCiAjaW1wb3J0ICJ2aXNpYmxlX3VuaXRzLmgi CiAjaW1wb3J0ICJYTUxUb2tlbml6ZXIuaCIKKyNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL2FycmF5 X2luc3RhbmNlLmg+CiAjaW1wb3J0IDxKYXZhU2NyaXB0Q29yZS9kYXRlX29iamVjdC5oPgogI2lt cG9ydCA8SmF2YVNjcmlwdENvcmUvcnVudGltZV9yb290Lmg+CiAjaW1wb3J0IDxranMvU2F2ZWRC dWlsdGlucy5oPgpAQCAtODUsNiArODYsNyBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCit1c2luZyBL SlM6OkFycmF5SW5zdGFuY2U7CiB1c2luZyBLSlM6OkJvb2xlYW5UeXBlOwogdXNpbmcgS0pTOjpE YXRlSW5zdGFuY2U7CiB1c2luZyBLSlM6OkV4ZWNTdGF0ZTsKQEAgLTE4NSw2ICsxODcsMjAgQEAg c3RhdGljIE5TQXBwbGVFdmVudERlc2NyaXB0b3IqIGFlRGVzY0ZybwogICAgICAgICAgICAgICAg ICAgICAgICAgYWVEZXNjID0gW05TQXBwbGVFdmVudERlc2NyaXB0b3IgZGVzY3JpcHRvcldpdGhE ZXNjcmlwdG9yVHlwZTp0eXBlTG9uZ0RhdGVUaW1lIGJ5dGVzOiZsZHQgbGVuZ3RoOnNpemVvZihs ZHQpXTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBlbHNl IGlmIChvYmplY3QtPmluaGVyaXRzKCZBcnJheUluc3RhbmNlOjppbmZvKSkgeworICAgICAgICAg ICAgICAgIHN0YXRpYyBIYXNoU2V0PEpTT2JqZWN0Kj4gdmlzaXRlZEVsZW1zOworICAgICAgICAg ICAgICAgIGlmICghdmlzaXRlZEVsZW1zLmNvbnRhaW5zKG9iamVjdCkpIHsKKyAgICAgICAgICAg ICAgICAgICAgdmlzaXRlZEVsZW1zLmFkZChvYmplY3QpOworICAgICAgICAgICAgICAgICAgICAK KyAgICAgICAgICAgICAgICAgICAgQXJyYXlJbnN0YW5jZSogYXJyYXkgPSBzdGF0aWNfY2FzdDxB cnJheUluc3RhbmNlKj4ob2JqZWN0KTsKKyAgICAgICAgICAgICAgICAgICAgYWVEZXNjID0gW05T QXBwbGVFdmVudERlc2NyaXB0b3IgbGlzdERlc2NyaXB0b3JdOworICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCBudW1JdGVtcyA9IGFycmF5LT5nZXRMZW5ndGgoKTsKKyAgICAgICAgICAgICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bUl0ZW1zOyArK2kpCisgICAgICAgICAg ICAgICAgICAgICAgICBbYWVEZXNjIGluc2VydERlc2NyaXB0b3I6YWVEZXNjRnJvbUpTVmFsdWUo ZXhlYywgYXJyYXktPmdldEl0ZW0oaSkpIGF0SW5kZXg6MF07CisgICAgICAgICAgICAgICAgICAg IAorICAgICAgICAgICAgICAgICAgICB2aXNpdGVkRWxlbXMucmVtb3ZlKG9iamVjdCk7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCFhZURlc2MpIHsK ICAgICAgICAgICAgICAgICBKU1ZhbHVlKiBwcmltaXRpdmUgPSBvYmplY3QtPnRvUHJpbWl0aXZl KGV4ZWMpOwogICAgICAgICAgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgewpJbmRl eDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5n ZUxvZwkocmV2aXNpb24gMTYxOTQpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwNi0wOS0wMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQG55cG9wLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTEw NjkzCisgICAgICAgIENvbnZlcnQgSmF2YVNjcmlwdCBhcnJheXMgdG8gQXBwbGVTY3JpcHQgbGlz dHMKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0FwcGxlU2NyaXB0Q29udHJvbGxlci5tOgor ICAgICAgICAoY29udmVydEFFRGVzY1RvT2JqZWN0KToKKyAgICAgICAgKC1bQXBwbGVTY3JpcHRD b250cm9sbGVyIGRvSmF2YVNjcmlwdDpdKTogU3VwcG9ydCBwcmludGluZyBBRURlc2NMaXN0cy4K KwogMjAwNi0wOC0zMSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg KiBTY3JpcHRzL2RvLXdlYmNvcmUtcmVuYW1lOiBQcmVwYXJlIGZvciBhbm90aGVyIHJvdW5kIG9m IHJlbmFtaW5nLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQXBwbGVTY3JpcHRD b250cm9sbGVyLm0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQXBw bGVTY3JpcHRDb250cm9sbGVyLm0JKHJldmlzaW9uIDE2MTkxKQorKysgV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvQXBwbGVTY3JpcHRDb250cm9sbGVyLm0JKHdvcmtpbmcgY29weSkKQEAgLTU2 LDEyICs1Niw4IEBACiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKLS0gKE5TU3RyaW5nICopZG9KYXZh U2NyaXB0OihOU1N0cmluZyAqKWFTdHJpbmcKK3N0YXRpYyBpZCBjb252ZXJ0QUVEZXNjVG9PYmpl Y3QoTlNBcHBsZUV2ZW50RGVzY3JpcHRvciAqYWVEZXNjKQogewotICAgIE5TQXBwbGVFdmVudERl c2NyaXB0b3IgKmFlRGVzYyA9IFt3ZWJWaWV3IGFlRGVzY0J5RXZhbHVhdGluZ0phdmFTY3JpcHRG cm9tU3RyaW5nOmFTdHJpbmddOwotICAgIGlmICghYWVEZXNjKQotICAgICAgICByZXR1cm4gQCIo bnVsbCkiOwotICAgIAogICAgIGlkIHZhbHVlID0gbmlsOwogCiAgICAgRGVzY1R5cGUgZGVzY1R5 cGUgPSBbYWVEZXNjIGRlc2NyaXB0b3JUeXBlXTsKQEAgLTczLDYgKzY5LDEyIEBACiAgICAgICAg ICAgICAgICAgdmFsdWUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiUwMTZsbFgiLCAo dW5zaWduZWQgbG9uZyBsb25nKWRdOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgdHlwZUFFTGlzdDoKKyAgICAgICAgICAgIHZhbHVlID0gW05TTXV0YWJs ZUFycmF5IGFycmF5XTsKKyAgICAgICAgICAgIGludCBudW1JdGVtcyA9IFthZURlc2MgbnVtYmVy T2ZJdGVtc107CisgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bUl0ZW1zOyArK2kp CisgICAgICAgICAgICAgICAgWyhOU011dGFibGVBcnJheSopdmFsdWUgYWRkT2JqZWN0OmNvbnZl cnRBRURlc2NUb09iamVjdChbYWVEZXNjIGRlc2NyaXB0b3JBdEluZGV4OihpICsgMSldKV07Cisg ICAgICAgICAgICBicmVhazsKICAgICB9CiAgCiAgICAgaWYgKCF2YWx1ZSkKQEAgLTgwLDE0ICs4 MiwyNCBAQAogICAgIGlmICghdmFsdWUpCiAgICAgICAgIHZhbHVlID0gW2FlRGVzYyBkYXRhXTsK IAorICAgIHJldHVybiB2YWx1ZTsKK30KKworLSAoTlNTdHJpbmcgKilkb0phdmFTY3JpcHQ6KE5T U3RyaW5nICopYVN0cmluZworeworICAgIE5TQXBwbGVFdmVudERlc2NyaXB0b3IgKmFlRGVzYyA9 IFt3ZWJWaWV3IGFlRGVzY0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nOmFTdHJpbmdd OworICAgIGlmICghYWVEZXNjKQorICAgICAgICByZXR1cm4gQCIobnVsbCkiOworICAgIAorICAg IERlc2NUeXBlIGRlc2NUeXBlID0gW2FlRGVzYyBkZXNjcmlwdG9yVHlwZV07CiAgICAgY2hhciBk ZXNjVHlwZVN0cls1XTsKICAgICBkZXNjVHlwZVN0clswXSA9IGRlc2NUeXBlID4+IDI0OwogICAg IGRlc2NUeXBlU3RyWzFdID0gZGVzY1R5cGUgPj4gMTY7CiAgICAgZGVzY1R5cGVTdHJbMl0gPSBk ZXNjVHlwZSA+PiA4OwogICAgIGRlc2NUeXBlU3RyWzNdID0gZGVzY1R5cGU7CiAgICAgZGVzY1R5 cGVTdHJbNF0gPSAwOwotICAgIAotICAgIHJldHVybiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAIiVAICgnJXMnKSIsIHZhbHVlLCBkZXNjVHlwZVN0cl07CisKKyAgICByZXR1cm4gW05TU3Ry aW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIlQCAoJyVzJykiLCBjb252ZXJ0QUVEZXNjVG9PYmplY3Qo YWVEZXNjKSwgZGVzY1R5cGVTdHJdOwogfQogCiBAZW5kCkluZGV4OiBXZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDE2MTkxKQorKysgV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29y a2luZyBjb3B5KQpAQCAtMTA0LDcgKzEwNCw3IEBACiAJCTIyMTgxQkQwMDlEQzhDNEIwMDgzNDJF OCAvKiBPYmpDUGx1Z2luRnVuY3Rpb24ubSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMub2JqYzsg cGF0aCA9IE9iakNQbHVnaW5GdW5jdGlvbi5tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkzMkE3MEFBQjAzNzA1RTFGMDBDOTE3ODMgLyogRHVtcFJlbmRlclRyZWVQcmVmaXguaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRHVtcFJlbmRlclRyZWVQcmVmaXguaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTMzNTQzNUYwM0Q3NTUwMjAwODYzNUNFIC8qIFdl YktpdC5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgcGF0aCA9IFdlYktpdC5mcmFtZXdvcms7IHNvdXJj ZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07Ci0JCTkzNDA5OTU0MDg1NDBDQUYwMDdGM0JD OCAvKiBEdW1wUmVuZGVyVHJlZSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBpbmNsdWRl SW5JbmRleCA9IDA7IGxhc3RLbm93bkZpbGVUeXBlID0gImNvbXBpbGVkLm1hY2gtby5leGVjdXRh YmxlIjsgcGF0aCA9IER1bXBSZW5kZXJUcmVlOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNf RElSOyB9OworCQk5MzQwOTk1NDA4NTQwQ0FGMDA3RjNCQzggLyogRHVtcFJlbmRlclRyZWUgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJjb21waWxlZC5t YWNoLW8uZXhlY3V0YWJsZSI7IGluY2x1ZGVJbkluZGV4ID0gMDsgcGF0aCA9IER1bXBSZW5kZXJU cmVlOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQk5MzQ0MkNGNDA4RjhC QTQ5MDBCRkU4Q0EgLyogVGV4dElucHV0Q29udHJvbGxlci5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBUZXh0SW5wdXRDb250cm9sbGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTkzNDQyQ0Y1MDhGOEJBNDkwMEJGRThDQSAvKiBUZXh0SW5wdXRDb250cm9sbGVy Lm0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMub2JqYzsgcGF0aCA9IFRleHRJbnB1dENvbnRyb2xs ZXIubTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTgwM0ZDQjcwOUNBQUFCMDAwOUIy QTM3IC8qIEV2ZW50U2VuZGluZ0NvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEV2ZW50U2VuZGluZ0NvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsK