188484 2018-08-11 12:46:56 -0700 [GLIB] Add symbol types 2021-11-01 12:50:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 1 ysuzuki ysuzuki achristensen cgarcia ews-watchlist keith_miller mark.lam mcatanzaro msaboff saam oldest_to_newest 1449489 0 ysuzuki 2018-08-11 12:46:56 -0700 [GLIB] Add symbol types 1449490 1 346966 ysuzuki 2018-08-11 12:48:35 -0700 Created attachment 346966 Patch 1449495 2 346969 ysuzuki 2018-08-11 13:39:15 -0700 Created attachment 346969 Patch 1449585 3 346969 cgarcia 2018-08-13 00:35:56 -0700 Comment on attachment 346969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=346969&action=review What about the new API to get/set/query/delete properties using a symbol as a key? I started this patch adding jsc_value_object_set_property_by_key_value, jsc_value_object_get_property_by_key_value, jsc_value_object_has_property_key_value and jsc_value_object_delete_property_by_key_value. But then I realized that JSCClassRef callbacks only work with string keys. > Source/JavaScriptCore/API/glib/JSCValue.cpp:500 > + auto string = String::fromUTF8(data, dataSize); Since bytes is always going to be used as an UTF-8 string, I think it would be better to not use GBytes. We could allow null-bytes in string using a single function new_symbol() that receives a const char* and gssize length. When -1 is given as length, the string is considered a null terminated string. That's how jsc_context_evaluate works. I know we have new_string_from_bytes(), but in that case it's more obvious that the GBytes is going to be used as a string. 1810799 4 346969 achristensen 2021-11-01 12:50:37 -0700 Comment on attachment 346969 Patch This has been requesting review for more than one year. If this is still needed, please rebase and re-request review. 346966 2018-08-11 12:48:35 -0700 2018-08-11 13:39:12 -0700 Patch bug-188484-20180812044833.patch text/plain 6842 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTJhYjNlZjliMDlmNTc5NzU0MmRmYzllODE1MjdjNGUwNWE4YTE5Li42MWIxNzc4N2Q1ZmViMTg3 Nzg1NmIzOWU4YmQ4NmZlMTdiZGFiYWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOC0wOC0xMSAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1enVraUBzbG93 c3RhcnQub3JnPgorCisgICAgICAgIFtHTElCXSBBZGQgc3ltYm9sIHR5cGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg0ODQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBm aXJzdCBhZGQgc3ltYm9sIGZhY3RvcnkgYW5kIHByZWRpY2F0ZSBmdW5jdGlvbnMgdG8gZ2xpYiBK U0MgQVBJcy4KKworICAgICAgICAqIEFQSS9nbGliL0pTQ1ZhbHVlLmNwcDoKKyAgICAgICAgKGpz Y192YWx1ZV9uZXdfc3ltYm9sKToKKyAgICAgICAgKGpzY192YWx1ZV9uZXdfc3ltYm9sX2Zyb21f Ynl0ZXMpOgorICAgICAgICAoanNjX3ZhbHVlX2lzX3N5bWJvbCk6CisgICAgICAgICogQVBJL2ds aWIvSlNDVmFsdWUuaDoKKwogMjAxOC0wOC0xMCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbnNvbGUubG9nIGZpcmVzIGdl dHRlcnMgZm9yIGRlZXAgcHJvcGVydGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xp Yi9KU0NWYWx1ZS5jcHAKaW5kZXggNzllNTMxNmZkMzYyOTNjOGRkMDIzMzYyM2JhZDAzYmFhODVk OWMzYi4uN2U4NTFkMTc0MjkxYjUwOTBmNmExOWM3MWUyMTYyNDA0ZDEzNWEzMyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlNDVmFsdWUuY3BwCkBAIC00NTYsNiArNDU2LDY4 IEBAIEdCeXRlcyoganNjX3ZhbHVlX3RvX3N0cmluZ19hc19ieXRlcyhKU0NWYWx1ZSogdmFsdWUp CiAgICAgcmV0dXJuIGdfYnl0ZXNfbmV3X3dpdGhfZnJlZV9mdW5jKHN0cmluZywgc3RyaW5nU2l6 ZSAtIDEsIGZhc3RGcmVlLCBzdHJpbmcpOwogfQogCisvKioKKyAqIGpzY192YWx1ZV9uZXdfc3lt Ym9sOgorICogQGNvbnRleHQ6IGEgI0pTQ0NvbnRleHQKKyAqIEBkZXNjcmlwdGlvbjogKG51bGxh YmxlKTogYSBudWxsLXRlcm1pbmF0ZWQgc3RyaW5nCisgKgorICogQ3JlYXRlIGEgbmV3ICNKU0NW YWx1ZSBmcm9tIEBkZXNjcmlwdGlvbi4gSWYgeW91IG5lZWQgdG8gY3JlYXRlIGEgI0pTQ1ZhbHVl IGZyb20gYQorICogc3RyaW5nIGNvbnRhaW5pbmcgbnVsbCBjaGFyYWN0ZXJzLCB1c2UganNjX3Zh bHVlX25ld19zeW1ib2xfZnJvbV9ieXRlcygpIGluc3RlYWQuCisgKgorICogUmV0dXJuczogKHRy YW5zZmVyIGZ1bGwpOiBhICNKU0NWYWx1ZS4KKyAqLworSlNDVmFsdWUqIGpzY192YWx1ZV9uZXdf c3ltYm9sKEpTQ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IGNoYXIqIGRlc2NyaXB0aW9uKQorewor ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEpTQ19JU19DT05URVhUKGNvbnRleHQpLCBudWxscHRy KTsKKworICAgIEpTVmFsdWVSZWYganNTdHJpbmdWYWx1ZTsKKyAgICBpZiAoZGVzY3JpcHRpb24p IHsKKyAgICAgICAgSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IGpzU3RyaW5nKEFkb3B0LCBKU1N0 cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhkZXNjcmlwdGlvbikpOworICAgICAgICBqc1N0cmlu Z1ZhbHVlID0gSlNWYWx1ZU1ha2VTeW1ib2woanNjQ29udGV4dEdldEpTQ29udGV4dChjb250ZXh0 KSwganNTdHJpbmcuZ2V0KCkpOworICAgIH0gZWxzZQorICAgICAgICBqc1N0cmluZ1ZhbHVlID0g SlNWYWx1ZU1ha2VTeW1ib2woanNjQ29udGV4dEdldEpTQ29udGV4dChjb250ZXh0KSwgbnVsbHB0 cik7CisgICAgcmV0dXJuIGpzY0NvbnRleHRHZXRPckNyZWF0ZVZhbHVlKGNvbnRleHQsIGpzU3Ry aW5nVmFsdWUpLmxlYWtSZWYoKTsKK30KKworLyoqCisgKiBqc2NfdmFsdWVfbmV3X3N5bWJvbF9m cm9tX2J5dGVzOgorICogQGNvbnRleHQ6IGEgI0pTQ0NvbnRleHQKKyAqIEBieXRlczogKG51bGxh YmxlKTogYSAjR0J5dGVzCisgKgorICogQ3JlYXRlIGEgbmV3ICNKU0NWYWx1ZSBmcm9tIEBieXRl cy4KKyAqCisgKiBSZXR1cm5zOiAodHJhbnNmZXIgZnVsbCk6IGEgI0pTQ1ZhbHVlLgorICovCitK U0NWYWx1ZSoganNjX3ZhbHVlX25ld19zeW1ib2xfZnJvbV9ieXRlcyhKU0NDb250ZXh0KiBjb250 ZXh0LCBHQnl0ZXMqIGJ5dGVzKQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEpTQ19JU19D T05URVhUKGNvbnRleHQpLCBudWxscHRyKTsKKworICAgIGlmICghYnl0ZXMpCisgICAgICAgIHJl dHVybiBqc2NfdmFsdWVfbmV3X3N5bWJvbChjb250ZXh0LCBudWxscHRyKTsKKworICAgIGdzaXpl IGRhdGFTaXplOworICAgIGNvbnN0IGF1dG8qIGRhdGEgPSBzdGF0aWNfY2FzdDxjb25zdCBjaGFy Kj4oZ19ieXRlc19nZXRfZGF0YShieXRlcywgJmRhdGFTaXplKSk7CisgICAgYXV0byBzdHJpbmcg PSBTdHJpbmc6OmZyb21VVEY4KGRhdGEsIGRhdGFTaXplKTsKKyAgICBKU1JldGFpblB0cjxKU1N0 cmluZ1JlZj4ganNTdHJpbmcoQWRvcHQsIE9wYXF1ZUpTU3RyaW5nOjpjcmVhdGUoV1RGTW92ZShz dHJpbmcpKS5sZWFrUmVmKCkpOworICAgIHJldHVybiBqc2NDb250ZXh0R2V0T3JDcmVhdGVWYWx1 ZShjb250ZXh0LCBKU1ZhbHVlTWFrZVN5bWJvbChqc2NDb250ZXh0R2V0SlNDb250ZXh0KGNvbnRl eHQpLCBqc1N0cmluZy5nZXQoKSkpLmxlYWtSZWYoKTsKK30KKworLyoqCisgKiBqc2NfdmFsdWVf aXNfc3ltYm9sOgorICogQHZhbHVlOiBhICNKU0NWYWx1ZQorICoKKyAqIEdldCB3aGV0aGVyIHRo ZSB2YWx1ZSByZWZlcmVuY2VkIGJ5IEB2YWx1ZSBpcyBhIHN5bWJvbAorICoKKyAqIFJldHVybnM6 IHdoZXRoZXIgdGhlIHZhbHVlIGlzIGEgc3ltYm9sCisgKi8KK2dib29sZWFuIGpzY192YWx1ZV9p c19zeW1ib2woSlNDVmFsdWUqIHZhbHVlKQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEpT Q19JU19WQUxVRSh2YWx1ZSksIEZBTFNFKTsKKworICAgIEpTQ1ZhbHVlUHJpdmF0ZSogcHJpdiA9 IHZhbHVlLT5wcml2OworICAgIHJldHVybiBKU1ZhbHVlSXNTeW1ib2woanNjQ29udGV4dEdldEpT Q29udGV4dChwcml2LT5jb250ZXh0LmdldCgpKSwgcHJpdi0+anNWYWx1ZSk7Cit9CisKIC8qKgog ICoganNjX3ZhbHVlX25ld19hcnJheTogKHNraXApCiAgKiBAY29udGV4dDogYSAjSlNDQ29udGV4 dApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlNDVmFsdWUuaAppbmRleCBlYjVmNWZl MTNlYjZmOTYyYjIyMTE3ODBjNzI3YjE3YzVlYWExYWY1Li5lYjU4ODM3Nzc5NjUxZjc4Y2JiMjIy YThjZTVhZjM2ZWU2YmMyZTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJ L2dsaWIvSlNDVmFsdWUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlND VmFsdWUuaApAQCAtMTIxLDYgKzEyMSwxNyBAQCBqc2NfdmFsdWVfdG9fc3RyaW5nICAgICAgICAg ICAgICAgICAgICAgICAoSlNDVmFsdWUgICAgICAgICAgICAgKnZhbHVlKTsKIEpTQ19BUEkgR0J5 dGVzICoKIGpzY192YWx1ZV90b19zdHJpbmdfYXNfYnl0ZXMgICAgICAgICAgICAgIChKU0NWYWx1 ZSAgICAgICAgICAgICAqdmFsdWUpOwogCitKU0NfQVBJIEpTQ1ZhbHVlICoKK2pzY192YWx1ZV9u ZXdfc3ltYm9sICAgICAgICAgICAgICAgICAgICAgIChKU0NDb250ZXh0ICAgICAgICAgICAqY29u dGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBj aGFyICAgICAgICAgICAqZGVzY3JpcHRpb24pOworCitKU0NfQVBJIEpTQ1ZhbHVlICoKK2pzY192 YWx1ZV9uZXdfc3ltYm9sX2Zyb21fYnl0ZXMgICAgICAgICAgIChKU0NDb250ZXh0ICAgICAgICAg ICAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBH Qnl0ZXMgICAgICAgICAgICAgICAqYnl0ZXMpOworCitKU0NfQVBJIGdib29sZWFuCitqc2NfdmFs dWVfaXNfc3ltYm9sICAgICAgICAgICAgICAgICAgICAgICAoSlNDVmFsdWUgICAgICAgICAgICAg KnZhbHVlKTsKKwogSlNDX0FQSSBKU0NWYWx1ZSAqCiBqc2NfdmFsdWVfbmV3X2FycmF5ICAgICAg ICAgICAgICAgICAgICAgICAoSlNDQ29udGV4dCAgICAgICAgICAgKmNvbnRleHQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1R5cGUgICAgICAgICAgICAgICAg IGZpcnN0X2l0ZW1fdHlwZSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBjZjJhNGE1N2UyNWNjYWM0NjM4NmQ4ODdmOTY5NmUxOGNlOTMwNzY1Li5h MWExM2ZkZWUwNWQ5MDY3MTU0MDQwMTc4MmE4ZjE0ODdmYjJiZmFhIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgt MDgtMTEgIFl1c3VrZSBTdXp1a2kgIDx5dXN1a2VzdXp1a2lAc2xvd3N0YXJ0Lm9yZz4KKworICAg ICAgICBbR0xJQl0gQWRkIHN5bWJvbCB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NDg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3RzIGZvciBqc2NfdmFsdWVfbmV3X3N5bWJvbCwg anNjX3ZhbHVlX25ld19zeW1ib2xfZnJvbV9ieXRlcywgYW5kIGpzY192YWx1ZV9pc19zeW1ib2wu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL0phdmFTY3JpcHRDb3JlL2dsaWIvVGVz dEpTQy5jcHA6CisgICAgICAgICh0ZXN0SlNDVHlwZXMpOgorCiAyMDE4LTA4LTEwICBEYW5pZWwg QmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJraXQtcGF0Y2ggc2V0dXAt Z2l0LWNsb25lIHNob3VsZCBzZXQgR2l0IGNvcmUgZWRpdG9yIHRvIGNvbW1pdC1sb2ctZWRpdG9y CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL0phdmFTY3JpcHRDb3JlL2ds aWIvVGVzdEpTQy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL0phdmFTY3JpcHRDb3Jl L2dsaWIvVGVzdEpTQy5jcHAKaW5kZXggNGFjYThlMjNlNzg1MGM0ZDJmYjg0YzQ3MDRkYjJkNTUx ZjMwOTRkMC4uYTIzYWY2MjQ5OTA4NTY0NTFlMDc3MzBlZjdlNTMxOTdmZDI0NWU2MyAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9KYXZhU2NyaXB0Q29yZS9nbGliL1Rlc3RK U0MuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvSmF2YVNjcmlwdENvcmUvZ2xp Yi9UZXN0SlNDLmNwcApAQCAtMzg1LDYgKzM4NSwyNSBAQCBzdGF0aWMgdm9pZCB0ZXN0SlNDVHlw ZXMoKQogICAgIGNoZWNrZXIud2F0Y2gocmVzdWx0LmdldCgpKTsKICAgICBnX2Fzc2VydF90cnVl KHJlc3VsdC5nZXQoKSA9PSB2YWx1ZS5nZXQoKSk7CiAKKyAgICB2YWx1ZSA9IGFkb3B0R1JlZihq c2NfdmFsdWVfbmV3X3N5bWJvbChjb250ZXh0LmdldCgpLCBudWxscHRyKSk7CisgICAgY2hlY2tl ci53YXRjaCh2YWx1ZS5nZXQoKSk7CisgICAgZ19hc3NlcnRfdHJ1ZShqc2NfdmFsdWVfaXNfc3lt Ym9sKHZhbHVlLmdldCgpKSk7CisKKyAgICB2YWx1ZSA9IGFkb3B0R1JlZihqc2NfdmFsdWVfbmV3 X3N5bWJvbChjb250ZXh0LmdldCgpLCAiMTIuNSIpKTsKKyAgICBjaGVja2VyLndhdGNoKHZhbHVl LmdldCgpKTsKKyAgICBnX2Fzc2VydF90cnVlKGpzY192YWx1ZV9pc19zeW1ib2wodmFsdWUuZ2V0 KCkpKTsKKworICAgIEdTdHJpbmcqIGV4cGVjdGVkID0gZ19zdHJpbmdfbmV3KCJTdHJpbmciKTsK KyAgICBleHBlY3RlZCA9IGdfc3RyaW5nX2FwcGVuZF9jKGV4cGVjdGVkLCAnXDAnKTsKKyAgICBl eHBlY3RlZCA9IGdfc3RyaW5nX2FwcGVuZChleHBlY3RlZCwgIldpdGgiKTsKKyAgICBleHBlY3Rl ZCA9IGdfc3RyaW5nX2FwcGVuZF9jKGV4cGVjdGVkLCAnXDAnKTsKKyAgICBleHBlY3RlZCA9IGdf c3RyaW5nX2FwcGVuZChleHBlY3RlZCwgIk51bGwiKTsKKyAgICBHUmVmUHRyPEdCeXRlcz4gZXhw ZWN0ZWRCeXRlcyA9IGFkb3B0R1JlZihnX3N0cmluZ19mcmVlX3RvX2J5dGVzKGV4cGVjdGVkKSk7 CisKKyAgICB2YWx1ZSA9IGFkb3B0R1JlZihqc2NfdmFsdWVfbmV3X3N5bWJvbF9mcm9tX2J5dGVz KGNvbnRleHQuZ2V0KCksIGV4cGVjdGVkQnl0ZXMuZ2V0KCkpKTsKKyAgICBjaGVja2VyLndhdGNo KHZhbHVlLmdldCgpKTsKKyAgICBnX2Fzc2VydF90cnVlKGpzY192YWx1ZV9pc19zeW1ib2wodmFs dWUuZ2V0KCkpKTsKKwogICAgIHZhbHVlID0gYWRvcHRHUmVmKGpzY192YWx1ZV9uZXdfYXJyYXko Y29udGV4dC5nZXQoKSwgR19UWVBFX05PTkUpKTsKICAgICBjaGVja2VyLndhdGNoKHZhbHVlLmdl dCgpKTsKICAgICBnX2Fzc2VydF90cnVlKGpzY192YWx1ZV9pc19hcnJheSh2YWx1ZS5nZXQoKSkp Owo= 346969 2018-08-11 13:39:15 -0700 2021-11-01 12:50:37 -0700 Patch bug-188484-20180812053914.patch text/plain 7548 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MTJhYjNlZjliMDlmNTc5NzU0MmRmYzllODE1MjdjNGUwNWE4YTE5Li40YzA0YmZhYTJkMDdkNjA3 MWNiMGMwNWNjNGE2ZmQ0YzhkMDgxYWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0wOC0xMSAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1enVraUBzbG93 c3RhcnQub3JnPgorCisgICAgICAgIFtHTElCXSBBZGQgc3ltYm9sIHR5cGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg0ODQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBm aXJzdCBhZGQgc3ltYm9sIGZhY3RvcnkgYW5kIHByZWRpY2F0ZSBmdW5jdGlvbnMgdG8gZ2xpYiBK U0MgQVBJcy4KKworICAgICAgICAqIEFQSS9nbGliL0pTQ1ZhbHVlLmNwcDoKKyAgICAgICAgKGpz Y192YWx1ZV9uZXdfc3ltYm9sKToKKyAgICAgICAgKGpzY192YWx1ZV9uZXdfc3ltYm9sX2Zyb21f Ynl0ZXMpOgorICAgICAgICAoanNjX3ZhbHVlX2lzX3N5bWJvbCk6CisgICAgICAgICogQVBJL2ds aWIvSlNDVmFsdWUuaDoKKyAgICAgICAgKiBBUEkvZ2xpYi9kb2NzL2pzYy1nbGliLTQuMC1zZWN0 aW9ucy50eHQ6CisKIDIwMTgtMDgtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjb25zb2xlLmxvZyBmaXJlcyBnZXR0ZXJz IGZvciBkZWVwIHByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvZ2xpYi9KU0NWYWx1ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlND VmFsdWUuY3BwCmluZGV4IDc5ZTUzMTZmZDM2MjkzYzhkZDAyMzM2MjNiYWQwM2JhYTg1ZDljM2Iu LjdlODUxZDE3NDI5MWI1MDkwZjZhMTljNzFlMjE2MjQwNGQxMzVhMzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NWYWx1ZS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmNwcApAQCAtNDU2LDYgKzQ1Niw2OCBAQCBH Qnl0ZXMqIGpzY192YWx1ZV90b19zdHJpbmdfYXNfYnl0ZXMoSlNDVmFsdWUqIHZhbHVlKQogICAg IHJldHVybiBnX2J5dGVzX25ld193aXRoX2ZyZWVfZnVuYyhzdHJpbmcsIHN0cmluZ1NpemUgLSAx LCBmYXN0RnJlZSwgc3RyaW5nKTsKIH0KIAorLyoqCisgKiBqc2NfdmFsdWVfbmV3X3N5bWJvbDoK KyAqIEBjb250ZXh0OiBhICNKU0NDb250ZXh0CisgKiBAZGVzY3JpcHRpb246IChudWxsYWJsZSk6 IGEgbnVsbC10ZXJtaW5hdGVkIHN0cmluZworICoKKyAqIENyZWF0ZSBhIG5ldyAjSlNDVmFsdWUg ZnJvbSBAZGVzY3JpcHRpb24uIElmIHlvdSBuZWVkIHRvIGNyZWF0ZSBhICNKU0NWYWx1ZSBmcm9t IGEKKyAqIHN0cmluZyBjb250YWluaW5nIG51bGwgY2hhcmFjdGVycywgdXNlIGpzY192YWx1ZV9u ZXdfc3ltYm9sX2Zyb21fYnl0ZXMoKSBpbnN0ZWFkLgorICoKKyAqIFJldHVybnM6ICh0cmFuc2Zl ciBmdWxsKTogYSAjSlNDVmFsdWUuCisgKi8KK0pTQ1ZhbHVlKiBqc2NfdmFsdWVfbmV3X3N5bWJv bChKU0NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBjaGFyKiBkZXNjcmlwdGlvbikKK3sKKyAgICBn X3JldHVybl92YWxfaWZfZmFpbChKU0NfSVNfQ09OVEVYVChjb250ZXh0KSwgbnVsbHB0cik7CisK KyAgICBKU1ZhbHVlUmVmIGpzU3RyaW5nVmFsdWU7CisgICAgaWYgKGRlc2NyaXB0aW9uKSB7Cisg ICAgICAgIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBqc1N0cmluZyhBZG9wdCwgSlNTdHJpbmdD cmVhdGVXaXRoVVRGOENTdHJpbmcoZGVzY3JpcHRpb24pKTsKKyAgICAgICAganNTdHJpbmdWYWx1 ZSA9IEpTVmFsdWVNYWtlU3ltYm9sKGpzY0NvbnRleHRHZXRKU0NvbnRleHQoY29udGV4dCksIGpz U3RyaW5nLmdldCgpKTsKKyAgICB9IGVsc2UKKyAgICAgICAganNTdHJpbmdWYWx1ZSA9IEpTVmFs dWVNYWtlU3ltYm9sKGpzY0NvbnRleHRHZXRKU0NvbnRleHQoY29udGV4dCksIG51bGxwdHIpOwor ICAgIHJldHVybiBqc2NDb250ZXh0R2V0T3JDcmVhdGVWYWx1ZShjb250ZXh0LCBqc1N0cmluZ1Zh bHVlKS5sZWFrUmVmKCk7Cit9CisKKy8qKgorICoganNjX3ZhbHVlX25ld19zeW1ib2xfZnJvbV9i eXRlczoKKyAqIEBjb250ZXh0OiBhICNKU0NDb250ZXh0CisgKiBAYnl0ZXM6IChudWxsYWJsZSk6 IGEgI0dCeXRlcworICoKKyAqIENyZWF0ZSBhIG5ldyAjSlNDVmFsdWUgZnJvbSBAYnl0ZXMuCisg KgorICogUmV0dXJuczogKHRyYW5zZmVyIGZ1bGwpOiBhICNKU0NWYWx1ZS4KKyAqLworSlNDVmFs dWUqIGpzY192YWx1ZV9uZXdfc3ltYm9sX2Zyb21fYnl0ZXMoSlNDQ29udGV4dCogY29udGV4dCwg R0J5dGVzKiBieXRlcykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChKU0NfSVNfQ09OVEVY VChjb250ZXh0KSwgbnVsbHB0cik7CisKKyAgICBpZiAoIWJ5dGVzKQorICAgICAgICByZXR1cm4g anNjX3ZhbHVlX25ld19zeW1ib2woY29udGV4dCwgbnVsbHB0cik7CisKKyAgICBnc2l6ZSBkYXRh U2l6ZTsKKyAgICBjb25zdCBhdXRvKiBkYXRhID0gc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KGdf Ynl0ZXNfZ2V0X2RhdGEoYnl0ZXMsICZkYXRhU2l6ZSkpOworICAgIGF1dG8gc3RyaW5nID0gU3Ry aW5nOjpmcm9tVVRGOChkYXRhLCBkYXRhU2l6ZSk7CisgICAgSlNSZXRhaW5QdHI8SlNTdHJpbmdS ZWY+IGpzU3RyaW5nKEFkb3B0LCBPcGFxdWVKU1N0cmluZzo6Y3JlYXRlKFdURk1vdmUoc3RyaW5n KSkubGVha1JlZigpKTsKKyAgICByZXR1cm4ganNjQ29udGV4dEdldE9yQ3JlYXRlVmFsdWUoY29u dGV4dCwgSlNWYWx1ZU1ha2VTeW1ib2woanNjQ29udGV4dEdldEpTQ29udGV4dChjb250ZXh0KSwg anNTdHJpbmcuZ2V0KCkpKS5sZWFrUmVmKCk7Cit9CisKKy8qKgorICoganNjX3ZhbHVlX2lzX3N5 bWJvbDoKKyAqIEB2YWx1ZTogYSAjSlNDVmFsdWUKKyAqCisgKiBHZXQgd2hldGhlciB0aGUgdmFs dWUgcmVmZXJlbmNlZCBieSBAdmFsdWUgaXMgYSBzeW1ib2wKKyAqCisgKiBSZXR1cm5zOiB3aGV0 aGVyIHRoZSB2YWx1ZSBpcyBhIHN5bWJvbAorICovCitnYm9vbGVhbiBqc2NfdmFsdWVfaXNfc3lt Ym9sKEpTQ1ZhbHVlKiB2YWx1ZSkKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChKU0NfSVNf VkFMVUUodmFsdWUpLCBGQUxTRSk7CisKKyAgICBKU0NWYWx1ZVByaXZhdGUqIHByaXYgPSB2YWx1 ZS0+cHJpdjsKKyAgICByZXR1cm4gSlNWYWx1ZUlzU3ltYm9sKGpzY0NvbnRleHRHZXRKU0NvbnRl eHQocHJpdi0+Y29udGV4dC5nZXQoKSksIHByaXYtPmpzVmFsdWUpOworfQorCiAvKioKICAqIGpz Y192YWx1ZV9uZXdfYXJyYXk6IChza2lwKQogICogQGNvbnRleHQ6IGEgI0pTQ0NvbnRleHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NWYWx1ZS5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmgKaW5kZXggZWI1ZjVmZTEzZWI2 Zjk2MmIyMjExNzgwYzcyN2IxN2M1ZWFhMWFmNS4uZWI1ODgzNzc3OTY1MWY3OGNiYjIyMmE4Y2U1 YWYzNmVlNmJjMmU0MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGli L0pTQ1ZhbHVlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVl LmgKQEAgLTEyMSw2ICsxMjEsMTcgQEAganNjX3ZhbHVlX3RvX3N0cmluZyAgICAgICAgICAgICAg ICAgICAgICAgKEpTQ1ZhbHVlICAgICAgICAgICAgICp2YWx1ZSk7CiBKU0NfQVBJIEdCeXRlcyAq CiBqc2NfdmFsdWVfdG9fc3RyaW5nX2FzX2J5dGVzICAgICAgICAgICAgICAoSlNDVmFsdWUgICAg ICAgICAgICAgKnZhbHVlKTsKIAorSlNDX0FQSSBKU0NWYWx1ZSAqCitqc2NfdmFsdWVfbmV3X3N5 bWJvbCAgICAgICAgICAgICAgICAgICAgICAoSlNDQ29udGV4dCAgICAgICAgICAgKmNvbnRleHQs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAg ICAgICAgICAgKmRlc2NyaXB0aW9uKTsKKworSlNDX0FQSSBKU0NWYWx1ZSAqCitqc2NfdmFsdWVf bmV3X3N5bWJvbF9mcm9tX2J5dGVzICAgICAgICAgICAoSlNDQ29udGV4dCAgICAgICAgICAgKmNv bnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0J5dGVz ICAgICAgICAgICAgICAgKmJ5dGVzKTsKKworSlNDX0FQSSBnYm9vbGVhbgoranNjX3ZhbHVlX2lz X3N5bWJvbCAgICAgICAgICAgICAgICAgICAgICAgKEpTQ1ZhbHVlICAgICAgICAgICAgICp2YWx1 ZSk7CisKIEpTQ19BUEkgSlNDVmFsdWUgKgoganNjX3ZhbHVlX25ld19hcnJheSAgICAgICAgICAg ICAgICAgICAgICAgKEpTQ0NvbnRleHQgICAgICAgICAgICpjb250ZXh0LAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUeXBlICAgICAgICAgICAgICAgICBmaXJz dF9pdGVtX3R5cGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIv ZG9jcy9qc2MtZ2xpYi00LjAtc2VjdGlvbnMudHh0IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9nbGliL2RvY3MvanNjLWdsaWItNC4wLXNlY3Rpb25zLnR4dAppbmRleCAzYzYxN2QxMmI2Mjhl M2JkNDQwMmNhYTg4MGQ0Mzk1M2Y1MWJiMDcwLi4yZTAwZTE3Y2JmYWIwOWRiZTNhMGE4ODg4MWNj ZTA2NDNiYzY1MDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIv ZG9jcy9qc2MtZ2xpYi00LjAtc2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvZ2xpYi9kb2NzL2pzYy1nbGliLTQuMC1zZWN0aW9ucy50eHQKQEAgLTgzLDYgKzgzLDkg QEAganNjX3ZhbHVlX25ld19zdHJpbmdfZnJvbV9ieXRlcwoganNjX3ZhbHVlX2lzX3N0cmluZwog anNjX3ZhbHVlX3RvX3N0cmluZwoganNjX3ZhbHVlX3RvX3N0cmluZ19hc19ieXRlcworanNjX3Zh bHVlX25ld19zeW1ib2wKK2pzY192YWx1ZV9uZXdfc3ltYm9sX2Zyb21fYnl0ZXMKK2pzY192YWx1 ZV9pc19zeW1ib2wKIGpzY192YWx1ZV9uZXdfYXJyYXkKIGpzY192YWx1ZV9uZXdfYXJyYXlfZnJv bV9nYXJyYXkKIGpzY192YWx1ZV9uZXdfYXJyYXlfZnJvbV9zdHJ2CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2YyYTRhNTdlMjVjY2FjNDYzODZk ODg3Zjk2OTZlMThjZTkzMDc2NS4uYTFhMTNmZGVlMDVkOTA2NzE1NDA0MDE3ODJhOGYxNDg3ZmIy YmZhYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDE4LTA4LTExICBZdXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6dWtp QHNsb3dzdGFydC5vcmc+CisKKyAgICAgICAgW0dMSUJdIEFkZCBzeW1ib2wgdHlwZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODQ4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyBmb3Ig anNjX3ZhbHVlX25ld19zeW1ib2wsIGpzY192YWx1ZV9uZXdfc3ltYm9sX2Zyb21fYnl0ZXMsIGFu ZCBqc2NfdmFsdWVfaXNfc3ltYm9sLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9K YXZhU2NyaXB0Q29yZS9nbGliL1Rlc3RKU0MuY3BwOgorICAgICAgICAodGVzdEpTQ1R5cGVzKToK KwogMjAxOC0wOC0xMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgd2Via2l0LXBhdGNoIHNldHVwLWdpdC1jbG9uZSBzaG91bGQgc2V0IEdpdCBjb3JlIGVkaXRv ciB0byBjb21taXQtbG9nLWVkaXRvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9KYXZhU2NyaXB0Q29yZS9nbGliL1Rlc3RKU0MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9KYXZhU2NyaXB0Q29yZS9nbGliL1Rlc3RKU0MuY3BwCmluZGV4IDRhY2E4ZTIzZTc4 NTBjNGQyZmI4NGM0NzA0ZGIyZDU1MWYzMDk0ZDAuLmEyM2FmNjI0OTkwODU2NDUxZTA3NzMwZWY3 ZTUzMTk3ZmQyNDVlNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvSmF2 YVNjcmlwdENvcmUvZ2xpYi9UZXN0SlNDLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL0phdmFTY3JpcHRDb3JlL2dsaWIvVGVzdEpTQy5jcHAKQEAgLTM4NSw2ICszODUsMjUgQEAg c3RhdGljIHZvaWQgdGVzdEpTQ1R5cGVzKCkKICAgICBjaGVja2VyLndhdGNoKHJlc3VsdC5nZXQo KSk7CiAgICAgZ19hc3NlcnRfdHJ1ZShyZXN1bHQuZ2V0KCkgPT0gdmFsdWUuZ2V0KCkpOwogCisg ICAgdmFsdWUgPSBhZG9wdEdSZWYoanNjX3ZhbHVlX25ld19zeW1ib2woY29udGV4dC5nZXQoKSwg bnVsbHB0cikpOworICAgIGNoZWNrZXIud2F0Y2godmFsdWUuZ2V0KCkpOworICAgIGdfYXNzZXJ0 X3RydWUoanNjX3ZhbHVlX2lzX3N5bWJvbCh2YWx1ZS5nZXQoKSkpOworCisgICAgdmFsdWUgPSBh ZG9wdEdSZWYoanNjX3ZhbHVlX25ld19zeW1ib2woY29udGV4dC5nZXQoKSwgIjEyLjUiKSk7Cisg ICAgY2hlY2tlci53YXRjaCh2YWx1ZS5nZXQoKSk7CisgICAgZ19hc3NlcnRfdHJ1ZShqc2NfdmFs dWVfaXNfc3ltYm9sKHZhbHVlLmdldCgpKSk7CisKKyAgICBHU3RyaW5nKiBleHBlY3RlZCA9IGdf c3RyaW5nX25ldygiU3RyaW5nIik7CisgICAgZXhwZWN0ZWQgPSBnX3N0cmluZ19hcHBlbmRfYyhl eHBlY3RlZCwgJ1wwJyk7CisgICAgZXhwZWN0ZWQgPSBnX3N0cmluZ19hcHBlbmQoZXhwZWN0ZWQs ICJXaXRoIik7CisgICAgZXhwZWN0ZWQgPSBnX3N0cmluZ19hcHBlbmRfYyhleHBlY3RlZCwgJ1ww Jyk7CisgICAgZXhwZWN0ZWQgPSBnX3N0cmluZ19hcHBlbmQoZXhwZWN0ZWQsICJOdWxsIik7Cisg ICAgR1JlZlB0cjxHQnl0ZXM+IGV4cGVjdGVkQnl0ZXMgPSBhZG9wdEdSZWYoZ19zdHJpbmdfZnJl ZV90b19ieXRlcyhleHBlY3RlZCkpOworCisgICAgdmFsdWUgPSBhZG9wdEdSZWYoanNjX3ZhbHVl X25ld19zeW1ib2xfZnJvbV9ieXRlcyhjb250ZXh0LmdldCgpLCBleHBlY3RlZEJ5dGVzLmdldCgp KSk7CisgICAgY2hlY2tlci53YXRjaCh2YWx1ZS5nZXQoKSk7CisgICAgZ19hc3NlcnRfdHJ1ZShq c2NfdmFsdWVfaXNfc3ltYm9sKHZhbHVlLmdldCgpKSk7CisKICAgICB2YWx1ZSA9IGFkb3B0R1Jl Zihqc2NfdmFsdWVfbmV3X2FycmF5KGNvbnRleHQuZ2V0KCksIEdfVFlQRV9OT05FKSk7CiAgICAg Y2hlY2tlci53YXRjaCh2YWx1ZS5nZXQoKSk7CiAgICAgZ19hc3NlcnRfdHJ1ZShqc2NfdmFsdWVf aXNfYXJyYXkodmFsdWUuZ2V0KCkpKTsK