136963 2014-09-19 15:20:10 -0700 StorageAccessData should be referenced in a sensible way 2014-09-20 11:25:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 136330 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenb mmirman msaboff nrotem oliver sam oldest_to_newest 1036219 0 fpizlo 2014-09-19 15:20:10 -0700 ... 1036220 1 238392 fpizlo 2014-09-19 15:20:43 -0700 Created attachment 238392 work in progress 1036224 2 238392 msaboff 2014-09-19 15:24:44 -0700 Comment on attachment 238392 work in progress r=me, rs=me for the remaining and run 32 & 64 bit tests. 1036256 3 fpizlo 2014-09-19 17:41:21 -0700 (In reply to comment #2) > (From update of attachment 238392 [details]) > r=me, rs=me for the remaining and run 32 & 64 bit tests. Thanks, and yes, I'll do that! 1036308 4 fpizlo 2014-09-20 11:25:53 -0700 Landed in http://trac.webkit.org/changeset/173793 238392 2014-09-19 15:20:43 -0700 2014-09-19 15:24:44 -0700 work in progress blah.patch text/plain 11577 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklu bGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3Ry YWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHJldmlzaW9uIDE3Mzc3NCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkod29ya2luZyBj b3B5KQpAQCAtMTYwNiw3ICsxNjA2LDcgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFic3Ry YWN0U3RhdGVUeQogICAgIH0KICAgICAgICAgCiAgICAgY2FzZSBHZXRCeU9mZnNldDogewotICAg ICAgICBTdG9yYWdlQWNjZXNzRGF0YSBkYXRhID0gbV9ncmFwaC5tX3N0b3JhZ2VBY2Nlc3NEYXRh W25vZGUtPnN0b3JhZ2VBY2Nlc3NEYXRhSW5kZXgoKV07CisgICAgICAgIFN0b3JhZ2VBY2Nlc3NE YXRhJiBkYXRhID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKTsKICAgICAgICAgSlNWYWx1ZSBy ZXN1bHQgPSBtX2dyYXBoLnRyeUdldENvbnN0YW50UHJvcGVydHkoZm9yTm9kZShub2RlLT5jaGls ZDIoKSksIGRhdGEub2Zmc2V0KTsKICAgICAgICAgaWYgKHJlc3VsdCkgewogICAgICAgICAgICAg c2V0Q29uc3RhbnQobm9kZSwgKm1fZ3JhcGguZnJlZXplKHJlc3VsdCkpOwpAQCAtMTYxOCw3ICsx NjE4LDcgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeQogICAgIH0K ICAgICAgICAgCiAgICAgY2FzZSBHZXRHZXR0ZXJTZXR0ZXJCeU9mZnNldDogewotICAgICAgICBT dG9yYWdlQWNjZXNzRGF0YSBkYXRhID0gbV9ncmFwaC5tX3N0b3JhZ2VBY2Nlc3NEYXRhW25vZGUt PnN0b3JhZ2VBY2Nlc3NEYXRhSW5kZXgoKV07CisgICAgICAgIFN0b3JhZ2VBY2Nlc3NEYXRhJiBk YXRhID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKTsKICAgICAgICAgSlNWYWx1ZSByZXN1bHQg PSBtX2dyYXBoLnRyeUdldENvbnN0YW50UHJvcGVydHkoZm9yTm9kZShub2RlLT5jaGlsZDIoKSks IGRhdGEub2Zmc2V0KTsKICAgICAgICAgaWYgKHJlc3VsdCAmJiBqc0R5bmFtaWNDYXN0PEdldHRl clNldHRlcio+KHJlc3VsdCkpIHsKICAgICAgICAgICAgIHNldENvbnN0YW50KG5vZGUsICptX2dy YXBoLmZyZWV6ZShyZXN1bHQpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxNzM3NzQpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTk4NCwxMiArMTk4NCwxMiBAQCBOb2RlKiBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlR2V0QnlPZmZz ZXQoCiAgICAgICAgIHByb3BlcnR5U3RvcmFnZSA9IGJhc2U7CiAgICAgZWxzZQogICAgICAgICBw cm9wZXJ0eVN0b3JhZ2UgPSBhZGRUb0dyYXBoKEdldEJ1dHRlcmZseSwgYmFzZSk7Ci0gICAgTm9k ZSogZ2V0QnlPZmZzZXQgPSBhZGRUb0dyYXBoKG9wLCBPcEluZm8obV9ncmFwaC5tX3N0b3JhZ2VB Y2Nlc3NEYXRhLnNpemUoKSksIE9wSW5mbyhwcmVkaWN0aW9uKSwgcHJvcGVydHlTdG9yYWdlLCBi YXNlKTsKLQotICAgIFN0b3JhZ2VBY2Nlc3NEYXRhIHN0b3JhZ2VBY2Nlc3NEYXRhOwotICAgIHN0 b3JhZ2VBY2Nlc3NEYXRhLm9mZnNldCA9IG9mZnNldDsKLSAgICBzdG9yYWdlQWNjZXNzRGF0YS5p ZGVudGlmaWVyTnVtYmVyID0gaWRlbnRpZmllck51bWJlcjsKLSAgICBtX2dyYXBoLm1fc3RvcmFn ZUFjY2Vzc0RhdGEuYXBwZW5kKHN0b3JhZ2VBY2Nlc3NEYXRhKTsKKyAgICAKKyAgICBTdG9yYWdl QWNjZXNzRGF0YSogZGF0YSA9IG1fZ3JhcGgubV9zdG9yYWdlQWNjZXNzRGF0YS5hZGQoKTsKKyAg ICBkYXRhLT5vZmZzZXQgPSBvZmZzZXQ7CisgICAgZGF0YS0+aWRlbnRpZmllck51bWJlciA9IGlk ZW50aWZpZXJOdW1iZXI7CisgICAgCisgICAgTm9kZSogZ2V0QnlPZmZzZXQgPSBhZGRUb0dyYXBo KG9wLCBPcEluZm8oZGF0YSksIE9wSW5mbyhwcmVkaWN0aW9uKSwgcHJvcGVydHlTdG9yYWdlLCBi YXNlKTsKIAogICAgIHJldHVybiBnZXRCeU9mZnNldDsKIH0KQEAgLTIwMDEsMTMgKzIwMDEsMTMg QEAgTm9kZSogQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZVB1dEJ5T2Zmc2V0KAogICAgICAgICBwcm9w ZXJ0eVN0b3JhZ2UgPSBiYXNlOwogICAgIGVsc2UKICAgICAgICAgcHJvcGVydHlTdG9yYWdlID0g YWRkVG9HcmFwaChHZXRCdXR0ZXJmbHksIGJhc2UpOwotICAgIE5vZGUqIHJlc3VsdCA9IGFkZFRv R3JhcGgoUHV0QnlPZmZzZXQsIE9wSW5mbyhtX2dyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGEuc2l6 ZSgpKSwgcHJvcGVydHlTdG9yYWdlLCBiYXNlLCB2YWx1ZSk7CiAgICAgCi0gICAgU3RvcmFnZUFj Y2Vzc0RhdGEgc3RvcmFnZUFjY2Vzc0RhdGE7Ci0gICAgc3RvcmFnZUFjY2Vzc0RhdGEub2Zmc2V0 ID0gb2Zmc2V0OwotICAgIHN0b3JhZ2VBY2Nlc3NEYXRhLmlkZW50aWZpZXJOdW1iZXIgPSBpZGVu dGlmaWVyOwotICAgIG1fZ3JhcGgubV9zdG9yYWdlQWNjZXNzRGF0YS5hcHBlbmQoc3RvcmFnZUFj Y2Vzc0RhdGEpOwotCisgICAgU3RvcmFnZUFjY2Vzc0RhdGEqIGRhdGEgPSBtX2dyYXBoLm1fc3Rv cmFnZUFjY2Vzc0RhdGEuYWRkKCk7CisgICAgZGF0YS0+b2Zmc2V0ID0gb2Zmc2V0OworICAgIGRh dGEtPmlkZW50aWZpZXJOdW1iZXIgPSBpZGVudGlmaWVyOworICAgIAorICAgIE5vZGUqIHJlc3Vs dCA9IGFkZFRvR3JhcGgoUHV0QnlPZmZzZXQsIE9wSW5mbyhkYXRhKSwgcHJvcGVydHlTdG9yYWdl LCBiYXNlLCB2YWx1ZSk7CisgICAgCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtMjIxNSwx OCArMjIxNSwxNyBAQCB2b2lkIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVQdXRCeUlkKAogCiAgICAg ICAgIGFkZFRvR3JhcGgoUHV0U3RydWN0dXJlLCBPcEluZm8odHJhbnNpdGlvbiksIGJhc2UpOwog CisgICAgICAgIFN0b3JhZ2VBY2Nlc3NEYXRhKiBkYXRhID0gbV9ncmFwaC5tX3N0b3JhZ2VBY2Nl c3NEYXRhLmFkZCgpOworICAgICAgICBkYXRhLT5vZmZzZXQgPSB2YXJpYW50Lm9mZnNldCgpOwor ICAgICAgICBkYXRhLT5pZGVudGlmaWVyTnVtYmVyID0gaWRlbnRpZmllck51bWJlcjsKKyAgICAg ICAgCiAgICAgICAgIGFkZFRvR3JhcGgoCiAgICAgICAgICAgICBQdXRCeU9mZnNldCwKLSAgICAg ICAgICAgIE9wSW5mbyhtX2dyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGEuc2l6ZSgpKSwKKyAgICAg ICAgICAgIE9wSW5mbyhkYXRhKSwKICAgICAgICAgICAgIHByb3BlcnR5U3RvcmFnZSwKICAgICAg ICAgICAgIGJhc2UsCiAgICAgICAgICAgICB2YWx1ZSk7CiAKLSAgICAgICAgU3RvcmFnZUFjY2Vz c0RhdGEgc3RvcmFnZUFjY2Vzc0RhdGE7Ci0gICAgICAgIHN0b3JhZ2VBY2Nlc3NEYXRhLm9mZnNl dCA9IHZhcmlhbnQub2Zmc2V0KCk7Ci0gICAgICAgIHN0b3JhZ2VBY2Nlc3NEYXRhLmlkZW50aWZp ZXJOdW1iZXIgPSBpZGVudGlmaWVyTnVtYmVyOwotICAgICAgICBtX2dyYXBoLm1fc3RvcmFnZUFj Y2Vzc0RhdGEuYXBwZW5kKHN0b3JhZ2VBY2Nlc3NEYXRhKTsKLQogICAgICAgICBpZiAobV9ncmFw aC5jb21waWxhdGlvbigpKQogICAgICAgICAgICAgbV9ncmFwaC5jb21waWxhdGlvbigpLT5ub3Rp Y2VJbmxpbmVkUHV0QnlJZCgpOwogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUuaAkocmV2aXNpb24gMTczNzc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDbG9iYmVyaXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3 Myw4ICs2NzMsNyBAQCB2b2lkIGNsb2JiZXJpemUoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlCiAg ICAgICAgIAogICAgIGNhc2UgR2V0QnlPZmZzZXQ6CiAgICAgY2FzZSBHZXRHZXR0ZXJTZXR0ZXJC eU9mZnNldDogewotICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVyID0KLSAgICAgICAg ICAgIGdyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGFbbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGFJbmRl eCgpXS5pZGVudGlmaWVyTnVtYmVyOworICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVy ID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKS5pZGVudGlmaWVyTnVtYmVyOwogICAgICAgICBB YnN0cmFjdEhlYXAgaGVhcChOYW1lZFByb3BlcnRpZXMsIGlkZW50aWZpZXJOdW1iZXIpOwogICAg ICAgICByZWFkKGhlYXApOwogICAgICAgICBkZWYoSGVhcExvY2F0aW9uKE5hbWVkUHJvcGVydHlM b2MsIGhlYXAsIG5vZGUtPmNoaWxkMigpKSwgbm9kZSk7CkBAIC03MDQsOCArNzAzLDcgQEAgdm9p ZCBjbG9iYmVyaXplKEdyYXBoJiBncmFwaCwgTm9kZSogbm9kZQogICAgIH0KICAgICAgICAgCiAg ICAgY2FzZSBQdXRCeU9mZnNldDogewotICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVy ID0KLSAgICAgICAgICAgIGdyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGFbbm9kZS0+c3RvcmFnZUFj Y2Vzc0RhdGFJbmRleCgpXS5pZGVudGlmaWVyTnVtYmVyOworICAgICAgICB1bnNpZ25lZCBpZGVu dGlmaWVyTnVtYmVyID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKS5pZGVudGlmaWVyTnVtYmVy OwogICAgICAgICBBYnN0cmFjdEhlYXAgaGVhcChOYW1lZFByb3BlcnRpZXMsIGlkZW50aWZpZXJO dW1iZXIpOwogICAgICAgICB3cml0ZShoZWFwKTsKICAgICAgICAgZGVmKEhlYXBMb2NhdGlvbihO YW1lZFByb3BlcnR5TG9jLCBoZWFwLCBub2RlLT5jaGlsZDIoKSksIG5vZGUtPmNoaWxkMygpLm5v ZGUoKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGlu Z1BoYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nv bnN0YW50Rm9sZGluZ1BoYXNlLmNwcAkocmV2aXNpb24gMTczNzc0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdDb25zdGFudEZvbGRpbmdQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ4NiwxMiArNDg2LDExIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaW5kZXhJbkJs b2NrLCBTcGVjTm9uZSwgR2V0QnV0dGVyZmx5LCBvcmlnaW4sIGNoaWxkRWRnZSkpOwogICAgICAg ICB9CiAgICAgICAgIAotICAgICAgICBub2RlLT5jb252ZXJ0VG9HZXRCeU9mZnNldChtX2dyYXBo Lm1fc3RvcmFnZUFjY2Vzc0RhdGEuc2l6ZSgpLCBwcm9wZXJ0eVN0b3JhZ2UpOworICAgICAgICBT dG9yYWdlQWNjZXNzRGF0YSYgZGF0YSA9ICptX2dyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGEuYWRk KCk7CisgICAgICAgIGRhdGEub2Zmc2V0ID0gdmFyaWFudC5vZmZzZXQoKTsKKyAgICAgICAgZGF0 YS5pZGVudGlmaWVyTnVtYmVyID0gaWRlbnRpZmllck51bWJlcjsKICAgICAgICAgCi0gICAgICAg IFN0b3JhZ2VBY2Nlc3NEYXRhIHN0b3JhZ2VBY2Nlc3NEYXRhOwotICAgICAgICBzdG9yYWdlQWNj ZXNzRGF0YS5vZmZzZXQgPSB2YXJpYW50Lm9mZnNldCgpOwotICAgICAgICBzdG9yYWdlQWNjZXNz RGF0YS5pZGVudGlmaWVyTnVtYmVyID0gaWRlbnRpZmllck51bWJlcjsKLSAgICAgICAgbV9ncmFw aC5tX3N0b3JhZ2VBY2Nlc3NEYXRhLmFwcGVuZChzdG9yYWdlQWNjZXNzRGF0YSk7CisgICAgICAg IG5vZGUtPmNvbnZlcnRUb0dldEJ5T2Zmc2V0KGRhdGEsIHByb3BlcnR5U3RvcmFnZSk7CiAgICAg fQogCiAgICAgdm9pZCBlbWl0UHV0QnlPZmZzZXQodW5zaWduZWQgaW5kZXhJbkJsb2NrLCBOb2Rl KiBub2RlLCBjb25zdCBBYnN0cmFjdFZhbHVlJiBiYXNlVmFsdWUsIGNvbnN0IFB1dEJ5SWRWYXJp YW50JiB2YXJpYW50LCB1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVyKQpAQCAtNTQ0LDE1ICs1NDMs MTQgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIG1faW5zZXJ0aW9uU2V0Lmluc2VydChpbmRleElu QmxvY2ssIHB1dFN0cnVjdHVyZSk7CiAgICAgICAgIH0KIAotICAgICAgICBub2RlLT5jb252ZXJ0 VG9QdXRCeU9mZnNldChtX2dyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGEuc2l6ZSgpLCBwcm9wZXJ0 eVN0b3JhZ2UpOworICAgICAgICBTdG9yYWdlQWNjZXNzRGF0YSYgZGF0YSA9ICptX2dyYXBoLm1f c3RvcmFnZUFjY2Vzc0RhdGEuYWRkKCk7CisgICAgICAgIGRhdGEub2Zmc2V0ID0gdmFyaWFudC5v ZmZzZXQoKTsKKyAgICAgICAgZGF0YS5pZGVudGlmaWVyTnVtYmVyID0gaWRlbnRpZmllck51bWJl cjsKKyAgICAgICAgCisgICAgICAgIG5vZGUtPmNvbnZlcnRUb1B1dEJ5T2Zmc2V0KGRhdGEsIHBy b3BlcnR5U3RvcmFnZSk7CiAgICAgICAgIG1faW5zZXJ0aW9uU2V0Lmluc2VydE5vZGUoCiAgICAg ICAgICAgICBpbmRleEluQmxvY2ssIFNwZWNOb25lLCBTdG9yZUJhcnJpZXIsIG9yaWdpbiwgCiAg ICAgICAgICAgICBFZGdlKG5vZGUtPmNoaWxkMigpLm5vZGUoKSwgS25vd25DZWxsVXNlKSk7Ci0K LSAgICAgICAgU3RvcmFnZUFjY2Vzc0RhdGEgc3RvcmFnZUFjY2Vzc0RhdGE7Ci0gICAgICAgIHN0 b3JhZ2VBY2Nlc3NEYXRhLm9mZnNldCA9IHZhcmlhbnQub2Zmc2V0KCk7Ci0gICAgICAgIHN0b3Jh Z2VBY2Nlc3NEYXRhLmlkZW50aWZpZXJOdW1iZXIgPSBpZGVudGlmaWVyTnVtYmVyOwotICAgICAg ICBtX2dyYXBoLm1fc3RvcmFnZUFjY2Vzc0RhdGEuYXBwZW5kKHN0b3JhZ2VBY2Nlc3NEYXRhKTsK ICAgICB9CiAgICAgCiAgICAgdm9pZCBhZGRCYXNlQ2hlY2soCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0dyYXBoLmNwcAkocmV2aXNpb24gMTczNzc0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MCw3ICsyNTAs NyBAQCB2b2lkIEdyYXBoOjpkdW1wKFByaW50U3RyZWFtJiBvdXQsIGNvbnN0CiAgICAgICAgIG91 dC5wcmludChjb21tYSwgRnVuY3Rpb25FeGVjdXRhYmxlRHVtcChleGVjdXRhYmxlKSk7CiAgICAg fQogICAgIGlmIChub2RlLT5oYXNTdG9yYWdlQWNjZXNzRGF0YSgpKSB7Ci0gICAgICAgIFN0b3Jh Z2VBY2Nlc3NEYXRhJiBzdG9yYWdlQWNjZXNzRGF0YSA9IG1fc3RvcmFnZUFjY2Vzc0RhdGFbbm9k ZS0+c3RvcmFnZUFjY2Vzc0RhdGFJbmRleCgpXTsKKyAgICAgICAgU3RvcmFnZUFjY2Vzc0RhdGEm IHN0b3JhZ2VBY2Nlc3NEYXRhID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKTsKICAgICAgICAg b3V0LnByaW50KGNvbW1hLCAiaWQiLCBzdG9yYWdlQWNjZXNzRGF0YS5pZGVudGlmaWVyTnVtYmVy LCAieyIsIGlkZW50aWZpZXJzKClbc3RvcmFnZUFjY2Vzc0RhdGEuaWRlbnRpZmllck51bWJlcl0s ICJ9Iik7CiAgICAgICAgIG91dC5wcmludCgiLCAiLCBzdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KHN0 b3JhZ2VBY2Nlc3NEYXRhLm9mZnNldCkpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHR3JhcGguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0dyYXBoLmgJKHJldmlzaW9uIDE3Mzc3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHR3JhcGguaAkod29ya2luZyBjb3B5KQpAQCAtNTUsMTEgKzU1LDYgQEAgY2xhc3Mg RXhlY1N0YXRlOwogCiBuYW1lc3BhY2UgREZHIHsKIAotc3RydWN0IFN0b3JhZ2VBY2Nlc3NEYXRh IHsKLSAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQ7Ci0gICAgdW5zaWduZWQgaWRlbnRpZmllck51 bWJlcjsKLX07Ci0KIHN0cnVjdCBJbmxpbmVWYXJpYWJsZURhdGEgewogICAgIElubGluZUNhbGxG cmFtZSogaW5saW5lQ2FsbEZyYW1lOwogICAgIHVuc2lnbmVkIGFyZ3VtZW50UG9zaXRpb25TdGFy dDsKQEAgLTczMCw3ICs3MjUsNyBAQCBwdWJsaWM6CiAgICAgSGFzaE1hcDxFbmNvZGVkSlNWYWx1 ZSwgRnJvemVuVmFsdWUqLCBFbmNvZGVkSlNWYWx1ZUhhc2gsIEVuY29kZWRKU1ZhbHVlSGFzaFRy YWl0cz4gbV9mcm96ZW5WYWx1ZU1hcDsKICAgICBCYWc8RnJvemVuVmFsdWU+IG1fZnJvemVuVmFs dWVzOwogICAgIAotICAgIFZlY3RvcjxTdG9yYWdlQWNjZXNzRGF0YT4gbV9zdG9yYWdlQWNjZXNz RGF0YTsKKyAgICBCYWc8U3RvcmFnZUFjY2Vzc0RhdGE+IG1fc3RvcmFnZUFjY2Vzc0RhdGE7CiAg ICAgVmVjdG9yPE5vZGUqLCA4PiBtX2FyZ3VtZW50czsKICAgICBTZWdtZW50ZWRWZWN0b3I8VmFy aWFibGVBY2Nlc3NEYXRhLCAxNj4gbV92YXJpYWJsZUFjY2Vzc0RhdGE7CiAgICAgU2VnbWVudGVk VmVjdG9yPEFyZ3VtZW50UG9zaXRpb24sIDg+IG1fYXJndW1lbnRQb3NpdGlvbnM7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAkocmV2aXNpb24gMTczNzc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDYgKzU1 LDExIEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKIGNsYXNzIEdyYXBoOwogc3Ry dWN0IEJhc2ljQmxvY2s7CiAKK3N0cnVjdCBTdG9yYWdlQWNjZXNzRGF0YSB7CisgICAgUHJvcGVy dHlPZmZzZXQgb2Zmc2V0OworICAgIHVuc2lnbmVkIGlkZW50aWZpZXJOdW1iZXI7Cit9OworCiBz dHJ1Y3QgTXVsdGlHZXRCeU9mZnNldERhdGEgewogICAgIHVuc2lnbmVkIGlkZW50aWZpZXJOdW1i ZXI7CiAgICAgVmVjdG9yPEdldEJ5SWRWYXJpYW50LCAyPiB2YXJpYW50czsKQEAgLTQ1NiwxMCAr NDYxLDEwIEBAIHN0cnVjdCBOb2RlIHsKICAgICAgICAgY2hpbGRyZW4ucmVzZXQoKTsKICAgICB9 CiAgICAgCi0gICAgdm9pZCBjb252ZXJ0VG9HZXRCeU9mZnNldCh1bnNpZ25lZCBzdG9yYWdlQWNj ZXNzRGF0YUluZGV4LCBFZGdlIHN0b3JhZ2UpCisgICAgdm9pZCBjb252ZXJ0VG9HZXRCeU9mZnNl dChTdG9yYWdlQWNjZXNzRGF0YSYgZGF0YSwgRWRnZSBzdG9yYWdlKQogICAgIHsKICAgICAgICAg QVNTRVJUKG1fb3AgPT0gR2V0QnlJZCB8fCBtX29wID09IEdldEJ5SWRGbHVzaCB8fCBtX29wID09 IE11bHRpR2V0QnlPZmZzZXQpOwotICAgICAgICBtX29wSW5mbyA9IHN0b3JhZ2VBY2Nlc3NEYXRh SW5kZXg7CisgICAgICAgIG1fb3BJbmZvID0gYml0d2lzZV9jYXN0PHVpbnRwdHJfdD4oJmRhdGEp OwogICAgICAgICBjaGlsZHJlbi5zZXRDaGlsZDIoY2hpbGRyZW4uY2hpbGQxKCkpOwogICAgICAg ICBjaGlsZHJlbi5jaGlsZDIoKS5zZXRVc2VLaW5kKEtub3duQ2VsbFVzZSk7CiAgICAgICAgIGNo aWxkcmVuLnNldENoaWxkMShzdG9yYWdlKTsKQEAgLTQ3NiwxMCArNDgxLDEwIEBAIHN0cnVjdCBO b2RlIHsKICAgICAgICAgbV9mbGFncyAmPSB+Tm9kZUNsb2JiZXJzV29ybGQ7CiAgICAgfQogICAg IAotICAgIHZvaWQgY29udmVydFRvUHV0QnlPZmZzZXQodW5zaWduZWQgc3RvcmFnZUFjY2Vzc0Rh dGFJbmRleCwgRWRnZSBzdG9yYWdlKQorICAgIHZvaWQgY29udmVydFRvUHV0QnlPZmZzZXQoU3Rv cmFnZUFjY2Vzc0RhdGEmIGRhdGEsIEVkZ2Ugc3RvcmFnZSkKICAgICB7CiAgICAgICAgIEFTU0VS VChtX29wID09IFB1dEJ5SWQgfHwgbV9vcCA9PSBQdXRCeUlkRGlyZWN0IHx8IG1fb3AgPT0gUHV0 QnlJZEZsdXNoIHx8IG1fb3AgPT0gTXVsdGlQdXRCeU9mZnNldCk7Ci0gICAgICAgIG1fb3BJbmZv ID0gc3RvcmFnZUFjY2Vzc0RhdGFJbmRleDsKKyAgICAgICAgbV9vcEluZm8gPSBiaXR3aXNlX2Nh c3Q8dWludHB0cl90PigmZGF0YSk7CiAgICAgICAgIGNoaWxkcmVuLnNldENoaWxkMyhjaGlsZHJl bi5jaGlsZDIoKSk7CiAgICAgICAgIGNoaWxkcmVuLnNldENoaWxkMihjaGlsZHJlbi5jaGlsZDEo KSk7CiAgICAgICAgIGNoaWxkcmVuLnNldENoaWxkMShzdG9yYWdlKTsKQEAgLTExNTMsMTAgKzEx NTgsMTAgQEAgc3RydWN0IE5vZGUgewogICAgICAgICByZXR1cm4gb3AoKSA9PSBHZXRCeU9mZnNl dCB8fCBvcCgpID09IEdldEdldHRlclNldHRlckJ5T2Zmc2V0IHx8IG9wKCkgPT0gUHV0QnlPZmZz ZXQ7CiAgICAgfQogICAgIAotICAgIHVuc2lnbmVkIHN0b3JhZ2VBY2Nlc3NEYXRhSW5kZXgoKQor ICAgIFN0b3JhZ2VBY2Nlc3NEYXRhJiBzdG9yYWdlQWNjZXNzRGF0YSgpCiAgICAgewogICAgICAg ICBBU1NFUlQoaGFzU3RvcmFnZUFjY2Vzc0RhdGEoKSk7Ci0gICAgICAgIHJldHVybiBtX29wSW5m bzsKKyAgICAgICAgcmV0dXJuICpiaXR3aXNlX2Nhc3Q8U3RvcmFnZUFjY2Vzc0RhdGEqPihtX29w SW5mbyk7CiAgICAgfQogICAgIAogICAgIGJvb2wgaGFzTXVsdGlHZXRCeU9mZnNldERhdGEoKQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTYWZlVG9FeGVjdXRlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTYWZlVG9FeGVjdXRlLmgJKHJl dmlzaW9uIDE3Mzc3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZVRvRXhl Y3V0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTEsNyArMzExLDcgQEAgYm9vbCBzYWZlVG9FeGVj dXRlKEFic3RyYWN0U3RhdGVUeXBlJiBzdAogICAgICAgICBTdHJ1Y3R1cmVBYnN0cmFjdFZhbHVl JiB2YWx1ZSA9IHN0YXRlLmZvck5vZGUobm9kZS0+Y2hpbGQxKCkpLm1fc3RydWN0dXJlOwogICAg ICAgICBpZiAodmFsdWUuaXNUb3AoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0ID0gZ3JhcGgubV9zdG9yYWdlQWNjZXNzRGF0YVtub2Rl LT5zdG9yYWdlQWNjZXNzRGF0YUluZGV4KCldLm9mZnNldDsKKyAgICAgICAgUHJvcGVydHlPZmZz ZXQgb2Zmc2V0ID0gbm9kZS0+c3RvcmFnZUFjY2Vzc0RhdGEoKS5vZmZzZXQ7CiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IHZhbHVlLnNpemUoKTsgaS0tOykgewogICAgICAgICAgICAgaWYgKCF2 YWx1ZVtpXS0+aXNWYWxpZE9mZnNldChvZmZzZXQpKQogICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsK