36025 2010-03-11 11:59:27 -0800 accessibilityIsIgnoredBase() needs to respect when platform says include 2010-03-12 06:33:16 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin dglazkov gustavo jdiggs webkit.review.bot oldest_to_newest 198722 0 cfleizach 2010-03-11 11:59:27 -0800 accessibilityIsIgnoredBase() is not doing this, so when an object is always included by a platform, its not working 198744 1 cfleizach 2010-03-11 12:33:54 -0800 accessibilityIsIgnoredBased() needs to return a ternary value 198751 2 50532 cfleizach 2010-03-11 12:56:04 -0800 Created attachment 50532 Patch 198753 3 webkit.review.bot 2010-03-11 13:01:31 -0800 Attachment 50532 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/618023 198756 4 50533 cfleizach 2010-03-11 13:05:33 -0800 Created attachment 50533 Patch 198764 5 50533 bdakin 2010-03-11 14:02:50 -0800 Comment on attachment 50533 Patch > -#if PLATFORM(GTK) > - return true; > -#endif Are you sure you want to remove this? r=me 198770 6 cfleizach 2010-03-11 14:18:26 -0800 (In reply to comment #5) > (From update of attachment 50533 [details]) > > -#if PLATFORM(GTK) > > - return true; > > -#endif > > Are you sure you want to remove this? > Yea, i looked at what was going on. GTK wants the platform to decide the fate of that object. Now that that object calls accessibilityIsIgnoredBase(), that's now taken care of > r=me 198779 7 cfleizach 2010-03-11 14:33:41 -0800 http://trac.webkit.org/changeset/55855 199008 8 gustavo 2010-03-12 06:33:16 -0800 Thanks for the quick fix! Much appreciated =). 50532 2010-03-11 12:56:04 -0800 2010-03-11 13:05:30 -0800 Patch bug-36025-20100311125603.patch text/plain 13682 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTg1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDIgQEAKKzIwMTAtMDMtMTEgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpIG5lZWRzIHRvIHJlc3BlY3Qgd2hlbiBwbGF0 Zm9ybSBzYXlzIGluY2x1ZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM2MDI1CisKKyAgICAgICAgQ2hhbmdlZCBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVk QmFzZSgpIHRvIHJldHVybiBhIHBvbGljeSBpbnN0ZWFkIG9mIGEgeWVzL25vCisgICAgICAgIGFu c3dlci4gVGhpcyBhbGxvd3MgdGhlIHBsYXRmb3JtIHRvIG1ha2UgYSB5ZXMgZGVjaXNpb24gb24g YW4gZWxlbWVudC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3Q6OmFjY2Vzc2liaWxpdHlJ c0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3RCb3g6OmFjY2Vzc2liaWxp dHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oOgorICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlJZ25vcmVBdHRhY2htZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNz aWJpbGl0eUlzSWdub3JlZEJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlTbGlkZXI6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlUYWJsZTo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlUYWJsZUNlbGw6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlUm93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlUYWJsZVJvdzo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRl c09iamVjdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVj dE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2li aWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L3F0 L0FjY2Vzc2liaWxpdHlPYmplY3RRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls aXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CisgICAgICAg ICogYWNjZXNzaWJpbGl0eS93aW4vQWNjZXNzaWJpbGl0eU9iamVjdFdpbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNs dWRlc09iamVjdCk6CisKIDIwMTAtMDMtMTEgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBDaHJvbWl1bSBtYWMgYnVpbGQgZml4LgpJbmRl eDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3QuY3BwCShyZXZpc2lv biA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlzdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU1LDcgKzU1LDEwIEBAIFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0 eUxpc3Q+IEFjY2Vzc2liaWwKIAogYm9vbCBBY2Nlc3NpYmlsaXR5TGlzdDo6YWNjZXNzaWJpbGl0 eUlzSWdub3JlZCgpIGNvbnN0CiB7Ci0gICAgaWYgKGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNl KCkpCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBkZWNpc2lvbiA9IGFjY2Vzc2li aWxpdHlJc0lnbm9yZWRCYXNlKCk7CisgICAgaWYgKGRlY2lzaW9uID09IEluY2x1ZGVPYmplY3Qp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSWdub3JlT2JqZWN0 KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICAvLyBsaXN0cyBkb24ndCBhcHBlYXIg b24gdGlnZXIvbGVvcGFyZCBvbiB0aGUgbWFjCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5TGlzdEJveC5jcHAJKHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTU0LDcgKzE1NCwxMCBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5TGlz dEJvCiAgICAgCiBib29sIEFjY2Vzc2liaWxpdHlMaXN0Qm94OjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKIHsKLSAgICBpZiAoYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSkKKyAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eUlz SWdub3JlZEJhc2UoKTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCiAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIAogICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gNTU4NDgpCisr KyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCSh3b3JraW5nIGNv cHkpCkBAIC0yMDMsNyArMjAzLDcgQEAgZW51bSBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24gewog ICAgIEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbkhvcml6b250YWwsCiB9OwogICAgIAotZW51bSBB Y2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24geworZW51bSBBY2Nlc3NpYmlsaXR5 T2JqZWN0SW5jbHVzaW9uIHsKICAgICBJbmNsdWRlT2JqZWN0LAogICAgIElnbm9yZU9iamVjdCwK ICAgICBEZWZhdWx0QmVoYXZpb3IsCkBAIC01MzQsMTggKzUzNCwxNCBAQCBwdWJsaWM6CiAjZW5k aWYKICNlbmRpZgogCi0gICAgLy8gYSBwbGF0Zm9ybS1zcGVjaWZpYyBtZXRob2QgZm9yIGRldGVy bWluaW5nIGlmIGFuIGF0dGFjaG1lbnQgaXMgaWdub3JlZAogI2lmIEhBVkUoQUNDRVNTSUJJTElU WSkKKyAgICAvLyBhIHBsYXRmb3JtLXNwZWNpZmljIG1ldGhvZCBmb3IgZGV0ZXJtaW5pbmcgaWYg YW4gYXR0YWNobWVudCBpcyBpZ25vcmVkCiAgICAgYm9vbCBhY2Nlc3NpYmlsaXR5SWdub3JlQXR0 YWNobWVudCgpIGNvbnN0OwotI2Vsc2UKLSAgICBib29sIGFjY2Vzc2liaWxpdHlJZ25vcmVBdHRh Y2htZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotI2VuZGlmCi0KICAgICAvLyBnaXZlcyBw bGF0Zm9ybXMgdGhlIG9wcG9ydHVuaXR5IHRvIGluZGljYXRlIGlmIGFuZCBob3cgYW4gb2JqZWN0 IHNob3VsZCBiZSBpbmNsdWRlZAotI2lmIEhBVkUoQUNDRVNTSUJJTElUWSkKLSAgICBBY2Nlc3Np YmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24gYWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVk ZXNPYmplY3QoKSBjb25zdDsKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGFjY2Vz c2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KCkgY29uc3Q7CiAjZWxzZQotICAgIEFjY2Vz c2liaWxpdHlPYmplY3RQbGF0Zm9ybUluY2x1c2lvbiBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNs dWRlc09iamVjdCgpIGNvbnN0IHsgcmV0dXJuIERlZmF1bHRCZWhhdmlvcjsgfQorICAgIGJvb2wg YWNjZXNzaWJpbGl0eUlnbm9yZUF0dGFjaG1lbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9Cisg ICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNs dWRlc09iamVjdCgpIGNvbnN0IHsgcmV0dXJuIERlZmF1bHRCZWhhdmlvcjsgfQogI2VuZGlmCiAK ICAgICAvLyBhbGxvd3MgZm9yIGFuIEFjY2Vzc2liaWxpdHlPYmplY3QgdG8gdXBkYXRlIGl0cyBy ZW5kZXIgdHJlZSBvciBwZXJmb3JtCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA1NTg0OCkKKysrIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTQ0NywyOSArMTQ0NywzMCBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmlzQWxsb3dlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAgICAgCi1ib29sIEFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNlKCkgY29uc3QKK0Fj Y2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNj ZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSBjb25zdAogewogICAgIC8vIFRoZSBmb2xsb3dpbmcg Y2FzZXMgY2FuIGFwcGx5IHRvIGFueSBlbGVtZW50IHRoYXQncyBhIHN1YmNsYXNzIG9mIEFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuCiAgICAgCi0gICAgLy8gSXMgdGhlIHBsYXRmb3JtIGludGVy ZXN0ZWQgaW4gdGhpcyBvYmplY3Q/Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdFBsYXRmb3JtSW5j bHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKTsK LSAgICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCi0gICAgICAgIHJldHVybiB0cnVl OwotICAgIC8vIHRoZSBkZWNpc2lvbiBtdXN0LCB0aGVyZWZvcmUsIGJlIERlZmF1bHRCZWhhdmlv ci4KLQotICAgIC8vIGlnbm9yZSBpbnZpc2libGUgZWxlbWVudAorICAgIC8vIElnbm9yZSBpbnZp c2libGUgZWxlbWVudHMuCiAgICAgaWYgKCFtX3JlbmRlcmVyIHx8IG1fcmVuZGVyZXItPnN0eWxl KCktPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxFKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgcmV0dXJuIElnbm9yZU9iamVjdDsKIAorICAgIC8vIEFueXRoaW5nIG1hcmtlZCBhcyBhcmlh LWhpZGRlbiBvciBhIGNoaWxkIG9mIHNvbWV0aGluZyBhcmlhLWhpZGRlbiBtdXN0IGJlIGhpZGRl bi4KICAgICBpZiAoYXJpYUlzSGlkZGVuKCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICByZXR1cm4gSWdub3JlT2JqZWN0OwogICAgIAorICAgIC8vIEFueXRoaW5nIHRoYXQgaXMgYSBw cmVzZW50YXRpb25hbCByb2xlIG11c3QgYmUgaGlkZGVuLgogICAgIGlmIChpc1ByZXNlbnRhdGlv bmFsQ2hpbGRPZkFyaWFSb2xlKCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIAotICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKKworICAgIC8vIEFsbG93 IHRoZSBwbGF0Zm9ybSB0byBtYWtlIGEgZGVjaXNpb24uCisgICAgQWNjZXNzaWJpbGl0eU9iamVj dEluY2x1c2lvbiBkZWNpc2lvbiA9IGFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0 KCk7CisgICAgaWYgKGRlY2lzaW9uID09IEluY2x1ZGVPYmplY3QpCisgICAgICAgIHJldHVybiBJ bmNsdWRlT2JqZWN0OworICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCisgICAgICAg IHJldHVybiBJZ25vcmVPYmplY3Q7CisgICAgICAgIAorICAgIHJldHVybiBEZWZhdWx0QmVoYXZp b3I7CiB9ICAKICAKIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0 eUlzSWdub3JlZCgpIGNvbnN0CkBAIC0xNDc3LDcgKzE0NzgsMTAgQEAgYm9vbCBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYgogICAgIC8vIENoZWNrIGZpcnN0IGlmIGFueSBvZiB0 aGUgY29tbW9uIHJlYXNvbnMgY2F1c2UgdGhpcyBlbGVtZW50IHRvIGJlIGlnbm9yZWQuCiAgICAg Ly8gVGhlbiBwcm9jZXNzIG90aGVyIHVzZSBjYXNlcyB0aGF0IG5lZWQgdG8gYmUgYXBwbGllZCB0 byBhbGwgdGhlIHZhcmlvdXMgcm9sZXMKICAgICAvLyB0aGF0IEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3RzIHRha2Ugb24uCi0gICAgaWYgKGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNlKCkpCisg ICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBkZWNpc2lvbiA9IGFjY2Vzc2liaWxpdHlJ c0lnbm9yZWRCYXNlKCk7CisgICAgaWYgKGRlY2lzaW9uID09IEluY2x1ZGVPYmplY3QpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSWdub3JlT2JqZWN0KQogICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICAvLyBJZiB0aGlzIGVsZW1lbnQgaXMgd2l0aGlu IGEgcGFyZW50IHRoYXQgY2Fubm90IGhhdmUgY2hpbGRyZW4sIGl0IHNob3VsZCBub3QgYmUgZXhw b3NlZC4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuaAkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNyArMTE1 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYXNJbnRWYWx1ZSgpIGNvbnN0OwogICAg IAogICAgIC8vIFByb3ZpZGVzIGNvbW1vbiBsb2dpYyB1c2VkIGJ5IGFsbCBlbGVtZW50cyB3aGVu IGRldGVybWluaW5nIGlzSWdub3JlZC4KLSAgICBib29sIGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRC YXNlKCkgY29uc3Q7CisgICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBhY2Nlc3NpYmls aXR5SXNJZ25vcmVkQmFzZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBhY2Nlc3NpYmlsaXR5 SXNJZ25vcmVkKCkgY29uc3Q7CiAgICAgCiAgICAgdmlydHVhbCBpbnQgaGVhZGluZ0xldmVsKCkg Y29uc3Q7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlk ZXIuY3BwCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5U2xpZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDkgKzEwMSwxMiBAQCBjb25z dCBBdG9taWNTdHJpbmcmIEFjY2Vzc2liaWxpdHlTbGlkZXI6CiAKIGJvb2wgQWNjZXNzaWJpbGl0 eVNsaWRlcjo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0CiB7Ci0gICAgaWYgKGFjY2Vz c2liaWxpdHlJc0lnbm9yZWRCYXNlKCkpCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lv biBkZWNpc2lvbiA9IGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNlKCk7CisgICAgaWYgKGRlY2lz aW9uID09IEluY2x1ZGVPYmplY3QpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZGVj aXNpb24gPT0gSWdub3JlT2JqZWN0KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLQorICAgIAogICAg IHJldHVybiBmYWxzZTsKIH0KICAgICAKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5VGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5VGFibGUuY3BwCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NDUsOSAr NDQ1LDEyIEBAIEFjY2Vzc2liaWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlUYWJsZTo6cm8KICAgICAK IGJvb2wgQWNjZXNzaWJpbGl0eVRhYmxlOjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QK IHsKLSAgICBpZiAoYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSkKKyAgICBBY2Nlc3NpYmls aXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2Uo KTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCiAgICAgICAgIHJldHVybiB0 cnVlOwotCisgICAgCiAgICAgaWYgKCFpc0RhdGFUYWJsZSgpKQogICAgICAgICByZXR1cm4gQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpOwogICAgICAg ICAKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxl Q2VsbC5jcHAJKHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlUYWJsZUNlbGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw5ICs1NiwxMiBAQCBQ YXNzUmVmUHRyPEFjY2Vzc2liaWxpdHlUYWJsZUNlbGw+IEFjY2VzCiAKIGJvb2wgQWNjZXNzaWJp bGl0eVRhYmxlQ2VsbDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0CiB7Ci0gICAgaWYg KGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNlKCkpCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdElu Y2x1c2lvbiBkZWNpc2lvbiA9IGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNlKCk7CisgICAgaWYg KGRlY2lzaW9uID09IEluY2x1ZGVPYmplY3QpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBp ZiAoZGVjaXNpb24gPT0gSWdub3JlT2JqZWN0KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLQorICAg IAogICAgIGlmICghaXNUYWJsZUNlbGwoKSkKICAgICAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKTsKICAgICAKSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVSb3cuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVSb3cuY3BwCShyZXZpc2lv biA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVSb3cu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NiwxMSArNzYsMTAgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5 VGFibGVSb3c6OmlzVGFibGVSb3coKQogICAgIAogYm9vbCBBY2Nlc3NpYmlsaXR5VGFibGVSb3c6 OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdAogeyAgICAKLSNpZiBQTEFURk9STShHVEsp Ci0gICAgcmV0dXJuIHRydWU7Ci0jZW5kaWYKLQotICAgIGlmIChhY2Nlc3NpYmlsaXR5SXNJZ25v cmVkQmFzZSgpKQorICAgIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gZGVjaXNpb24gPSBh Y2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpOworICAgIGlmIChkZWNpc2lvbiA9PSBJbmNsdWRl T2JqZWN0KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGRlY2lzaW9uID09IElnbm9y ZU9iamVjdCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCiAgICAgaWYgKCFpc1RhYmxlUm93 KCkpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RB dGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJp bGl0eU9iamVjdEF0ay5jcHAJKHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIs NyArMzIsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlJCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24g QWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3Qo KSBjb25zdAorQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CiB7CiAgICAgQWNj ZXNzaWJpbGl0eU9iamVjdCogcGFyZW50ID0gcGFyZW50T2JqZWN0KCk7CiAgICAgaWYgKCFwYXJl bnQpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RN YWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmls aXR5T2JqZWN0TWFjLm1tCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDEsNyAr NDEsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlJCiAgICAgcmV0 dXJuIFthdHRhY2htZW50IGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRdOwogfQogCi1BY2Nlc3NpYmls aXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJp bGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdAorQWNjZXNzaWJpbGl0eU9iamVjdElu Y2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRl c09iamVjdCgpIGNvbnN0CiB7CiAgICAgaWYgKGlzTWVudUxpc3RQb3B1cCgpIHx8IGlzTWVudUxp c3RPcHRpb24oKSkKICAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKSW5kZXg6IFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9xdC9BY2Nlc3NpYmlsaXR5T2JqZWN0UXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9xdC9BY2Nlc3NpYmlsaXR5T2JqZWN0UXQuY3BwCShyZXZp c2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9xdC9BY2Nlc3NpYmlsaXR5T2Jq ZWN0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGJvb2wgQWNjZXNzaWJp bGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eUkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUFjY2Vz c2liaWxpdHlPYmplY3RQbGF0Zm9ybUluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nl c3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CitBY2Nlc3NpYmlsaXR5T2Jq ZWN0SW5jbHVzaW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUlu Y2x1ZGVzT2JqZWN0KCkgY29uc3QKIHsKICAgICBpZiAoaXNNZW51TGlzdFBvcHVwKCkgfHwgaXNN ZW51TGlzdE9wdGlvbigpKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OwpJbmRleDogV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L3dpbi9BY2Nlc3NpYmlsaXR5T2JqZWN0V2luLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FjY2Vzc2liaWxpdHlPYmplY3RXaW4u Y3BwCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQWNjZXNz aWJpbGl0eU9iamVjdFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgYm9v bCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5SQogICAgIHJldHVybiBmYWxzZTsK IH0KIAotQWNjZXNzaWJpbGl0eU9iamVjdFBsYXRmb3JtSW5jbHVzaW9uIEFjY2Vzc2liaWxpdHlP YmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KCkgY29uc3QKK0FjY2Vz c2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0 eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdAogewogICAgIGlmIChpc01lbnVMaXN0UG9w dXAoKSB8fCBpc01lbnVMaXN0T3B0aW9uKCkpCiAgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0 Owo= 50533 2010-03-11 13:05:33 -0800 2010-03-11 14:02:50 -0800 Patch bug-36025-20100311130532.patch text/plain 15260 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTg1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDYgQEAKKzIwMTAtMDMtMTEgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpIG5lZWRzIHRvIHJlc3BlY3Qgd2hlbiBwbGF0 Zm9ybSBzYXlzIGluY2x1ZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM2MDI1CisKKyAgICAgICAgQ2hhbmdlZCBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVk QmFzZSgpIHRvIHJldHVybiBhIHBvbGljeSBpbnN0ZWFkIG9mIGEgeWVzL25vCisgICAgICAgIGFu c3dlci4gVGhpcyBhbGxvd3MgdGhlIHBsYXRmb3JtIHRvIG1ha2UgYSB5ZXMgZGVjaXNpb24gb24g YW4gZWxlbWVudC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3Q6OmFjY2Vzc2liaWxpdHlJ c0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUxpc3RCb3g6OmFjY2Vzc2liaWxp dHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oOgorICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlJZ25vcmVBdHRhY2htZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNz aWJpbGl0eUlzSWdub3JlZEJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlTbGlkZXI6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlUYWJsZTo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlUYWJsZUNlbGw6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlUm93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlUYWJsZVJvdzo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCk6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRm b3JtSW5jbHVkZXNPYmplY3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2li aWxpdHlPYmplY3RBdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVj dDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RNYWMubW06CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVj dCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9xdC9BY2Nlc3NpYmlsaXR5T2JqZWN0UXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBs YXRmb3JtSW5jbHVkZXNPYmplY3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvd2luL0FjY2Vz c2liaWxpdHlPYmplY3RXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9i amVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QpOgorICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvd3gvQWNjZXNzaWJpbGl0eU9iamVjdFd4LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KToKKwogMjAxMC0wMy0xMSAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIENocm9taXVtIG1hYyBidWlsZCBmaXguCkluZGV4OiBXZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlzdC5jcHAJKHJldmlzaW9uIDU1ODQ4 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTUsNyArNTUsMTAgQEAgUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5TGlzdD4g QWNjZXNzaWJpbAogCiBib29sIEFjY2Vzc2liaWxpdHlMaXN0OjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKIHsKLSAgICBpZiAoYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSkKKyAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eUlz SWdub3JlZEJhc2UoKTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCiAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIAogICAgIC8vIGxpc3RzIGRvbid0IGFwcGVhciBvbiB0aWdl ci9sZW9wYXJkIG9uIHRoZSBtYWMKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5TGlzdEJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlMaXN0Qm94LmNwcAkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTQs NyArMTU0LDEwIEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlMaXN0Qm8KICAg ICAKIGJvb2wgQWNjZXNzaWJpbGl0eUxpc3RCb3g6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBj b25zdAogewotICAgIGlmIChhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpKQorICAgIEFjY2Vz c2liaWxpdHlPYmplY3RJbmNsdXNpb24gZGVjaXNpb24gPSBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVk QmFzZSgpOworICAgIGlmIChkZWNpc2lvbiA9PSBJbmNsdWRlT2JqZWN0KQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgaWYgKGRlY2lzaW9uID09IElnbm9yZU9iamVjdCkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgCiAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDogV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTIwMyw3ICsyMDMsNyBAQCBlbnVtIEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbiB7CiAgICAgQWNj ZXNzaWJpbGl0eU9yaWVudGF0aW9uSG9yaXpvbnRhbCwKIH07CiAgICAgCi1lbnVtIEFjY2Vzc2li aWxpdHlPYmplY3RQbGF0Zm9ybUluY2x1c2lvbiB7CitlbnVtIEFjY2Vzc2liaWxpdHlPYmplY3RJ bmNsdXNpb24gewogICAgIEluY2x1ZGVPYmplY3QsCiAgICAgSWdub3JlT2JqZWN0LAogICAgIERl ZmF1bHRCZWhhdmlvciwKQEAgLTUzNCwxOCArNTM0LDE0IEBAIHB1YmxpYzoKICNlbmRpZgogI2Vu ZGlmCiAKLSAgICAvLyBhIHBsYXRmb3JtLXNwZWNpZmljIG1ldGhvZCBmb3IgZGV0ZXJtaW5pbmcg aWYgYW4gYXR0YWNobWVudCBpcyBpZ25vcmVkCiAjaWYgSEFWRShBQ0NFU1NJQklMSVRZKQorICAg IC8vIGEgcGxhdGZvcm0tc3BlY2lmaWMgbWV0aG9kIGZvciBkZXRlcm1pbmluZyBpZiBhbiBhdHRh Y2htZW50IGlzIGlnbm9yZWQKICAgICBib29sIGFjY2Vzc2liaWxpdHlJZ25vcmVBdHRhY2htZW50 KCkgY29uc3Q7Ci0jZWxzZQotICAgIGJvb2wgYWNjZXNzaWJpbGl0eUlnbm9yZUF0dGFjaG1lbnQo KSBjb25zdCB7IHJldHVybiB0cnVlOyB9Ci0jZW5kaWYKLQogICAgIC8vIGdpdmVzIHBsYXRmb3Jt cyB0aGUgb3Bwb3J0dW5pdHkgdG8gaW5kaWNhdGUgaWYgYW5kIGhvdyBhbiBvYmplY3Qgc2hvdWxk IGJlIGluY2x1ZGVkCi0jaWYgSEFWRShBQ0NFU1NJQklMSVRZKQotICAgIEFjY2Vzc2liaWxpdHlP YmplY3RQbGF0Zm9ybUluY2x1c2lvbiBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVj dCgpIGNvbnN0OworICAgIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gYWNjZXNzaWJpbGl0 eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdDsKICNlbHNlCi0gICAgQWNjZXNzaWJpbGl0 eU9iamVjdFBsYXRmb3JtSW5jbHVzaW9uIGFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KCkgY29uc3QgeyByZXR1cm4gRGVmYXVsdEJlaGF2aW9yOyB9CisgICAgYm9vbCBhY2Nlc3Np YmlsaXR5SWdub3JlQXR0YWNobWVudCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAgICBBY2Nl c3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KCkgY29uc3QgeyByZXR1cm4gRGVmYXVsdEJlaGF2aW9yOyB9CiAjZW5kaWYKIAogICAgIC8v IGFsbG93cyBmb3IgYW4gQWNjZXNzaWJpbGl0eU9iamVjdCB0byB1cGRhdGUgaXRzIHJlbmRlciB0 cmVlIG9yIHBlcmZvcm0KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNDQ3LDI5ICsxNDQ3LDMwIEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 aXNBbGxvd2UKICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKLWJvb2wgQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSBjb25zdAorQWNjZXNzaWJp bGl0eU9iamVjdEluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYmls aXR5SXNJZ25vcmVkQmFzZSgpIGNvbnN0CiB7CiAgICAgLy8gVGhlIGZvbGxvd2luZyBjYXNlcyBj YW4gYXBwbHkgdG8gYW55IGVsZW1lbnQgdGhhdCdzIGEgc3ViY2xhc3Mgb2YgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC4KICAgICAKLSAgICAvLyBJcyB0aGUgcGxhdGZvcm0gaW50ZXJlc3RlZCBp biB0aGlzIG9iamVjdD8KLSAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24g ZGVjaXNpb24gPSBhY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpOwotICAgIGlm IChkZWNpc2lvbiA9PSBJbmNsdWRlT2JqZWN0KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg aWYgKGRlY2lzaW9uID09IElnbm9yZU9iamVjdCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg Ly8gdGhlIGRlY2lzaW9uIG11c3QsIHRoZXJlZm9yZSwgYmUgRGVmYXVsdEJlaGF2aW9yLgotCi0g ICAgLy8gaWdub3JlIGludmlzaWJsZSBlbGVtZW50CisgICAgLy8gSWdub3JlIGludmlzaWJsZSBl bGVtZW50cy4KICAgICBpZiAoIW1fcmVuZGVyZXIgfHwgbV9yZW5kZXJlci0+c3R5bGUoKS0+dmlz aWJpbGl0eSgpICE9IFZJU0lCTEUpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1 cm4gSWdub3JlT2JqZWN0OwogCisgICAgLy8gQW55dGhpbmcgbWFya2VkIGFzIGFyaWEtaGlkZGVu IG9yIGEgY2hpbGQgb2Ygc29tZXRoaW5nIGFyaWEtaGlkZGVuIG11c3QgYmUgaGlkZGVuLgogICAg IGlmIChhcmlhSXNIaWRkZW4oKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVy biBJZ25vcmVPYmplY3Q7CiAgICAgCisgICAgLy8gQW55dGhpbmcgdGhhdCBpcyBhIHByZXNlbnRh dGlvbmFsIHJvbGUgbXVzdCBiZSBoaWRkZW4uCiAgICAgaWYgKGlzUHJlc2VudGF0aW9uYWxDaGls ZE9mQXJpYVJvbGUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgCi0gICAgcmV0dXJuIGZh bHNlOworICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OworCisgICAgLy8gQWxsb3cgdGhlIHBs YXRmb3JtIHRvIG1ha2UgYSBkZWNpc2lvbi4KKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVz aW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKTsKKyAg ICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAgICAgcmV0dXJuIEluY2x1ZGVP YmplY3Q7CisgICAgaWYgKGRlY2lzaW9uID09IElnbm9yZU9iamVjdCkKKyAgICAgICAgcmV0dXJu IElnbm9yZU9iamVjdDsKKyAgICAgICAgCisgICAgcmV0dXJuIERlZmF1bHRCZWhhdmlvcjsKIH0g IAogIAogYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKQEAgLTE0NzcsNyArMTQ3OCwxMCBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmFjY2Vzc2liCiAgICAgLy8gQ2hlY2sgZmlyc3QgaWYgYW55IG9mIHRoZSBjb21t b24gcmVhc29ucyBjYXVzZSB0aGlzIGVsZW1lbnQgdG8gYmUgaWdub3JlZC4KICAgICAvLyBUaGVu IHByb2Nlc3Mgb3RoZXIgdXNlIGNhc2VzIHRoYXQgbmVlZCB0byBiZSBhcHBsaWVkIHRvIGFsbCB0 aGUgdmFyaW91cyByb2xlcwogICAgIC8vIHRoYXQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdHMg dGFrZSBvbi4KLSAgICBpZiAoYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSkKKyAgICBBY2Nl c3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eUlzSWdub3Jl ZEJhc2UoKTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIGlmIChkZWNpc2lvbiA9PSBJZ25vcmVPYmplY3QpCiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIAogICAgIC8vIElmIHRoaXMgZWxlbWVudCBpcyB3aXRoaW4gYSBwYXJl bnQgdGhhdCBjYW5ub3QgaGF2ZSBjaGlsZHJlbiwgaXQgc2hvdWxkIG5vdCBiZSBleHBvc2VkLgpJ bmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdC5oCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTExNSw3ICsxMTUsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBib29sIGhhc0ludFZhbHVlKCkgY29uc3Q7CiAgICAgCiAgICAg Ly8gUHJvdmlkZXMgY29tbW9uIGxvZ2ljIHVzZWQgYnkgYWxsIGVsZW1lbnRzIHdoZW4gZGV0ZXJt aW5pbmcgaXNJZ25vcmVkLgotICAgIGJvb2wgYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKSBj b25zdDsKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGFjY2Vzc2liaWxpdHlJc0ln bm9yZWRCYXNlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGFjY2Vzc2liaWxpdHlJc0lnbm9y ZWQoKSBjb25zdDsKICAgICAKICAgICB2aXJ0dWFsIGludCBoZWFkaW5nTGV2ZWwoKSBjb25zdDsK SW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5jcHAJ KHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlT bGlkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDEsOSArMTAxLDEyIEBAIGNvbnN0IEF0b21p Y1N0cmluZyYgQWNjZXNzaWJpbGl0eVNsaWRlcjoKIAogYm9vbCBBY2Nlc3NpYmlsaXR5U2xpZGVy OjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QKIHsKLSAgICBpZiAoYWNjZXNzaWJpbGl0 eUlzSWdub3JlZEJhc2UoKSkKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lz aW9uID0gYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKTsKKyAgICBpZiAoZGVjaXNpb24gPT0g SW5jbHVkZU9iamVjdCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChkZWNpc2lvbiA9 PSBJZ25vcmVPYmplY3QpCiAgICAgICAgIHJldHVybiB0cnVlOwotCisgICAgCiAgICAgcmV0dXJu IGZhbHNlOwogfQogICAgIApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlUYWJsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlUYWJsZS5jcHAJKHJldmlzaW9uIDU1ODQ4KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0NSw5ICs0NDUsMTIg QEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVRhYmxlOjpybwogICAgIAogYm9vbCBB Y2Nlc3NpYmlsaXR5VGFibGU6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdAogewotICAg IGlmIChhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpKQorICAgIEFjY2Vzc2liaWxpdHlPYmpl Y3RJbmNsdXNpb24gZGVjaXNpb24gPSBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQmFzZSgpOworICAg IGlmIChkZWNpc2lvbiA9PSBJbmNsdWRlT2JqZWN0KQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgaWYgKGRlY2lzaW9uID09IElnbm9yZU9iamVjdCkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0K KyAgICAKICAgICBpZiAoIWlzRGF0YVRhYmxlKCkpCiAgICAgICAgIHJldHVybiBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCk7CiAgICAgICAgIApJbmRl eDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNw cAkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVRhYmxlQ2VsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU2LDkgKzU2LDEyIEBAIFBhc3NSZWZQ dHI8QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbD4gQWNjZXMKIAogYm9vbCBBY2Nlc3NpYmlsaXR5VGFi bGVDZWxsOjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QKIHsKLSAgICBpZiAoYWNjZXNz aWJpbGl0eUlzSWdub3JlZEJhc2UoKSkKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9u IGRlY2lzaW9uID0gYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJhc2UoKTsKKyAgICBpZiAoZGVjaXNp b24gPT0gSW5jbHVkZU9iamVjdCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChkZWNp c2lvbiA9PSBJZ25vcmVPYmplY3QpCiAgICAgICAgIHJldHVybiB0cnVlOwotCisgICAgCiAgICAg aWYgKCFpc1RhYmxlQ2VsbCgpKQogICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpOwogICAgIApJbmRleDogV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZVJvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZVJvdy5jcHAJKHJldmlzaW9uIDU1ODQ4 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZVJvdy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc2LDExICs3NiwxMCBAQCBib29sIEFjY2Vzc2liaWxpdHlUYWJsZVJv dzo6aXNUYWJsZVJvdygpCiAgICAgCiBib29sIEFjY2Vzc2liaWxpdHlUYWJsZVJvdzo6YWNjZXNz aWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0CiB7ICAgIAotI2lmIFBMQVRGT1JNKEdUSykKLSAgICBy ZXR1cm4gdHJ1ZTsKLSNlbmRpZgotCi0gICAgaWYgKGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRCYXNl KCkpCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBkZWNpc2lvbiA9IGFjY2Vzc2li aWxpdHlJc0lnbm9yZWRCYXNlKCk7CisgICAgaWYgKGRlY2lzaW9uID09IEluY2x1ZGVPYmplY3Qp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZGVjaXNpb24gPT0gSWdub3JlT2JqZWN0 KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICBpZiAoIWlzVGFibGVSb3coKSkKSW5k ZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hy b21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9B Y2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3BwCShyZXZpc2lvbiA1NTg0OCkKKysrIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BY2Nlc3NpYmlsaXR5T2JqZWN0Q2hyb21pdW0uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3ICszNCw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVj dDo6YWNjZXNzaWJpbGl0eUkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUFjY2Vzc2liaWxpdHlP YmplY3RQbGF0Zm9ybUluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5 UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CitBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVz aW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KCkgY29uc3QKIHsKICAgICBpZiAoaXNNZW51TGlzdFBvcHVwKCkgfHwgaXNNZW51TGlzdE9w dGlvbigpKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OwpJbmRleDogV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCShyZXZp c2lvbiA1NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9i amVjdEF0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDcgKzMyLDcgQEAgYm9vbCBBY2Nlc3Np YmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5SQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotQWNj ZXNzaWJpbGl0eU9iamVjdFBsYXRmb3JtSW5jbHVzaW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KCkgY29uc3QKK0FjY2Vzc2liaWxpdHlP YmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3Jt SW5jbHVkZXNPYmplY3QoKSBjb25zdAogewogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVu dCA9IHBhcmVudE9iamVjdCgpOwogICAgIGlmICghcGFyZW50KQpJbmRleDogV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0TWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdE1hYy5tbQkocmV2aXNp b24gNTU4NDgpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmpl Y3RNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAgYm9vbCBBY2Nlc3NpYmls aXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5SQogICAgIHJldHVybiBbYXR0YWNobWVudCBhY2Nlc3Np YmlsaXR5SXNJZ25vcmVkXTsKIH0KIAotQWNjZXNzaWJpbGl0eU9iamVjdFBsYXRmb3JtSW5jbHVz aW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2Jq ZWN0KCkgY29uc3QKK0FjY2Vzc2liaWxpdHlPYmplY3RJbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9i amVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKSBjb25zdAogewogICAg IGlmIChpc01lbnVMaXN0UG9wdXAoKSB8fCBpc01lbnVMaXN0T3B0aW9uKCkpCiAgICAgICAgIHJl dHVybiBJZ25vcmVPYmplY3Q7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvcXQvQWNjZXNz aWJpbGl0eU9iamVjdFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv cXQvQWNjZXNzaWJpbGl0eU9iamVjdFF0LmNwcAkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJDb3Jl L2FjY2Vzc2liaWxpdHkvcXQvQWNjZXNzaWJpbGl0eU9iamVjdFF0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjksNyArMjksNyBAQCBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxp dHlJCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1J bmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVk ZXNPYmplY3QoKSBjb25zdAorQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBBY2Nlc3NpYmls aXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CiB7 CiAgICAgaWYgKGlzTWVudUxpc3RQb3B1cCgpIHx8IGlzTWVudUxpc3RPcHRpb24oKSkKICAgICAg ICAgcmV0dXJuIElnbm9yZU9iamVjdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4v QWNjZXNzaWJpbGl0eU9iamVjdFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L3dpbi9BY2Nlc3NpYmlsaXR5T2JqZWN0V2luLmNwcAkocmV2aXNpb24gNTU4NDgpCisr KyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FjY2Vzc2liaWxpdHlPYmplY3RXaW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6 YWNjZXNzaWJpbGl0eUkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUFjY2Vzc2liaWxpdHlPYmpl Y3RQbGF0Zm9ybUluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxh dGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CitBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9u IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0 KCkgY29uc3QKIHsKICAgICBpZiAoaXNNZW51TGlzdFBvcHVwKCkgfHwgaXNNZW51TGlzdE9wdGlv bigpKQogICAgICAgICByZXR1cm4gSW5jbHVkZU9iamVjdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNz aWJpbGl0eS93eC9BY2Nlc3NpYmlsaXR5T2JqZWN0V3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS93eC9BY2Nlc3NpYmlsaXR5T2JqZWN0V3guY3BwCShyZXZpc2lvbiA1 NTg0OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS93eC9BY2Nlc3NpYmlsaXR5T2JqZWN0V3gu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9i amVjdDo6YWNjZXNzaWJpbGl0eUkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLUFjY2Vzc2liaWxp dHlPYmplY3RQbGF0Zm9ybUluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmls aXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCgpIGNvbnN0CitBY2Nlc3NpYmlsaXR5T2JqZWN0SW5j bHVzaW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVz T2JqZWN0KCkgY29uc3QKIHsKICAgICBpZiAoaXNNZW51TGlzdFBvcHVwKCkgfHwgaXNNZW51TGlz dE9wdGlvbigpKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0Owo=