80979 2012-03-13 03:07:30 -0700 Loads from UInt32Arrays should not result in a double up-convert if it isn't necessary 2012-03-13 16:00:09 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo webkit-unassigned barraclough ggaren oliver oldest_to_newest 577203 0 fpizlo 2012-03-13 03:07:30 -0700 Patch forthcoming. 577204 1 fpizlo 2012-03-13 03:08:00 -0700 <rdar://problem/11036848> 577206 2 131580 fpizlo 2012-03-13 03:16:10 -0700 Created attachment 131580 the patch 577944 3 fpizlo 2012-03-13 16:00:09 -0700 Landed in http://trac.webkit.org/changeset/110631 131580 2012-03-13 03:16:10 -0700 2012-03-13 12:01:33 -0700 the patch nonneguint32_patch_1.diff text/plain 12000 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTEwNTUyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDEyLTAzLTEzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg TG9hZHMgZnJvbSBVSW50MzJBcnJheXMgc2hvdWxkIG5vdCByZXN1bHQgaW4gYSBkb3VibGUgdXAt Y29udmVydCBpZiBpdCBpc24ndCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgwOTc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMTAz Njg0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIEFsc28gaW1wcm92ZWQgREZHIElSIGR1bXBpbmcgdG8gaW5jbHVkZSB0eXBlIGluZm9y bWF0aW9uIGluIGEgc29tZXdoYXQgbW9yZQorICAgICAgICBpbnR1aXRpdmUgd2F5LgorCisgICAg ICAgICogYnl0ZWNvZGUvUHJlZGljdGVkVHlwZS5jcHA6CisgICAgICAgIChKU0M6OnByZWRpY3Rp b25Ub0FiYnJldmlhdGVkU3RyaW5nKToKKyAgICAgICAgKEpTQyk6CisgICAgICAgICogYnl0ZWNv ZGUvUHJlZGljdGVkVHlwZS5oOgorICAgICAgICAoSlNDKToKKyAgICAgICAgKiBkZmcvREZHQWJz dHJhY3RTdGF0ZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RTdGF0ZTo6ZXhlY3V0 ZSk6CisgICAgICAgICogZGZnL0RGR0dyYXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFw aDo6ZHVtcCk6CisgICAgICAgICogZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNw cDoKKyAgICAgICAgKEpTQzo6REZHOjpQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZTo6cHJvcGFn YXRlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlND OjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlVUludDMyVG9OdW1iZXIpOgorICAgICAgICAo SlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlR2V0QnlWYWxPbkludFR5cGVkQXJyYXkp OgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oOgorICAgICAgICAoSlNDOjpERkc6 OlNwZWN1bGF0aXZlSklUOjpmb3J3YXJkU3BlY3VsYXRpb25DaGVjayk6CisKIDIwMTItMDMtMTIg IEhvam9uZyBIYW4gIDxob2pvbmcuaGFuQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEZpeCB0ZXN0 IGNhc2VzIGZvciBSZWdFeHAgbXVsdGlsaW5lCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvUHJlZGljdGVkVHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL1ByZWRpY3RlZFR5cGUuY3BwCShyZXZpc2lvbiAxMTA1MTgpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHJlZGljdGVkVHlwZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE2Niw2ICsxNjYsNTEgQEAgY29uc3QgY2hhciogcHJlZGljdGlvblRvU3RyaW5n KFByZWRpY3RlZAogICAgIHJldHVybiBkZXNjcmlwdGlvbjsKIH0KIAorY29uc3QgY2hhciogcHJl ZGljdGlvblRvQWJicmV2aWF0ZWRTdHJpbmcoUHJlZGljdGVkVHlwZSBwcmVkaWN0aW9uKQorewor ICAgIGlmIChpc0ZpbmFsT2JqZWN0UHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgcmV0 dXJuICI8RmluYWw+IjsKKyAgICBpZiAoaXNBcnJheVByZWRpY3Rpb24ocHJlZGljdGlvbikpCisg ICAgICAgIHJldHVybiAiPEFycmF5PiI7CisgICAgaWYgKGlzU3RyaW5nUHJlZGljdGlvbihwcmVk aWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8U3RyaW5nPiI7CisgICAgaWYgKGlzRnVuY3Rpb25Q cmVkaWN0aW9uKHByZWRpY3Rpb24pKQorICAgICAgICByZXR1cm4gIjxGdW5jdGlvbj4iOworICAg IGlmIChpc0J5dGVBcnJheVByZWRpY3Rpb24ocHJlZGljdGlvbikpCisgICAgICAgIHJldHVybiAi PEJ5dGVhcnJheT4iOworICAgIGlmIChpc0ludDhBcnJheVByZWRpY3Rpb24ocHJlZGljdGlvbikp CisgICAgICAgIHJldHVybiAiPEludDhhcnJheT4iOworICAgIGlmIChpc0ludDE2QXJyYXlQcmVk aWN0aW9uKHByZWRpY3Rpb24pKQorICAgICAgICByZXR1cm4gIjxJbnQxNmFycmF5PiI7CisgICAg aWYgKGlzSW50MzJBcnJheVByZWRpY3Rpb24ocHJlZGljdGlvbikpCisgICAgICAgIHJldHVybiAi PEludDMyYXJyYXk+IjsKKyAgICBpZiAoaXNVaW50OEFycmF5UHJlZGljdGlvbihwcmVkaWN0aW9u KSkKKyAgICAgICAgcmV0dXJuICI8VWludDhhcnJheT4iOworICAgIGlmIChpc1VpbnQxNkFycmF5 UHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8VWludDE2YXJyYXk+IjsK KyAgICBpZiAoaXNVaW50MzJBcnJheVByZWRpY3Rpb24ocHJlZGljdGlvbikpCisgICAgICAgIHJl dHVybiAiPFVpbnQzMmFycmF5PiI7CisgICAgaWYgKGlzRmxvYXQzMkFycmF5UHJlZGljdGlvbihw cmVkaWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8RmxvYXQzMmFycmF5PiI7CisgICAgaWYgKGlz RmxvYXQ2NEFycmF5UHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8Rmxv YXQ2NGFycmF5PiI7CisgICAgaWYgKGlzT2JqZWN0UHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAg ICAgICAgcmV0dXJuICI8T2JqZWN0PiI7CisgICAgaWYgKGlzQ2VsbFByZWRpY3Rpb24ocHJlZGlj dGlvbikpCisgICAgICAgIHJldHVybiAiPENlbGw+IjsKKyAgICBpZiAoaXNJbnQzMlByZWRpY3Rp b24ocHJlZGljdGlvbikpCisgICAgICAgIHJldHVybiAiPEludDMyPiI7CisgICAgaWYgKGlzRG91 YmxlUHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8RG91YmxlPiI7Cisg ICAgaWYgKGlzTnVtYmVyUHJlZGljdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgcmV0dXJuICI8 TnVtYmVyPiI7CisgICAgaWYgKGlzQm9vbGVhblByZWRpY3Rpb24ocHJlZGljdGlvbikpCisgICAg ICAgIHJldHVybiAiPEJvb2xlYW4+IjsKKyAgICBpZiAoaXNPdGhlclByZWRpY3Rpb24ocHJlZGlj dGlvbikpCisgICAgICAgIHJldHVybiAiPE90aGVyPiI7CisgICAgcmV0dXJuICIiOworfQorCiBQ cmVkaWN0ZWRUeXBlIHByZWRpY3Rpb25Gcm9tQ2xhc3NJbmZvKGNvbnN0IENsYXNzSW5mbyogY2xh c3NJbmZvKQogewogICAgIGlmIChjbGFzc0luZm8gPT0gJkpTRmluYWxPYmplY3Q6OnNfaW5mbykK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9QcmVkaWN0ZWRUeXBlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1ByZWRpY3RlZFR5cGUu aAkocmV2aXNpb24gMTEwNTE4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1By ZWRpY3RlZFR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjI1LDYgKzIyNSw3IEBAIGlubGluZSBi b29sIGlzRW1wdHlQcmVkaWN0aW9uKFByZWRpY3RlZFQKIH0KIAogY29uc3QgY2hhciogcHJlZGlj dGlvblRvU3RyaW5nKFByZWRpY3RlZFR5cGUgdmFsdWUpOworY29uc3QgY2hhciogcHJlZGljdGlv blRvQWJicmV2aWF0ZWRTdHJpbmcoUHJlZGljdGVkVHlwZSB2YWx1ZSk7CiAKIC8vIE1lcmdlIHR3 byBwcmVkaWN0aW9ucy4gTm90ZSB0aGF0IGN1cnJlbnRseSB0aGlzIGp1c3QgZG9lcyBsZWZ0IHwg cmlnaHQuIEl0IG1heQogLy8gc2VlbSB0ZW1wdGluZyB0byBkbyBzbyBkaXJlY3RseSwgYnV0IHlv dSB3b3VsZCBiZSBkb2luZyBzbyBhdCB5b3VyIG93biBwZXJpbCwKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAkocmV2aXNpb24gMTEwNTE4 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTE0LDcgKzUxNCwxMCBAQCBib29sIEFic3RyYWN0U3RhdGU6OmV4ZWN1 dGUodW5zaWduZWQgaW5kCiAgICAgICAgIGlmIChtX2dyYXBoW25vZGUuY2hpbGQxKCldLnNob3Vs ZFNwZWN1bGF0ZVVpbnQzMkFycmF5KCkpIHsKICAgICAgICAgICAgIGZvck5vZGUobm9kZS5jaGls ZDEoKSkuZmlsdGVyKFByZWRpY3RVaW50MzJBcnJheSk7CiAgICAgICAgICAgICBmb3JOb2RlKG5v ZGUuY2hpbGQyKCkpLmZpbHRlcihQcmVkaWN0SW50MzIpOwotICAgICAgICAgICAgZm9yTm9kZShu b2RlSW5kZXgpLnNldChQcmVkaWN0RG91YmxlKTsKKyAgICAgICAgICAgIGlmIChub2RlLnNob3Vs ZFNwZWN1bGF0ZUludGVnZXIoKSkKKyAgICAgICAgICAgICAgICBmb3JOb2RlKG5vZGVJbmRleCku c2V0KFByZWRpY3RJbnQzMik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZm9y Tm9kZShub2RlSW5kZXgpLnNldChQcmVkaWN0RG91YmxlKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICB9CiAgICAgICAgIGlmIChtX2dyYXBoW25vZGUuY2hpbGQxKCldLnNob3VsZFNwZWN1 bGF0ZUZsb2F0MzJBcnJheSgpKSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0dyYXBoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dy YXBoLmNwcAkocmV2aXNpb24gMTEwNTE4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdHcmFwaC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NCwxNSArMTY0LDE1IEBAIHZvaWQgR3Jh cGg6OmR1bXAoTm9kZUluZGV4IG5vZGVJbmRleCkKICAgICAgICAgICAgICAgICBkYXRhTG9nKCIs ICIpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGhhc1ByaW50ZWQgPSB0cnVl OwotICAgICAgICAgICAgZGF0YUxvZygiQCV1IiwgbV92YXJBcmdDaGlsZHJlbltjaGlsZElkeF0u aW5kZXgoKSk7CisgICAgICAgICAgICBkYXRhTG9nKCJAJXUlcyIsIG1fdmFyQXJnQ2hpbGRyZW5b Y2hpbGRJZHhdLmluZGV4KCksIHByZWRpY3Rpb25Ub0FiYnJldmlhdGVkU3RyaW5nKGF0KGNoaWxk SWR4KS5wcmVkaWN0aW9uKCkpKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGlm ICghIW5vZGUuY2hpbGQxKCkpCi0gICAgICAgICAgICBkYXRhTG9nKCJAJXUiLCBub2RlLmNoaWxk MSgpLmluZGV4KCkpOworICAgICAgICAgICAgZGF0YUxvZygiQCV1JXMiLCBub2RlLmNoaWxkMSgp LmluZGV4KCksIHByZWRpY3Rpb25Ub0FiYnJldmlhdGVkU3RyaW5nKGF0KG5vZGUuY2hpbGQxKCkp LnByZWRpY3Rpb24oKSkpOwogICAgICAgICBpZiAoISFub2RlLmNoaWxkMigpKQotICAgICAgICAg ICAgZGF0YUxvZygiLCBAJXUiLCBub2RlLmNoaWxkMigpLmluZGV4KCkpOworICAgICAgICAgICAg ZGF0YUxvZygiLCBAJXUlcyIsIG5vZGUuY2hpbGQyKCkuaW5kZXgoKSwgcHJlZGljdGlvblRvQWJi cmV2aWF0ZWRTdHJpbmcoYXQobm9kZS5jaGlsZDIoKSkucHJlZGljdGlvbigpKSk7CiAgICAgICAg IGlmICghIW5vZGUuY2hpbGQzKCkpCi0gICAgICAgICAgICBkYXRhTG9nKCIsIEAldSIsIG5vZGUu Y2hpbGQzKCkuaW5kZXgoKSk7CisgICAgICAgICAgICBkYXRhTG9nKCIsIEAldSVzIiwgbm9kZS5j aGlsZDMoKS5pbmRleCgpLCBwcmVkaWN0aW9uVG9BYmJyZXZpYXRlZFN0cmluZyhhdChub2RlLmNo aWxkMygpKS5wcmVkaWN0aW9uKCkpKTsKICAgICAgICAgaGFzUHJpbnRlZCA9ICEhbm9kZS5jaGls ZDEoKTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGlj dGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwCShyZXZpc2lvbiAxMTA1 MTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlv blBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk3LDcgKzM5Nyw3IEBAIHByaXZhdGU6CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIEdldEJ5VmFsOiB7 Ci0gICAgICAgICAgICBpZiAobV9ncmFwaFtub2RlLmNoaWxkMSgpXS5zaG91bGRTcGVjdWxhdGVV aW50MzJBcnJheSgpIHx8IG1fZ3JhcGhbbm9kZS5jaGlsZDEoKV0uc2hvdWxkU3BlY3VsYXRlRmxv YXQzMkFycmF5KCkgfHwgbV9ncmFwaFtub2RlLmNoaWxkMSgpXS5zaG91bGRTcGVjdWxhdGVGbG9h dDY0QXJyYXkoKSkKKyAgICAgICAgICAgIGlmIChtX2dyYXBoW25vZGUuY2hpbGQxKCldLnNob3Vs ZFNwZWN1bGF0ZUZsb2F0MzJBcnJheSgpIHx8IG1fZ3JhcGhbbm9kZS5jaGlsZDEoKV0uc2hvdWxk U3BlY3VsYXRlRmxvYXQ2NEFycmF5KCkpCiAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJn ZVByZWRpY3Rpb24oUHJlZGljdERvdWJsZSk7CiAgICAgICAgICAgICBlbHNlIGlmIChub2RlLmdl dEhlYXBQcmVkaWN0aW9uKCkpCiAgICAgICAgICAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVByZWRp Y3Rpb24obm9kZS5nZXRIZWFwUHJlZGljdGlvbigpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxMTA1MTgpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTU0NywyMyArMTU0Nyw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGVVSW50MzJUb051bWIKICAgICAvLyBpbnN0cnVjdGlvbiB0aGF0IGZvbGxvd3MgdXMsIHJhdGhl ciB0aGFuIHRoZSBvbmUgd2UncmUgZXhlY3V0aW5nIHJpZ2h0IG5vdy4gV2UgaGF2ZQogICAgIC8v IHRvIGRvIHRoaXMgYmVjYXVzZSBieSB0aGlzIHBvaW50LCB0aGUgb3JpZ2luYWwgdmFsdWVzIG5l Y2Vzc2FyeSB0byBjb21waWxlIHdoYXRldmVyCiAgICAgLy8gb3BlcmF0aW9uIHRoZSBVSW50MzJU b051bWJlciBvcmlnaW5hdGVkIGZyb20gbWlnaHQgYmUgZGVhZC4KLSAgICBzcGVjdWxhdGlvbkNo ZWNrKE92ZXJmbG93LCBKU1ZhbHVlUmVncygpLCBOb05vZGUsIG1faml0LmJyYW5jaDMyKE1hY3Jv QXNzZW1ibGVyOjpMZXNzVGhhbiwgb3AxLmdwcigpLCBUcnVzdGVkSW1tMzIoMCkpKTsKLSAgICAg ICAgCi0gICAgLy8gVmVyaWZ5IHRoYXQgd2UgY2FuIGRvIHJvbGwgZm9yd2FyZC4KLSAgICAvLyBG SVhNRTogVGhpcyBpc24ndCByaWdodCwgc2luY2UgdGhlIG5leHQgbm9kZSBpbiB0aGUgZ3JhcGgg bWF5IG5vdCBhY3R1YWxseSBiZSB0aGUgbmV4dAotICAgIC8vIG5vZGUgaW4gdGhlIGJhc2ljIGJs b2NrJ3MgZXhlY3V0aW9uIHNlcXVlbmNlLgotICAgIEFTU0VSVChhdChtX2NvbXBpbGVJbmRleCAr IDEpLm9wKCkgPT0gU2V0TG9jYWwpOwotICAgIEFTU0VSVChhdChtX2NvbXBpbGVJbmRleCArIDEp LmNvZGVPcmlnaW4gPT0gbm9kZS5jb2RlT3JpZ2luKTsKLSAgICBBU1NFUlQoYXQobV9jb21waWxl SW5kZXggKyAyKS5jb2RlT3JpZ2luICE9IG5vZGUuY29kZU9yaWdpbik7Ci0gICAgICAgIAotICAg IC8vIE5vdyBkbyB0aGUgbWFnaWMuCi0gICAgT1NSRXhpdCYgZXhpdCA9IG1faml0LmNvZGVCbG9j aygpLT5sYXN0T1NSRXhpdCgpOwotICAgIE5vZGUmIHNldExvY2FsID0gYXQobV9jb21waWxlSW5k ZXggKyAxKTsKLSAgICBleGl0Lm1fY29kZU9yaWdpbiA9IGF0KG1fY29tcGlsZUluZGV4ICsgMiku Y29kZU9yaWdpbjsKLSAgICBleGl0Lm1fbGFzdFNldE9wZXJhbmQgPSBzZXRMb2NhbC5sb2NhbCgp OwotICAgICAgICAKLSAgICAvLyBDcmVhdGUgdGhlIHZhbHVlIHJlY292ZXJ5LCBhbmQgc3R1ZmYg aXQgaW50byB0aGUgcmlnaHQgcGxhY2UuCi0gICAgZXhpdC52YWx1ZVJlY292ZXJ5Rm9yT3BlcmFu ZChzZXRMb2NhbC5sb2NhbCgpKSA9IFZhbHVlUmVjb3Zlcnk6OnVpbnQzMkluR1BSKG9wMS5ncHIo KSk7CisgICAgZm9yd2FyZFNwZWN1bGF0aW9uQ2hlY2soT3ZlcmZsb3csIEpTVmFsdWVSZWdzKCks IE5vTm9kZSwgbV9qaXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6Okxlc3NUaGFuLCBvcDEuZ3By KCksIFRydXN0ZWRJbW0zMigwKSksIFZhbHVlUmVjb3Zlcnk6OnVpbnQzMkluR1BSKG9wMS5ncHIo KSkpOwogCiAgICAgbV9qaXQubW92ZShvcDEuZ3ByKCksIHJlc3VsdC5ncHIoKSk7CiAgICAgaW50 ZWdlclJlc3VsdChyZXN1bHQuZ3ByKCksIG1fY29tcGlsZUluZGV4LCBvcDEuZm9ybWF0KCkpOwpA QCAtMTc2MCwxNiArMTc0NCwyNCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlR2V0QnlW YWxPbkluCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KICAgICBvdXRPZkJv dW5kcy5saW5rKCZtX2ppdCk7Ci0gICAgaWYgKGVsZW1lbnRTaXplIDwgNCB8fCBzaWduZWRuZXNz ID09IFNpZ25lZFR5cGVkQXJyYXkpCisgICAgaWYgKGVsZW1lbnRTaXplIDwgNCB8fCBzaWduZWRu ZXNzID09IFNpZ25lZFR5cGVkQXJyYXkpIHsKKyAgICAgICAgaW50ZWdlclJlc3VsdChyZXN1bHRS ZWcsIG1fY29tcGlsZUluZGV4KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICAKKyAgICBB U1NFUlQoZWxlbWVudFNpemUgPT0gNCAmJiBzaWduZWRuZXNzID09IFVuc2lnbmVkVHlwZWRBcnJh eSk7CisgICAgaWYgKG5vZGUuc2hvdWxkU3BlY3VsYXRlSW50ZWdlcigpKSB7CisgICAgICAgIGZv cndhcmRTcGVjdWxhdGlvbkNoZWNrKE92ZXJmbG93LCBKU1ZhbHVlUmVncygpLCBOb05vZGUsIG1f aml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpMZXNzVGhhbiwgcmVzdWx0UmVnLCBUcnVzdGVk SW1tMzIoMCkpLCBWYWx1ZVJlY292ZXJ5Ojp1aW50MzJJbkdQUihyZXN1bHRSZWcpKTsKICAgICAg ICAgaW50ZWdlclJlc3VsdChyZXN1bHRSZWcsIG1fY29tcGlsZUluZGV4KTsKLSAgICBlbHNlIHsK LSAgICAgICAgRlBSVGVtcG9yYXJ5IGZyZXN1bHQodGhpcyk7Ci0gICAgICAgIG1faml0LmNvbnZl cnRJbnQzMlRvRG91YmxlKHJlc3VsdFJlZywgZnJlc3VsdC5mcHIoKSk7Ci0gICAgICAgIEpJVENv bXBpbGVyOjpKdW1wIHBvc2l0aXZlID0gbV9qaXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6Okdy ZWF0ZXJUaGFuT3JFcXVhbCwgcmVzdWx0UmVnLCBUcnVzdGVkSW1tMzIoMCkpOwotICAgICAgICBt X2ppdC5hZGREb3VibGUoSklUQ29tcGlsZXI6OkFic29sdXRlQWRkcmVzcygmQXNzZW1ibHlIZWxw ZXJzOjp0d29Ub1RoZTMyKSwgZnJlc3VsdC5mcHIoKSk7Ci0gICAgICAgIHBvc2l0aXZlLmxpbmso Jm1faml0KTsKLSAgICAgICAgZG91YmxlUmVzdWx0KGZyZXN1bHQuZnByKCksIG1fY29tcGlsZUlu ZGV4KTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICAKKyAgICBGUFJUZW1wb3JhcnkgZnJl c3VsdCh0aGlzKTsKKyAgICBtX2ppdC5jb252ZXJ0SW50MzJUb0RvdWJsZShyZXN1bHRSZWcsIGZy ZXN1bHQuZnByKCkpOworICAgIEpJVENvbXBpbGVyOjpKdW1wIHBvc2l0aXZlID0gbV9qaXQuYnJh bmNoMzIoTWFjcm9Bc3NlbWJsZXI6OkdyZWF0ZXJUaGFuT3JFcXVhbCwgcmVzdWx0UmVnLCBUcnVz dGVkSW1tMzIoMCkpOworICAgIG1faml0LmFkZERvdWJsZShKSVRDb21waWxlcjo6QWJzb2x1dGVB ZGRyZXNzKCZBc3NlbWJseUhlbHBlcnM6OnR3b1RvVGhlMzIpLCBmcmVzdWx0LmZwcigpKTsKKyAg ICBwb3NpdGl2ZS5saW5rKCZtX2ppdCk7CisgICAgZG91YmxlUmVzdWx0KGZyZXN1bHQuZnByKCks IG1fY29tcGlsZUluZGV4KTsKIH0KIAogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVB1dEJ5 VmFsRm9ySW50VHlwZWRBcnJheShjb25zdCBUeXBlZEFycmF5RGVzY3JpcHRvciYgZGVzY3JpcHRv ciwgR1BSUmVnIGJhc2UsIEdQUlJlZyBwcm9wZXJ0eSwgTm9kZSYgbm9kZSwgc2l6ZV90IGVsZW1l bnRTaXplLCBUeXBlZEFycmF5U3BlY3VsYXRpb25SZXF1aXJlbWVudHMgc3BlY3VsYXRpb25SZXF1 aXJlbWVudHMsIFR5cGVkQXJyYXlTaWduZWRuZXNzIHNpZ25lZG5lc3MsIFR5cGVkQXJyYXlSb3Vu ZGluZyByb3VuZGluZykKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3Vs YXRpdmVKSVQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklULmgJKHJldmlzaW9uIDExMDUxOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkod29ya2luZyBjb3B5KQpAQCAtMTgyMyw2ICsxODIz LDIyIEBAIHByaXZhdGU6CiAgICAgewogICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKGtpbmQsIGpz VmFsdWVTb3VyY2UsIG5vZGVVc2UuaW5kZXgoKSwganVtcFRvRmFpbCwgcmVjb3ZlcnkpOwogICAg IH0KKyAgICB2b2lkIGZvcndhcmRTcGVjdWxhdGlvbkNoZWNrKEV4aXRLaW5kIGtpbmQsIEpTVmFs dWVTb3VyY2UganNWYWx1ZVNvdXJjZSwgTm9kZUluZGV4IG5vZGVJbmRleCwgTWFjcm9Bc3NlbWJs ZXI6Okp1bXAganVtcFRvRmFpbCwgY29uc3QgVmFsdWVSZWNvdmVyeSYgdmFsdWVSZWNvdmVyeSkK KyAgICB7CisgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soa2luZCwganNWYWx1ZVNvdXJjZSwgbm9k ZUluZGV4LCBqdW1wVG9GYWlsKTsKKyAgICAgICAgCisgICAgICAgIE5vZGUmIHNldExvY2FsID0g YXQobV9qaXQuZ3JhcGgoKS5tX2Jsb2Nrc1ttX2Jsb2NrXS0+YXQobV9pbmRleEluQmxvY2sgKyAx KSk7CisgICAgICAgIE5vZGUmIG5leHROb2RlID0gYXQobV9qaXQuZ3JhcGgoKS5tX2Jsb2Nrc1tt X2Jsb2NrXS0+YXQobV9pbmRleEluQmxvY2sgKyAyKSk7CisgICAgICAgIEFTU0VSVChzZXRMb2Nh bC5vcCgpID09IFNldExvY2FsKTsKKyAgICAgICAgQVNTRVJUKHNldExvY2FsLmNvZGVPcmlnaW4g PT0gYXQobV9jb21waWxlSW5kZXgpLmNvZGVPcmlnaW4pOworICAgICAgICBBU1NFUlQobmV4dE5v ZGUuY29kZU9yaWdpbiAhPSBhdChtX2NvbXBpbGVJbmRleCkuY29kZU9yaWdpbik7CisgICAgICAg IAorICAgICAgICBPU1JFeGl0JiBleGl0ID0gbV9qaXQuY29kZUJsb2NrKCktPmxhc3RPU1JFeGl0 KCk7CisgICAgICAgIGV4aXQubV9jb2RlT3JpZ2luID0gbmV4dE5vZGUuY29kZU9yaWdpbjsKKyAg ICAgICAgZXhpdC5tX2xhc3RTZXRPcGVyYW5kID0gc2V0TG9jYWwubG9jYWwoKTsKKyAgICAgICAg CisgICAgICAgIGV4aXQudmFsdWVSZWNvdmVyeUZvck9wZXJhbmQoc2V0TG9jYWwubG9jYWwoKSkg PSB2YWx1ZVJlY292ZXJ5OworICAgIH0KIAogICAgIC8vIENhbGxlZCB3aGVuIHdlIHN0YXRpY2Fs bHkgZGV0ZXJtaW5lIHRoYXQgYSBzcGVjdWxhdGlvbiB3aWxsIGZhaWwuCiAgICAgdm9pZCB0ZXJt aW5hdGVTcGVjdWxhdGl2ZUV4ZWN1dGlvbihFeGl0S2luZCBraW5kLCBKU1ZhbHVlUmVncyBqc1Zh bHVlUmVncywgTm9kZUluZGV4IG5vZGVJbmRleCkK