85124 2012-04-27 21:01:18 -0700 Stop using aligned allocation for WeakBlock 2012-04-27 21:25:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 612133 0 ggaren 2012-04-27 21:01:18 -0700 Stop using aligned allocation for WeakBlock 612137 1 139334 ggaren 2012-04-27 21:09:15 -0700 Created attachment 139334 Patch 612140 2 ggaren 2012-04-27 21:25:06 -0700 Committed r115538: <http://trac.webkit.org/changeset/115538> 139334 2012-04-27 21:09:15 -0700 2012-04-27 21:24:06 -0700 Patch bug-85124-20120427210914.patch text/plain 9356 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE1NTM2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBA CisyMDEyLTA0LTI3ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgU3RvcCB1c2luZyBhbGlnbmVkIGFsbG9jYXRpb24gZm9yIFdlYWtCbG9jaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBkb24ndCBhY3R1YWxseSB1 c2UgdGhlIGFsaWdubWVudCBmb3IgYW55dGhpbmcuCisKKyAgICAgICAgKiBoZWFwL1dlYWtCbG9j ay5jcHA6CisgICAgICAgIChKU0M6OldlYWtCbG9jazo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6 V2Vha0Jsb2NrOjpXZWFrQmxvY2spOiBTd2l0Y2hlZCBmcm9tIGFsaWduZWQgYWxsb2NhdGlvbiB0 byByZWd1bGFyCisgICAgICAgIGFsbG9jYXRpb24uCisKKyAgICAgICAgKiBoZWFwL1dlYWtCbG9j ay5oOgorICAgICAgICAoV2Vha0Jsb2NrKTogRG9uJ3QgdXNlIEhlYXBCbG9jayBiZWNhdXNlIEhl YXBCbG9jayByZXF1aXJlcyBhbGlnbmVkCisgICAgICAgIGFsbG9jYXRpb24uIFRoaXMgY2hhbmdl IHJlcXVpcmVkIG1lIHRvIGFkZCBzb21lIGRlY2xhcmF0aW9ucyB0aGF0IHdlIHVzZWQKKyAgICAg ICAgdG8gaW5oZXJpdCBmcm9tIEhlYXBCbG9jay4KKworICAgICAgICAoV2Vha0Jsb2NrOjpibG9j a0Zvcik6IFJlbW92ZWQuIFRoaXMgZnVuY3Rpb24gcmVsaWVkIG9uIGFsaWduZWQgYWxsb2NhdGlv bgorICAgICAgICBidXQgZGlkbid0IGRvIGFueXRoaW5nIGZvciB1cy4KKworICAgICAgICAoV2Vh a0Jsb2NrOjpkZWFsbG9jYXRlKTogUmVtb3ZlZC4gV2Vha0Jsb2NrIGRvZXNuJ3Qgb3duIGFueSBv ZiB0aGUgZGVhbGxvY2F0aW9uCisgICAgICAgIGxvZ2ljLCBzbyBpdCBzaG91bGRuJ3Qgb3duIHRo ZSBmdW5jdGlvbi4KKworICAgICAgICAqIGhlYXAvV2Vha1NldC5jcHA6CisgICAgICAgIChKU0M6 OldlYWtTZXQ6On5XZWFrU2V0KToKKyAgICAgICAgKEpTQzo6V2Vha1NldDo6ZmluYWxpemVBbGwp OgorICAgICAgICAoSlNDOjpXZWFrU2V0Ojp2aXNpdExpdmVXZWFrSW1wbHMpOgorICAgICAgICAo SlNDOjpXZWFrU2V0Ojp2aXNpdERlYWRXZWFrSW1wbHMpOgorICAgICAgICAoSlNDOjpXZWFrU2V0 Ojpzd2VlcCk6CisgICAgICAgIChKU0M6OldlYWtTZXQ6OnNocmluayk6CisgICAgICAgIChKU0M6 OldlYWtTZXQ6OnJlc2V0QWxsb2NhdG9yKToKKyAgICAgICAgKEpTQzo6V2Vha1NldDo6dHJ5Rmlu ZEFsbG9jYXRvcik6CisgICAgICAgICogaGVhcC9XZWFrU2V0Lmg6CisgICAgICAgIChXZWFrU2V0 KTogVXBkYXRlZCBkZWNsYXJhdGlvbnMgdG8gcmVmbGVjdCBXZWFrQmxvY2sgbm90IGluaGVyaXRp bmcgZnJvbQorICAgICAgICBIZWFwQmxvY2suIFRoaXMgYWxsb3dlZCBtZSB0byByZW1vdmUgc29t ZSBjYXN0cywgd2hpY2ggd2FzIG5pY2UuCisKKyAgICAgICAgKEpTQzo6V2Vha1NldDo6ZGVhbGxv Y2F0ZSk6IERpcmVjdGx5IHNldCB0aGUgZGVhbGxvY2F0ZWQgZmxhZyBpbnN0ZWFkIG9mCisgICAg ICAgIGFza2luZyBXZWFrQmxvY2sgdG8gZG8gaXQgZm9yIHVzLiAgV2UgZG9uJ3QgbmVlZCB0byBo YXZlIGEgV2Vha0Jsb2NrCisgICAgICAgIHBvaW50ZXIgdG8gc2V0IHRoZSBmbGFnLCBzbyBzdG9w IGFza2luZyBmb3Igb25lLgorCiAyMDEyLTA0LTI3ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbSlNDXSBJbXBsZW1lbnQgYSBoZWxwZXIgbWV0aG9kIGNy ZWF0ZU5vdEVub3VnaEFyZ3VtZW50c0Vycm9yKCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL1dlYWtCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvV2Vha0Jsb2NrLmNwcAkocmV2aXNpb24gMTE1NTM0KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvV2Vha0Jsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNyBA QCBuYW1lc3BhY2UgSlNDIHsKIAogV2Vha0Jsb2NrKiBXZWFrQmxvY2s6OmNyZWF0ZSgpCiB7Ci0g ICAgUGFnZUFsbG9jYXRpb25BbGlnbmVkIGFsbG9jYXRpb24gPSBQYWdlQWxsb2NhdGlvbkFsaWdu ZWQ6OmFsbG9jYXRlKGJsb2NrU2l6ZSwgYmxvY2tTaXplLCBPU0FsbG9jYXRvcjo6SlNHQ0hlYXBQ YWdlcyk7CisgICAgUGFnZUFsbG9jYXRpb24gYWxsb2NhdGlvbiA9IFBhZ2VBbGxvY2F0aW9uOjph bGxvY2F0ZShibG9ja1NpemUsIE9TQWxsb2NhdG9yOjpKU0dDSGVhcFBhZ2VzKTsKICAgICBpZiAo IXN0YXRpY19jYXN0PGJvb2w+KGFsbG9jYXRpb24pKQogICAgICAgICBDUkFTSCgpOwogICAgIHJl dHVybiBuZXcgKE5vdE51bGwsIGFsbG9jYXRpb24uYmFzZSgpKSBXZWFrQmxvY2soYWxsb2NhdGlv bik7CkBAIC00Nyw4ICs0Nyw4IEBAIHZvaWQgV2Vha0Jsb2NrOjpkZXN0cm95KFdlYWtCbG9jayog YmxvY2sKICAgICBibG9jay0+bV9hbGxvY2F0aW9uLmRlYWxsb2NhdGUoKTsKIH0KIAotV2Vha0Js b2NrOjpXZWFrQmxvY2soUGFnZUFsbG9jYXRpb25BbGlnbmVkJiBhbGxvY2F0aW9uKQotICAgIDog SGVhcEJsb2NrKGFsbG9jYXRpb24pCitXZWFrQmxvY2s6OldlYWtCbG9jayhQYWdlQWxsb2NhdGlv biYgYWxsb2NhdGlvbikKKyAgICA6IG1fYWxsb2NhdGlvbihhbGxvY2F0aW9uKQogewogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgd2Vha0ltcGxDb3VudCgpOyArK2kpIHsKICAgICAgICAgV2Vh a0ltcGwqIHdlYWtJbXBsID0gJndlYWtJbXBscygpW2ldOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvV2Vha0Jsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvV2Vha0Jsb2NrLmgJKHJldmlzaW9uIDExNTUzMykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL1dlYWtCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw3IEBA CiAjaW5jbHVkZSAiV2Vha0hhbmRsZU93bmVyLmgiCiAjaW5jbHVkZSAiV2Vha0ltcGwuaCIKICNp bmNsdWRlIDx3dGYvRG91Ymx5TGlua2VkTGlzdC5oPgotI2luY2x1ZGUgPHd0Zi9QYWdlQWxsb2Nh dGlvbkFsaWduZWQuaD4KKyNpbmNsdWRlIDx3dGYvUGFnZUFsbG9jYXRpb24uaD4KICNpbmNsdWRl IDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKIG5hbWVzcGFjZSBKU0MgewpAQCAtMzksMTAgKzM5LDEw IEBAIGNsYXNzIEhlYXBSb290VmlzaXRvcjsKIGNsYXNzIEpTVmFsdWU7CiBjbGFzcyBXZWFrSGFu ZGxlT3duZXI7CiAKLWNsYXNzIFdlYWtCbG9jayA6IHB1YmxpYyBIZWFwQmxvY2sgeworY2xhc3Mg V2Vha0Jsb2NrIDogcHVibGljIERvdWJseUxpbmtlZExpc3ROb2RlPFdlYWtCbG9jaz4gewogcHVi bGljOgorICAgIGZyaWVuZCBjbGFzcyBEb3VibHlMaW5rZWRMaXN0Tm9kZTxXZWFrQmxvY2s+Owog ICAgIHN0YXRpYyBjb25zdCBzaXplX3QgYmxvY2tTaXplID0gNCAqIEtCOwotICAgIHN0YXRpYyBj b25zdCBzaXplX3QgYmxvY2tNYXNrID0gfihibG9ja1NpemUgLSAxKTsKIAogICAgIHN0cnVjdCBG cmVlQ2VsbCB7CiAgICAgICAgIEZyZWVDZWxsKiBuZXh0OwpAQCAtNTksMTUgKzU5LDEyIEBAIHB1 YmxpYzoKICAgICBzdGF0aWMgV2Vha0Jsb2NrKiBjcmVhdGUoKTsKICAgICBzdGF0aWMgdm9pZCBk ZXN0cm95KFdlYWtCbG9jayopOwogCi0gICAgc3RhdGljIFdlYWtCbG9jayogYmxvY2tGb3IoV2Vh a0ltcGwqKTsKICAgICBzdGF0aWMgV2Vha0ltcGwqIGFzV2Vha0ltcGwoRnJlZUNlbGwqKTsKIAog ICAgIHZvaWQgc3dlZXAoKTsKICAgICBjb25zdCBTd2VlcFJlc3VsdCYgc3dlZXBSZXN1bHQoKTsK ICAgICBTd2VlcFJlc3VsdCB0YWtlU3dlZXBSZXN1bHQoKTsKIAotICAgIHZvaWQgZGVhbGxvY2F0 ZShXZWFrSW1wbCopOwotCiAgICAgdm9pZCB2aXNpdExpdmVXZWFrSW1wbHMoSGVhcFJvb3RWaXNp dG9yJik7CiAgICAgdm9pZCB2aXNpdERlYWRXZWFrSW1wbHMoSGVhcFJvb3RWaXNpdG9yJik7CiAK QEAgLTc2LDEzICs3MywxNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHN0YXRpYyBGcmVlQ2Vs bCogYXNGcmVlQ2VsbChXZWFrSW1wbCopOwogCi0gICAgV2Vha0Jsb2NrKFBhZ2VBbGxvY2F0aW9u QWxpZ25lZCYpOworICAgIFdlYWtCbG9jayhQYWdlQWxsb2NhdGlvbiYpOwogICAgIFdlYWtJbXBs KiBmaXJzdFdlYWtJbXBsKCk7CiAgICAgdm9pZCBmaW5hbGl6ZShXZWFrSW1wbCopOwogICAgIFdl YWtJbXBsKiB3ZWFrSW1wbHMoKTsKICAgICBzaXplX3Qgd2Vha0ltcGxDb3VudCgpOwogICAgIHZv aWQgYWRkVG9GcmVlTGlzdChGcmVlQ2VsbCoqLCBXZWFrSW1wbCopOwogCisgICAgUGFnZUFsbG9j YXRpb24gbV9hbGxvY2F0aW9uOworICAgIFdlYWtCbG9jayogbV9wcmV2OworICAgIFdlYWtCbG9j ayogbV9uZXh0OwogICAgIFN3ZWVwUmVzdWx0IG1fc3dlZXBSZXN1bHQ7CiB9OwogCkBAIC05OCwx MSArOTgsNiBAQCBpbmxpbmUgYm9vbCBXZWFrQmxvY2s6OlN3ZWVwUmVzdWx0Ojppc051CiAgICAg cmV0dXJuIGJsb2NrSXNGcmVlICYmICFmcmVlTGlzdDsgLy8gVGhpcyBzdGF0ZSBpcyBpbXBvc3Np YmxlLCBzbyB3ZSBjYW4gdXNlIGl0IHRvIG1lYW4gbnVsbC4KIH0KIAotaW5saW5lIFdlYWtCbG9j ayogV2Vha0Jsb2NrOjpibG9ja0ZvcihXZWFrSW1wbCogd2Vha0ltcGwpCi17Ci0gICAgcmV0dXJu IHJlaW50ZXJwcmV0X2Nhc3Q8V2Vha0Jsb2NrKj4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+ KHdlYWtJbXBsKSAmIGJsb2NrTWFzayk7Ci19Ci0KIGlubGluZSBXZWFrSW1wbCogV2Vha0Jsb2Nr Ojphc1dlYWtJbXBsKEZyZWVDZWxsKiBmcmVlQ2VsbCkKIHsKICAgICByZXR1cm4gcmVpbnRlcnBy ZXRfY2FzdDxXZWFrSW1wbCo+KGZyZWVDZWxsKTsKQEAgLTEyNiwxMSArMTIxLDYgQEAgaW5saW5l IFdlYWtCbG9jazo6RnJlZUNlbGwqIFdlYWtCbG9jazo6YQogICAgIHJldHVybiByZWludGVycHJl dF9jYXN0PEZyZWVDZWxsKj4od2Vha0ltcGwpOwogfQogCi1pbmxpbmUgdm9pZCBXZWFrQmxvY2s6 OmRlYWxsb2NhdGUoV2Vha0ltcGwqIHdlYWtJbXBsKQotewotICAgIHdlYWtJbXBsLT5zZXRTdGF0 ZShXZWFrSW1wbDo6RGVhbGxvY2F0ZWQpOwotfQotCiBpbmxpbmUgdm9pZCBXZWFrQmxvY2s6OmZp bmFsaXplKFdlYWtJbXBsKiB3ZWFrSW1wbCkKIHsKICAgICBBU1NFUlQod2Vha0ltcGwtPnN0YXRl KCkgPT0gV2Vha0ltcGw6OkRlYWQpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAv V2Vha1NldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvV2Vh a1NldC5jcHAJKHJldmlzaW9uIDExNTUzMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L1dlYWtTZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw4ICszMyw4IEBAIG5hbWVzcGFjZSBK U0MgewogV2Vha1NldDo6fldlYWtTZXQoKQogewogICAgIFdlYWtCbG9jayogbmV4dCA9IDA7Ci0g ICAgZm9yIChXZWFrQmxvY2sqIGJsb2NrID0gc3RhdGljX2Nhc3Q8V2Vha0Jsb2NrKj4obV9ibG9j a3MuaGVhZCgpKTsgYmxvY2s7IGJsb2NrID0gbmV4dCkgewotICAgICAgICBuZXh0ID0gc3RhdGlj X2Nhc3Q8V2Vha0Jsb2NrKj4oYmxvY2stPm5leHQoKSk7CisgICAgZm9yIChXZWFrQmxvY2sqIGJs b2NrID0gbV9ibG9ja3MuaGVhZCgpOyBibG9jazsgYmxvY2sgPSBuZXh0KSB7CisgICAgICAgIG5l eHQgPSBibG9jay0+bmV4dCgpOwogICAgICAgICBXZWFrQmxvY2s6OmRlc3Ryb3koYmxvY2spOwog ICAgIH0KICAgICBtX2Jsb2Nrcy5jbGVhcigpOwpAQCAtNDIsMjcgKzQyLDI3IEBAIFdlYWtTZXQ6 On5XZWFrU2V0KCkKIAogdm9pZCBXZWFrU2V0OjpmaW5hbGl6ZUFsbCgpCiB7Ci0gICAgZm9yIChX ZWFrQmxvY2sqIGJsb2NrID0gc3RhdGljX2Nhc3Q8V2Vha0Jsb2NrKj4obV9ibG9ja3MuaGVhZCgp KTsgYmxvY2s7IGJsb2NrID0gc3RhdGljX2Nhc3Q8V2Vha0Jsb2NrKj4oYmxvY2stPm5leHQoKSkp CisgICAgZm9yIChXZWFrQmxvY2sqIGJsb2NrID0gbV9ibG9ja3MuaGVhZCgpOyBibG9jazsgYmxv Y2sgPSBibG9jay0+bmV4dCgpKQogICAgICAgICBibG9jay0+ZmluYWxpemVBbGwoKTsKIH0KIAog dm9pZCBXZWFrU2V0Ojp2aXNpdExpdmVXZWFrSW1wbHMoSGVhcFJvb3RWaXNpdG9yJiB2aXNpdG9y KQogewotICAgIGZvciAoV2Vha0Jsb2NrKiBibG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+ KG1fYmxvY2tzLmhlYWQoKSk7IGJsb2NrOyBibG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+ KGJsb2NrLT5uZXh0KCkpKQorICAgIGZvciAoV2Vha0Jsb2NrKiBibG9jayA9IG1fYmxvY2tzLmhl YWQoKTsgYmxvY2s7IGJsb2NrID0gYmxvY2stPm5leHQoKSkKICAgICAgICAgYmxvY2stPnZpc2l0 TGl2ZVdlYWtJbXBscyh2aXNpdG9yKTsKIH0KIAogdm9pZCBXZWFrU2V0Ojp2aXNpdERlYWRXZWFr SW1wbHMoSGVhcFJvb3RWaXNpdG9yJiB2aXNpdG9yKQogewotICAgIGZvciAoV2Vha0Jsb2NrKiBi bG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+KG1fYmxvY2tzLmhlYWQoKSk7IGJsb2NrOyBi bG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+KGJsb2NrLT5uZXh0KCkpKQorICAgIGZvciAo V2Vha0Jsb2NrKiBibG9jayA9IG1fYmxvY2tzLmhlYWQoKTsgYmxvY2s7IGJsb2NrID0gYmxvY2st Pm5leHQoKSkKICAgICAgICAgYmxvY2stPnZpc2l0RGVhZFdlYWtJbXBscyh2aXNpdG9yKTsKIH0K IAogdm9pZCBXZWFrU2V0Ojpzd2VlcCgpCiB7CiAgICAgV2Vha0Jsb2NrKiBuZXh0OwotICAgIGZv ciAoV2Vha0Jsb2NrKiBibG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+KG1fYmxvY2tzLmhl YWQoKSk7IGJsb2NrOyBibG9jayA9IG5leHQpIHsKLSAgICAgICAgbmV4dCA9IHN0YXRpY19jYXN0 PFdlYWtCbG9jayo+KGJsb2NrLT5uZXh0KCkpOworICAgIGZvciAoV2Vha0Jsb2NrKiBibG9jayA9 IG1fYmxvY2tzLmhlYWQoKTsgYmxvY2s7IGJsb2NrID0gbmV4dCkgeworICAgICAgICBuZXh0ID0g YmxvY2stPm5leHQoKTsKIAogICAgICAgICAvLyBJZiBhIGJsb2NrIGlzIGNvbXBsZXRlbHkgZW1w dHksIGEgbmV3IHN3ZWVwIHdvbid0IGhhdmUgYW55IGVmZmVjdC4KICAgICAgICAgaWYgKCFibG9j ay0+c3dlZXBSZXN1bHQoKS5pc051bGwoKSAmJiBibG9jay0+c3dlZXBSZXN1bHQoKS5ibG9ja0lz RnJlZSkKQEAgLTc2LDggKzc2LDggQEAgdm9pZCBXZWFrU2V0Ojpzd2VlcCgpCiB2b2lkIFdlYWtT ZXQ6OnNocmluaygpCiB7CiAgICAgV2Vha0Jsb2NrKiBuZXh0OwotICAgIGZvciAoV2Vha0Jsb2Nr KiBibG9jayA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+KG1fYmxvY2tzLmhlYWQoKSk7IGJsb2Nr OyBibG9jayA9IG5leHQpIHsKLSAgICAgICAgbmV4dCA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+ KGJsb2NrLT5uZXh0KCkpOworICAgIGZvciAoV2Vha0Jsb2NrKiBibG9jayA9IG1fYmxvY2tzLmhl YWQoKTsgYmxvY2s7IGJsb2NrID0gbmV4dCkgeworICAgICAgICBuZXh0ID0gYmxvY2stPm5leHQo KTsKIAogICAgICAgICBpZiAoIWJsb2NrLT5zd2VlcFJlc3VsdCgpLmlzTnVsbCgpICYmIGJsb2Nr LT5zd2VlcFJlc3VsdCgpLmJsb2NrSXNGcmVlKQogICAgICAgICAgICAgcmVtb3ZlQWxsb2NhdG9y KGJsb2NrKTsKQEAgLTg3LDcgKzg3LDcgQEAgdm9pZCBXZWFrU2V0OjpzaHJpbmsoKQogdm9pZCBX ZWFrU2V0OjpyZXNldEFsbG9jYXRvcigpCiB7CiAgICAgbV9hbGxvY2F0b3IgPSAwOwotICAgIG1f bmV4dEFsbG9jYXRvciA9IHN0YXRpY19jYXN0PFdlYWtCbG9jayo+KG1fYmxvY2tzLmhlYWQoKSk7 CisgICAgbV9uZXh0QWxsb2NhdG9yID0gbV9ibG9ja3MuaGVhZCgpOwogfQogCiBXZWFrQmxvY2s6 OkZyZWVDZWxsKiBXZWFrU2V0OjpmaW5kQWxsb2NhdG9yKCkKQEAgLTEwMiw3ICsxMDIsNyBAQCBX ZWFrQmxvY2s6OkZyZWVDZWxsKiBXZWFrU2V0Ojp0cnlGaW5kQWxsCiB7CiAgICAgd2hpbGUgKG1f bmV4dEFsbG9jYXRvcikgewogICAgICAgICBXZWFrQmxvY2sqIGJsb2NrID0gbV9uZXh0QWxsb2Nh dG9yOwotICAgICAgICBtX25leHRBbGxvY2F0b3IgPSBzdGF0aWNfY2FzdDxXZWFrQmxvY2sqPiht X25leHRBbGxvY2F0b3ItPm5leHQoKSk7CisgICAgICAgIG1fbmV4dEFsbG9jYXRvciA9IG1fbmV4 dEFsbG9jYXRvci0+bmV4dCgpOwogCiAgICAgICAgIGJsb2NrLT5zd2VlcCgpOwogICAgICAgICBX ZWFrQmxvY2s6OlN3ZWVwUmVzdWx0IHN3ZWVwUmVzdWx0ID0gYmxvY2stPnRha2VTd2VlcFJlc3Vs dCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvV2Vha1NldC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1dlYWtTZXQuaAkocmV2aXNpb24gMTE1 NTMzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvV2Vha1NldC5oCSh3b3JraW5nIGNv cHkpCkBAIC01OCw3ICs1OCw3IEBAIHByaXZhdGU6CiAKICAgICBXZWFrQmxvY2s6OkZyZWVDZWxs KiBtX2FsbG9jYXRvcjsKICAgICBXZWFrQmxvY2sqIG1fbmV4dEFsbG9jYXRvcjsKLSAgICBEb3Vi bHlMaW5rZWRMaXN0PEhlYXBCbG9jaz4gbV9ibG9ja3M7CisgICAgRG91Ymx5TGlua2VkTGlzdDxX ZWFrQmxvY2s+IG1fYmxvY2tzOwogICAgIEhlYXAqIG1faGVhcDsKIH07CiAKQEAgLTgyLDcgKzgy LDcgQEAgaW5saW5lIFdlYWtJbXBsKiBXZWFrU2V0OjphbGxvY2F0ZShKU1ZhbAogCiBpbmxpbmUg dm9pZCBXZWFrU2V0OjpkZWFsbG9jYXRlKFdlYWtJbXBsKiB3ZWFrSW1wbCkKIHsKLSAgICBXZWFr QmxvY2s6OmJsb2NrRm9yKHdlYWtJbXBsKS0+ZGVhbGxvY2F0ZSh3ZWFrSW1wbCk7CisgICAgd2Vh a0ltcGwtPnNldFN0YXRlKFdlYWtJbXBsOjpEZWFsbG9jYXRlZCk7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIEpTQwo=