187512 2018-07-10 03:34:35 -0700 [GLIB] Handle G_TYPE_STRV in glib API 2018-07-11 23:35:54 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply calvaris ews-watchlist keith_miller mark.lam mcatanzaro msaboff saam webkit-bug-importer oldest_to_newest 1440803 0 cgarcia 2018-07-10 03:34:35 -0700 Add jsc_value_new_array_from_strv() and handle G_TYPE_STRV types in function parameters. 1440804 1 344683 cgarcia 2018-07-10 03:37:17 -0700 Created attachment 344683 Patch 1441407 2 cgarcia 2018-07-11 22:12:10 -0700 Committed r233758: <https://trac.webkit.org/changeset/233758> 1441409 3 webkit-bug-importer 2018-07-11 22:17:53 -0700 <rdar://problem/42104153> 344683 2018-07-10 03:37:17 -0700 2018-07-11 07:13:16 -0700 Patch jsc-glib-strv.diff text/plain 12028 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NDb250ZXh0LmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NDb250ZXh0LmNwcAppbmRleCAy OTZmYmRkMGJmYi4uNTdlYTRmMzI0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvZ2xpYi9KU0NDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJ L2dsaWIvSlNDQ29udGV4dC5jcHAKQEAgLTMyNyw2ICszMjcsNDggQEAgc3RhdGljIEdSZWZQdHI8 R1B0ckFycmF5PiBqc2NDb250ZXh0SlNBcnJheVRvR0FycmF5KEpTQ0NvbnRleHQqIGNvbnRleHQs IEpTVmFsdWUKICAgICByZXR1cm4gZ0FycmF5OwogfQogCitHVW5pcXVlUHRyPGNoYXIqPiBqc2ND b250ZXh0SlNBcnJheVRvR1N0cnYoSlNDQ29udGV4dCogY29udGV4dCwgSlNWYWx1ZVJlZiBqc0Fy cmF5LCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCit7CisgICAgSlNDQ29udGV4dFByaXZhdGUqIHBy aXYgPSBjb250ZXh0LT5wcml2OworICAgIGlmIChKU1ZhbHVlSXNOdWxsKHByaXYtPmpzQ29udGV4 dC5nZXQoKSwganNBcnJheSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKCFK U1ZhbHVlSXNBcnJheShwcml2LT5qc0NvbnRleHQuZ2V0KCksIGpzQXJyYXkpKSB7CisgICAgICAg ICpleGNlcHRpb24gPSB0b1JlZihKU0M6OmNyZWF0ZVR5cGVFcnJvcih0b0pTKHByaXYtPmpzQ29u dGV4dC5nZXQoKSksIG1ha2VTdHJpbmcoImludmFsaWQganMgdHlwZSBmb3IgR1N0cnYiKSkpOwor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBhdXRvKiBqc0FycmF5T2JqZWN0 ID0gSlNWYWx1ZVRvT2JqZWN0KHByaXYtPmpzQ29udGV4dC5nZXQoKSwganNBcnJheSwgZXhjZXB0 aW9uKTsKKyAgICBpZiAoKmV4Y2VwdGlvbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAg ICBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gbGVuZ3RoU3RyaW5nKEFkb3B0LCBKU1N0cmluZ0Ny ZWF0ZVdpdGhVVEY4Q1N0cmluZygibGVuZ3RoIikpOworICAgIGF1dG8qIGpzTGVuZ3RoID0gSlNP YmplY3RHZXRQcm9wZXJ0eShwcml2LT5qc0NvbnRleHQuZ2V0KCksIGpzQXJyYXlPYmplY3QsIGxl bmd0aFN0cmluZy5nZXQoKSwgZXhjZXB0aW9uKTsKKyAgICBpZiAoKmV4Y2VwdGlvbikKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBhdXRvIGxlbmd0aCA9IEpTQzo6dG9VSW50MzIoSlNW YWx1ZVRvTnVtYmVyKHByaXYtPmpzQ29udGV4dC5nZXQoKSwganNMZW5ndGgsIGV4Y2VwdGlvbikp OworICAgIGlmICgqZXhjZXB0aW9uKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIEdV bmlxdWVQdHI8Y2hhcio+IHN0cnYoc3RhdGljX2Nhc3Q8Y2hhcioqPihnX25ldzAoY2hhciosIGxl bmd0aCArIDEpKSk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7 CisgICAgICAgIGF1dG8qIGpzSXRlbSA9IEpTT2JqZWN0R2V0UHJvcGVydHlBdEluZGV4KHByaXYt PmpzQ29udGV4dC5nZXQoKSwganNBcnJheU9iamVjdCwgaSwgZXhjZXB0aW9uKTsKKyAgICAgICAg aWYgKCpleGNlcHRpb24pCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBh dXRvIGpzVmFsdWVJdGVtID0ganNjQ29udGV4dEdldE9yQ3JlYXRlVmFsdWUoY29udGV4dCwganNJ dGVtKTsKKyAgICAgICAgaWYgKCFqc2NfdmFsdWVfaXNfc3RyaW5nKGpzVmFsdWVJdGVtLmdldCgp KSkgeworICAgICAgICAgICAgKmV4Y2VwdGlvbiA9IHRvUmVmKEpTQzo6Y3JlYXRlVHlwZUVycm9y KHRvSlMocHJpdi0+anNDb250ZXh0LmdldCgpKSwgbWFrZVN0cmluZygiaW52YWxpZCBqcyB0eXBl IGZvciBHU3RydjogaXRlbSAiLCBTdHJpbmc6Om51bWJlcihpKSwgIiBpcyBub3QgYSBzdHJpbmci KSkpOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIH0KKworICAgICAgICBz dHJ2LmdldCgpW2ldID0ganNjX3ZhbHVlX3RvX3N0cmluZyhqc1ZhbHVlSXRlbS5nZXQoKSk7Cisg ICAgfQorCisgICAgcmV0dXJuIHN0cnY7Cit9CisKIEpTVmFsdWVSZWYganNjQ29udGV4dEdWYWx1 ZVRvSlNWYWx1ZShKU0NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBHVmFsdWUqIHZhbHVlLCBKU1Zh bHVlUmVmKiBleGNlcHRpb24pCiB7CiAgICAgSlNDQ29udGV4dFByaXZhdGUqIHByaXYgPSBjb250 ZXh0LT5wcml2OwpAQCAtMzc3LDYgKzQxOSwxNSBAQCBKU1ZhbHVlUmVmIGpzY0NvbnRleHRHVmFs dWVUb0pTVmFsdWUoSlNDQ29udGV4dCogY29udGV4dCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwgSgog CiAgICAgICAgICAgICBpZiAoZ190eXBlX2lzX2EoR19WQUxVRV9UWVBFKHZhbHVlKSwgR19UWVBF X1BUUl9BUlJBWSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGpzY0NvbnRleHRHQXJyYXlUb0pT QXJyYXkoY29udGV4dCwgc3RhdGljX2Nhc3Q8R1B0ckFycmF5Kj4ocHRyKSwgZXhjZXB0aW9uKTsK KworICAgICAgICAgICAgaWYgKGdfdHlwZV9pc19hKEdfVkFMVUVfVFlQRSh2YWx1ZSksIEdfVFlQ RV9TVFJWKSkgeworICAgICAgICAgICAgICAgIGF1dG8qKiBzdHJ2ID0gc3RhdGljX2Nhc3Q8Y2hh cioqPihwdHIpOworICAgICAgICAgICAgICAgIGF1dG8gc3Rydkxlbmd0aCA9IGdfc3Rydl9sZW5n dGgoc3Rydik7CisgICAgICAgICAgICAgICAgR1JlZlB0cjxHUHRyQXJyYXk+IGdBcnJheSA9IGFk b3B0R1JlZihnX3B0cl9hcnJheV9uZXdfZnVsbChzdHJ2TGVuZ3RoLCBnX29iamVjdF91bnJlZikp OworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdHJ2TGVuZ3RoOyBp KyspCisgICAgICAgICAgICAgICAgICAgIGdfcHRyX2FycmF5X2FkZChnQXJyYXkuZ2V0KCksIGpz Y192YWx1ZV9uZXdfc3RyaW5nKGNvbnRleHQsIHN0cnZbaV0pKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm4ganNjQ29udGV4dEdBcnJheVRvSlNBcnJheShjb250ZXh0LCBnQXJyYXkuZ2V0KCksIGV4 Y2VwdGlvbik7CisgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgcmV0 dXJuIEpTVmFsdWVNYWtlTnVsbChwcml2LT5qc0NvbnRleHQuZ2V0KCkpOwogCkBAIC00NjMsNiAr NTE0LDEzIEBAIHZvaWQganNjQ29udGV4dEpTVmFsdWVUb0dWYWx1ZShKU0NDb250ZXh0KiBjb250 ZXh0LCBKU1ZhbHVlUmVmIGpzVmFsdWUsIEdUeXBlIHR5CiAgICAgICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICAgICBpZiAoZ190eXBlX2lz X2EoR19WQUxVRV9UWVBFKHZhbHVlKSwgR19UWVBFX1NUUlYpKSB7CisgICAgICAgICAgICAgICAg ICAgIGF1dG8gc3RydiA9IGpzY0NvbnRleHRKU0FycmF5VG9HU3Rydihjb250ZXh0LCBqc1ZhbHVl LCBleGNlcHRpb24pOworICAgICAgICAgICAgICAgICAgICBpZiAoISpleGNlcHRpb24pCisgICAg ICAgICAgICAgICAgICAgICAgICBnX3ZhbHVlX3Rha2VfYm94ZWQodmFsdWUsIHN0cnYucmVsZWFz ZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKwog ICAgICAgICAgICAgICAgICpleGNlcHRpb24gPSB0b1JlZihKU0M6OmNyZWF0ZVR5cGVFcnJvcih0 b0pTKHByaXYtPmpzQ29udGV4dC5nZXQoKSksICJpbnZhbGlkIHBvaW50ZXIgdHlwZSJfcykpOwog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NWYWx1ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL2dsaWIvSlNDVmFsdWUuY3BwCmluZGV4IGZiNmUxMDliOThmLi44NzQ4OTQ3ODA1 YyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pTQ1ZhbHVlLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlNDVmFsdWUuY3BwCkBAIC01 NDMsNiArNTQzLDMxIEBAIEpTQ1ZhbHVlKiBqc2NfdmFsdWVfbmV3X2FycmF5X2Zyb21fZ2FycmF5 KEpTQ0NvbnRleHQqIGNvbnRleHQsIEdQdHJBcnJheSogZ0FycmF5CiAgICAgcmV0dXJuIGpzY0Nv bnRleHRHZXRPckNyZWF0ZVZhbHVlKGNvbnRleHQsIGpzQXJyYXkpLmxlYWtSZWYoKTsKIH0KIAor LyoqCisgKiBqc2NfdmFsdWVfbmV3X2FycmF5X2Zyb21fc3RydjoKKyAqIEBjb250ZXh0OiBhICNK U0NDb250ZXh0CisgKiBAc3RydjogKGFycmF5IHplcm8tdGVybWluYXRlZD0xKSAoZWxlbWVudC10 eXBlIHV0ZjgpOiBhICVOVUxMLXRlcm1pbmF0ZWQgYXJyYXkgb2Ygc3RyaW5ncworICoKKyAqIENy ZWF0ZSBhIG5ldyAjSlNDVmFsdWUgcmVmZXJlbmNpbmcgYW4gYXJyYXkgb2Ygc3RyaW5ncyB3aXRo IHRoZSBpdGVtcyBmcm9tIEBzdHJ2LiBJZiBAYXJyYXkKKyAqIGlzICVOVUxMIG9yIGVtcHR5IGEg bmV3IGVtcHR5IGFycmF5IHdpbGwgYmUgY3JlYXRlZC4KKyAqCisgKiBSZXR1cm5zOiAodHJhbnNm ZXIgZnVsbCk6IGEgI0pTQ1ZhbHVlLgorICovCitKU0NWYWx1ZSoganNjX3ZhbHVlX25ld19hcnJh eV9mcm9tX3N0cnYoSlNDQ29udGV4dCogY29udGV4dCwgY29uc3QgY2hhciogY29uc3QqIHN0cnYp Cit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoSlNDX0lTX0NPTlRFWFQoY29udGV4dCksIG51 bGxwdHIpOworCisgICAgYXV0byBzdHJ2TGVuZ3RoID0gc3RydiA/IGdfc3Rydl9sZW5ndGgoY29u c3RfY2FzdDxjaGFyKio+KHN0cnYpKSA6IDA7CisgICAgaWYgKCFzdHJ2TGVuZ3RoKQorICAgICAg ICByZXR1cm4ganNjX3ZhbHVlX25ld19hcnJheShjb250ZXh0LCBHX1RZUEVfTk9ORSk7CisKKyAg ICBHUmVmUHRyPEdQdHJBcnJheT4gZ0FycmF5ID0gYWRvcHRHUmVmKGdfcHRyX2FycmF5X25ld19m dWxsKHN0cnZMZW5ndGgsIGdfb2JqZWN0X3VucmVmKSk7CisgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHN0cnZMZW5ndGg7IGkrKykKKyAgICAgICAgZ19wdHJfYXJyYXlfYWRkKGdBcnJheS5n ZXQoKSwganNjX3ZhbHVlX25ld19zdHJpbmcoY29udGV4dCwgc3RydltpXSkpOworCisgICAgcmV0 dXJuIGpzY192YWx1ZV9uZXdfYXJyYXlfZnJvbV9nYXJyYXkoY29udGV4dCwgZ0FycmF5LmdldCgp KTsKK30KKwogLyoqCiAgKiBqc2NfdmFsdWVfaXNfYXJyYXk6CiAgKiBAdmFsdWU6IGEgI0pTQ1Zh bHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvSlNDVmFsdWUu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xpYi9KU0NWYWx1ZS5oCmluZGV4IDI2NTUw YWI2NDQ1Li5hMTgxMDllMmFkOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9nbGliL0pTQ1ZhbHVlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL0pT Q1ZhbHVlLmgKQEAgLTEzMCw2ICsxMzAsMTAgQEAgSlNDX0FQSSBKU0NWYWx1ZSAqCiBqc2NfdmFs dWVfbmV3X2FycmF5X2Zyb21fZ2FycmF5ICAgICAgICAgICAoSlNDQ29udGV4dCAgICAgICAgICAg KmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1B0 ckFycmF5ICAgICAgICAgICAgKmFycmF5KTsKIAorSlNDX0FQSSBKU0NWYWx1ZSAqCitqc2NfdmFs dWVfbmV3X2FycmF5X2Zyb21fc3RydiAgICAgICAgICAgICAoSlNDQ29udGV4dCAgICAgICAgICAg KmNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgY2hhciAqY29uc3QgICAgKnN0cnYpOworCiBKU0NfQVBJIGdib29sZWFuCiBqc2NfdmFsdWVf aXNfYXJyYXkgICAgICAgICAgICAgICAgICAgICAgICAoSlNDVmFsdWUgICAgICAgICAgICAgKnZh bHVlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9nbGliL2RvY3Mv anNjLWdsaWItNC4wLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvZ2xp Yi9kb2NzL2pzYy1nbGliLTQuMC1zZWN0aW9ucy50eHQKaW5kZXggODc1NWI2ZTRhOGEuLjZkYmRl ZGI2YzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL2dsaWIvZG9jcy9q c2MtZ2xpYi00LjAtc2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkv Z2xpYi9kb2NzL2pzYy1nbGliLTQuMC1zZWN0aW9ucy50eHQKQEAgLTgwLDYgKzgwLDcgQEAganNj X3ZhbHVlX3RvX3N0cmluZwoganNjX3ZhbHVlX3RvX3N0cmluZ19hc19ieXRlcwoganNjX3ZhbHVl X25ld19hcnJheQoganNjX3ZhbHVlX25ld19hcnJheV9mcm9tX2dhcnJheQoranNjX3ZhbHVlX25l d19hcnJheV9mcm9tX3N0cnYKIGpzY192YWx1ZV9pc19hcnJheQoganNjX3ZhbHVlX25ld19vYmpl Y3QKIGpzY192YWx1ZV9pc19vYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDhmOWUx ZmExZDYxLi42YzllOWNkZDVkOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjAgQEAKKzIwMTgtMDctMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHTElCXSBIYW5kbGUgR19UWVBFX1NUUlYgaW4gZ2xpYiBBUEkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzUxMgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBqc2NfdmFs dWVfbmV3X2FycmF5X2Zyb21fc3RydigpIGFuZCBoYW5kbGUgR19UWVBFX1NUUlYgdHlwZXMgaW4g ZnVuY3Rpb24gcGFyYW1ldGVycy4KKworICAgICAgICAqIEFQSS9nbGliL0pTQ0NvbnRleHQuY3Bw OgorICAgICAgICAoanNjQ29udGV4dEdWYWx1ZVRvSlNWYWx1ZSk6CisgICAgICAgIChqc2NDb250 ZXh0SlNWYWx1ZVRvR1ZhbHVlKToKKyAgICAgICAgKiBBUEkvZ2xpYi9KU0NWYWx1ZS5jcHA6Cisg ICAgICAgIChqc2NfdmFsdWVfbmV3X2FycmF5X2Zyb21fc3Rydik6CisgICAgICAgICogQVBJL2ds aWIvSlNDVmFsdWUuaDoKKyAgICAgICAgKiBBUEkvZ2xpYi9kb2NzL2pzYy1nbGliLTQuMC1zZWN0 aW9ucy50eHQ6CisKIDIwMTgtMDctMDkgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCAtLXRyYWNlTExJbnRFeGVjdXRpb24gYW5kIC0tdHJhY2VMTEludFNsb3dQ YXRoIG9wdGlvbnMuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggNjM3MTBmYjQzMWYuLmUxMmQzN2RjODQ5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMDctMTAg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH TElCXSBIYW5kbGUgR19UWVBFX1NUUlYgaW4gZ2xpYiBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzUxMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGNhc2VzLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9KYXZhU2NyaXB0Q29yZS9nbGliL1Rlc3RKU0MuY3BwOgorICAg ICAgICAodGVzdEpTQ1R5cGVzKToKKyAgICAgICAgKGpvaW5GdW5jdGlvbik6CisgICAgICAgICh0 ZXN0SlNDRnVuY3Rpb24pOgorCiAyMDE4LTA3LTEwICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5p ZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRmxhdHBha10gRml4IHJ1bm5pbmcgd3B0IHRlc3Rz IGluc2lkZSBmbGF0cGFrCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL0ph dmFTY3JpcHRDb3JlL2dsaWIvVGVzdEpTQy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L0phdmFTY3JpcHRDb3JlL2dsaWIvVGVzdEpTQy5jcHAKaW5kZXggMmRiMWFmODdhMmYuLjRiOWI1 M2JjYjczIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL0phdmFTY3JpcHRD b3JlL2dsaWIvVGVzdEpTQy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9KYXZh U2NyaXB0Q29yZS9nbGliL1Rlc3RKU0MuY3BwCkBAIC00OTQsNiArNDk0LDIwIEBAIHN0YXRpYyB2 b2lkIHRlc3RKU0NUeXBlcygpCiAgICAgZ19hc3NlcnRfdHJ1ZShqc2NfdmFsdWVfaXNfbnVtYmVy KGFycmF5TGVuZ3RoLmdldCgpKSk7CiAgICAgZ19hc3NlcnRfY21waW50KGpzY192YWx1ZV90b19p bnQzMihhcnJheUxlbmd0aC5nZXQoKSksID09LCBnQXJyYXktPmxlbik7CiAKKyAgICBjb25zdCBj aGFyKiBzdHJ2W10gPSB7ICJvbmUiLCAidHdvIiwgInRocmVlIiwgbnVsbHB0ciB9OworICAgIGFy cmF5ID0gYWRvcHRHUmVmKGpzY192YWx1ZV9uZXdfYXJyYXlfZnJvbV9zdHJ2KGNvbnRleHQuZ2V0 KCksIHN0cnYpKTsKKyAgICBjaGVja2VyLndhdGNoKGFycmF5LmdldCgpKTsKKyAgICBnX2Fzc2Vy dF90cnVlKGpzY192YWx1ZV9pc19hcnJheShhcnJheS5nZXQoKSkpOworICAgIGdfYXNzZXJ0X3Ry dWUoanNjX3ZhbHVlX2lzX29iamVjdChhcnJheS5nZXQoKSkpOworICAgIGdfYXNzZXJ0X3RydWUo anNjX3ZhbHVlX3RvX2Jvb2xlYW4oYXJyYXkuZ2V0KCkpID09IFRSVUUpOworICAgIGdfYXNzZXJ0 X2NtcGludChqc2NfdmFsdWVfdG9faW50MzIoYXJyYXkuZ2V0KCkpLCA9PSwgMCk7CisgICAgdmFs dWVTdHJpbmcucmVzZXQoanNjX3ZhbHVlX3RvX3N0cmluZyhhcnJheS5nZXQoKSkpOworICAgIGdf YXNzZXJ0X2NtcHN0cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0sICJvbmUsdHdvLHRocmVlIik7Cisg ICAgYXJyYXlMZW5ndGggPSBhZG9wdEdSZWYoanNjX3ZhbHVlX29iamVjdF9nZXRfcHJvcGVydHko YXJyYXkuZ2V0KCksICJsZW5ndGgiKSk7CisgICAgY2hlY2tlci53YXRjaChhcnJheUxlbmd0aC5n ZXQoKSk7CisgICAgZ19hc3NlcnRfdHJ1ZShqc2NfdmFsdWVfaXNfbnVtYmVyKGFycmF5TGVuZ3Ro LmdldCgpKSk7CisgICAgZ19hc3NlcnRfY21waW50KGpzY192YWx1ZV90b19pbnQzMihhcnJheUxl bmd0aC5nZXQoKSksID09LCAzKTsKKwogICAgIHZhbHVlID0gYWRvcHRHUmVmKGpzY192YWx1ZV9u ZXdfb2JqZWN0KGNvbnRleHQuZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKICAgICBjaGVja2Vy LndhdGNoKHZhbHVlLmdldCgpKTsKICAgICBnX2Fzc2VydF90cnVlKGpzY192YWx1ZV9pc19vYmpl Y3QodmFsdWUuZ2V0KCkpKTsKQEAgLTU2Miw2ICs1NzYsMTEgQEAgc3RhdGljIGludCBzdW1GdW5j dGlvbihHUHRyQXJyYXkqIGFycmF5KQogICAgIHJldHVybiByZXR2YWw7CiB9CiAKK3N0YXRpYyBj aGFyKiBqb2luRnVuY3Rpb24oY29uc3QgY2hhciogY29uc3QqIHN0cnYsIGNvbnN0IGNoYXIqIHNl cCkKK3sKKyAgICByZXR1cm4gZ19zdHJqb2ludihzZXAsIGNvbnN0X2Nhc3Q8Y2hhcioqPihzdHJ2 KSk7Cit9CisKIHN0YXRpYyB2b2lkIHRlc3RKU0NGdW5jdGlvbigpCiB7CiAgICAgewpAQCAtNzQ0 LDYgKzc2Myw0OCBAQCBzdGF0aWMgdm9pZCB0ZXN0SlNDRnVuY3Rpb24oKQogICAgICAgICBnX2Fz c2VydF90cnVlKGpzY192YWx1ZV9pc19udW1iZXIodmFsdWUuZ2V0KCkpKTsKICAgICAgICAgZ19h c3NlcnRfY21waW50KGpzY192YWx1ZV90b19pbnQzMih2YWx1ZS5nZXQoKSksID09LCA5KTsKICAg ICB9CisKKyAgICB7CisgICAgICAgIExlYWtDaGVja2VyIGNoZWNrZXI7CisgICAgICAgIEdSZWZQ dHI8SlNDQ29udGV4dD4gY29udGV4dCA9IGFkb3B0R1JlZihqc2NfY29udGV4dF9uZXcoKSk7Cisg ICAgICAgIGNoZWNrZXIud2F0Y2goY29udGV4dC5nZXQoKSk7CisgICAgICAgIEV4Y2VwdGlvbkhh bmRsZXIgZXhjZXB0aW9uSGFuZGxlcihjb250ZXh0LmdldCgpKTsKKworICAgICAgICBHUmVmUHRy PEpTQ1ZhbHVlPiBmdW5jdGlvbiA9IGFkb3B0R1JlZihqc2NfY29udGV4dF9ldmFsdWF0ZShjb250 ZXh0LmdldCgpLAorICAgICAgICAgICAgImpvaW5GdW5jdGlvbiA9IGZ1bmN0aW9uKGFycmF5LCBz ZXApIHtcbiIKKyAgICAgICAgICAgICIgICAgdmFyIHJlc3VsdCA9ICcnO1xuIgorICAgICAgICAg ICAgIiAgICBmb3IgKHZhciBpIGluIGFycmF5KSB7XG4iCisgICAgICAgICAgICAiICAgICAgICBy ZXN1bHQgKz0gYXJyYXlbaV07XG4iCisgICAgICAgICAgICAiICAgICAgICBpZiAoaSAhPSBhcnJh eS5sZW5ndGggLSAxKSB7IHJlc3VsdCArPSBzZXA7IH1cbiIKKyAgICAgICAgICAgICIgICAgfVxu IgorICAgICAgICAgICAgIiAgICByZXR1cm4gcmVzdWx0O1xuIgorICAgICAgICAgICAgIn0iLCAt MSkpOworICAgICAgICBjaGVja2VyLndhdGNoKGZ1bmN0aW9uLmdldCgpKTsKKyAgICAgICAgZ19h c3NlcnRfdHJ1ZShqc2NfdmFsdWVfaXNfb2JqZWN0KGZ1bmN0aW9uLmdldCgpKSk7CisKKyAgICAg ICAgY29uc3QgY2hhciogc3RydltdID0geyAib25lIiwgInR3byIsICJ0aHJlZSIsIG51bGxwdHIg fTsKKyAgICAgICAgR1JlZlB0cjxKU0NWYWx1ZT4gdmFsdWUgPSBhZG9wdEdSZWYoanNjX3ZhbHVl X2Z1bmN0aW9uX2NhbGwoZnVuY3Rpb24uZ2V0KCksIEdfVFlQRV9TVFJWLCBzdHJ2LCBHX1RZUEVf U1RSSU5HLCAiICIsIEdfVFlQRV9OT05FKSk7CisgICAgICAgIGNoZWNrZXIud2F0Y2godmFsdWUu Z2V0KCkpOworICAgICAgICBnX2Fzc2VydF90cnVlKGpzY192YWx1ZV9pc19zdHJpbmcodmFsdWUu Z2V0KCkpKTsKKyAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiB2YWx1ZVN0cmluZyhqc2NfdmFsdWVf dG9fc3RyaW5nKHZhbHVlLmdldCgpKSk7CisgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih2YWx1ZVN0 cmluZy5nZXQoKSwgPT0sICJvbmUgdHdvIHRocmVlIik7CisKKyAgICAgICAgZnVuY3Rpb24gPSBh ZG9wdEdSZWYoanNjX3ZhbHVlX25ld19mdW5jdGlvbihjb250ZXh0LmdldCgpLCAiam9pbkZ1bmN0 aW9uMiIsIEdfQ0FMTEJBQ0soam9pbkZ1bmN0aW9uKSwgbnVsbHB0ciwgbnVsbHB0ciwgR19UWVBF X1NUUklORywgMiwgR19UWVBFX1NUUlYsIEdfVFlQRV9TVFJJTkcpKTsKKyAgICAgICAgY2hlY2tl ci53YXRjaChmdW5jdGlvbi5nZXQoKSk7CisgICAgICAgIGpzY19jb250ZXh0X3NldF92YWx1ZShj b250ZXh0LmdldCgpLCAiam9pbkZ1bmN0aW9uMiIsIGZ1bmN0aW9uLmdldCgpKTsKKyAgICAgICAg dmFsdWUgPSBhZG9wdEdSZWYoanNjX2NvbnRleHRfZXZhbHVhdGUoY29udGV4dC5nZXQoKSwgImpv aW5GdW5jdGlvbjIoWydvbmUnLCd0d28nLCd0aHJlZSddLCAnICcpIiwgLTEpKTsKKyAgICAgICAg Y2hlY2tlci53YXRjaCh2YWx1ZS5nZXQoKSk7CisgICAgICAgIGdfYXNzZXJ0X3RydWUoanNjX3Zh bHVlX2lzX3N0cmluZyh2YWx1ZS5nZXQoKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IHZh bHVlU3RyaW5nMihqc2NfdmFsdWVfdG9fc3RyaW5nKHZhbHVlLmdldCgpKSk7CisgICAgICAgIGdf YXNzZXJ0X2NtcHN0cih2YWx1ZVN0cmluZzIuZ2V0KCksID09LCB2YWx1ZVN0cmluZy5nZXQoKSk7 CisKKyAgICAgICAgYm9vbCBkaWRUaHJvdyA9IGZhbHNlOworICAgICAgICBnX2Fzc2VydF90aHJv d19iZWdpbihleGNlcHRpb25IYW5kbGVyLCBkaWRUaHJvdyk7CisgICAgICAgIHZhbHVlID0gYWRv cHRHUmVmKGpzY19jb250ZXh0X2V2YWx1YXRlKGNvbnRleHQuZ2V0KCksICJqb2luRnVuY3Rpb24y KFsnb25lJywyLCd0aHJlZSddLCAnICcpIiwgLTEpKTsKKyAgICAgICAgY2hlY2tlci53YXRjaCh2 YWx1ZS5nZXQoKSk7CisgICAgICAgIGdfYXNzZXJ0X3RydWUoanNjX3ZhbHVlX2lzX3VuZGVmaW5l ZCh2YWx1ZS5nZXQoKSkpOworICAgICAgICBnX2Fzc2VydF9kaWRfdGhyb3coZXhjZXB0aW9uSGFu ZGxlciwgZGlkVGhyb3cpOworICAgIH0KIH0KIAogc3RhdGljIHZvaWQgdGVzdEpTQ09iamVjdCgp Cg==