212793 2020-06-04 17:21:21 -0700 [JSC] Report extra memory allocation from PropertyTable 2020-06-05 09:58:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1659426 0 ysuzuki 2020-06-04 17:21:21 -0700 [JSC] Report extra memory allocation from PropertyTable 1659427 1 401100 ysuzuki 2020-06-04 17:22:20 -0700 Created attachment 401100 Patch 1659444 2 401100 ysuzuki 2020-06-04 18:22:50 -0700 Comment on attachment 401100 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401100&action=review > Source/JavaScriptCore/runtime/PropertyMapHashTable.h:531 > + vm.heap.reportExtraMemoryAllocated(dataSize()); Maybe, we should report if (oldDataSize < dataSize()) vm.heap.reportExtraMemoryAllocated(dataSize() - oldDataSize); changed. 1659490 3 ysuzuki 2020-06-04 22:55:27 -0700 Ran jsc tests locally. 1659491 4 ysuzuki 2020-06-04 22:59:02 -0700 Committed r262600: <https://trac.webkit.org/changeset/262600> 1659649 5 webkit-bug-importer 2020-06-05 09:58:15 -0700 <rdar://problem/64033289> 401100 2020-06-04 17:22:20 -0700 2020-06-04 17:40:15 -0700 Patch bug-212793-20200604172220.patch text/plain 9321 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk MTk3NDMzZjI3MjdkMGRiZjIwY2U0MTI4MTRlOWJjOGY3NzdhNmQ3Li42MDE1ZDUzM2U1MDljYjc2 ODE2OWRkMjIwZjIwZDYzODliOTg3ZmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAyMC0wNi0wNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJlcG9ydCBleHRyYSBtZW1vcnkgYWxsb2NhdGlvbiBmcm9tIFBy b3BlcnR5VGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMjc5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggYWRkcyBleHRyYSBtZW1vcnkgcmVwb3J0aW5nIGZyb20gUHJvcGVydHlU YWJsZSB0byBtYWtlIEdDCisgICAgICAgIHJlc3BvbnNpdmUgdG8gdGhlIGluY3JlYXNlIG9mIG1l bW9yeSBpbiBQcm9wZXJ0eVRhYmxlLgorCisgICAgICAgICogcnVudGltZS9Qcm9wZXJ0eU1hcEhh c2hUYWJsZS5oOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxlOjphZGQpOgorICAgICAgICAo SlNDOjpQcm9wZXJ0eVRhYmxlOjpyZW1vdmUpOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxl OjpyZWhhc2gpOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxlOjpkYXRhU2l6ZSk6CisgICAg ICAgICogcnVudGltZS9Qcm9wZXJ0eVRhYmxlLmNwcDoKKyAgICAgICAgKEpTQzo6UHJvcGVydHlU YWJsZTo6ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxlOjp2aXNp dENoaWxkcmVuKToKKyAgICAgICAgKiBydW50aW1lL1N0cnVjdHVyZS5jcHA6CisgICAgICAgIChK U0M6OlN0cnVjdHVyZTo6bWF0ZXJpYWxpemVQcm9wZXJ0eVRhYmxlKToKKyAgICAgICAgKiBydW50 aW1lL1N0cnVjdHVyZUlubGluZXMuaDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjphZGQpOgor ICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OnJlbW92ZSk6CisKIDIwMjAtMDYtMDQgIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBPcHRpb25zOjp2YWxpZGF0ZURv ZXNHQygpIGZvciB0dXJuaW5nIERvZXNHQyB2YWxpZGF0aW9uIG9uL29mZi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxlLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJsZS5oCmluZGV4 IDRkYmZhZTJhNTFhMGQ3NDIzYTcwMmIwOTg3MzdmMWFiODk5OTU3NjMuLmE5ZmI3NDhlYzE2Yjgz MTI3NmQzMDI2ZTE0NjdiOGY3ODQzNDExNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxlLmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvUHJvcGVydHlNYXBIYXNoVGFibGUuaApAQCAtMTMzLDYgKzEzMyw3IEBA IGNsYXNzIFByb3BlcnR5VGFibGUgZmluYWwgOiBwdWJsaWMgSlNDZWxsIHsKIAogICAgIHN0YXRp YyBjb25zdGV4cHIgYm9vbCBuZWVkc0Rlc3RydWN0aW9uID0gdHJ1ZTsKICAgICBzdGF0aWMgdm9p ZCBkZXN0cm95KEpTQ2VsbCopOworICAgIHN0YXRpYyB2b2lkIHZpc2l0Q2hpbGRyZW4oSlNDZWxs KiwgU2xvdFZpc2l0b3ImKTsKIAogICAgIERFQ0xBUkVfRVhQT1JUX0lORk87CiAKQEAgLTE2OSwx MCArMTcwLDEwIEBAIGNsYXNzIFByb3BlcnR5VGFibGUgZmluYWwgOiBwdWJsaWMgSlNDZWxsIHsK ICAgICBmaW5kX2l0ZXJhdG9yIGZpbmQoY29uc3QgS2V5VHlwZSYpOwogICAgIFZhbHVlVHlwZSog Z2V0KGNvbnN0IEtleVR5cGUmKTsKICAgICAvLyBBZGQgYSB2YWx1ZSB0byB0aGUgdGFibGUKLSAg ICBzdGQ6OnBhaXI8ZmluZF9pdGVyYXRvciwgYm9vbD4gV0FSTl9VTlVTRURfUkVUVVJOIGFkZChj b25zdCBWYWx1ZVR5cGUmIGVudHJ5KTsKKyAgICBzdGQ6OnBhaXI8ZmluZF9pdGVyYXRvciwgYm9v bD4gV0FSTl9VTlVTRURfUkVUVVJOIGFkZChWTSYsIGNvbnN0IFZhbHVlVHlwZSYgZW50cnkpOwog ICAgIC8vIFJlbW92ZSBhIHZhbHVlIGZyb20gdGhlIHRhYmxlLgotICAgIHZvaWQgcmVtb3ZlKGNv bnN0IGZpbmRfaXRlcmF0b3ImIGl0ZXIpOwotICAgIHZvaWQgcmVtb3ZlKGNvbnN0IEtleVR5cGUm IGtleSk7CisgICAgdm9pZCByZW1vdmUoVk0mLCBjb25zdCBmaW5kX2l0ZXJhdG9yJiBpdGVyKTsK KyAgICB2b2lkIHJlbW92ZShWTSYsIGNvbnN0IEtleVR5cGUmIGtleSk7CiAKICAgICAvLyBSZXR1 cm5zIHRoZSBudW1iZXIgb2YgdmFsdWVzIGluIHRoZSBoYXNodGFibGUuCiAgICAgdW5zaWduZWQg c2l6ZSgpIGNvbnN0OwpAQCAtMjExLDExICsyMTIsMTQgQEAgY2xhc3MgUHJvcGVydHlUYWJsZSBm aW5hbCA6IHB1YmxpYyBKU0NlbGwgewogICAgIFByb3BlcnR5VGFibGUoVk0mLCB1bnNpZ25lZCBp bml0aWFsQ2FwYWNpdHksIGNvbnN0IFByb3BlcnR5VGFibGUmKTsKIAogICAgIFByb3BlcnR5VGFi bGUoY29uc3QgUHJvcGVydHlUYWJsZSYpOworCisgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihWTSYp OworCiAgICAgLy8gVXNlZCB0byBpbnNlcnQgYSB2YWx1ZSBrbm93biBub3QgdG8gYmUgaW4gdGhl IHRhYmxlLCBhbmQgd2hlcmUgd2Uga25vdyBjYXBhY2l0eSB0byBiZSBhdmFpbGFibGUuCiAgICAg dm9pZCByZWluc2VydChjb25zdCBWYWx1ZVR5cGUmIGVudHJ5KTsKIAogICAgIC8vIFJlaGFzaCB0 aGUgdGFibGUuICBVc2VkIHRvIGdyb3csIG9yIHRvIHJlY292ZXIgZGVsZXRlZCBzbG90cy4KLSAg ICB2b2lkIHJlaGFzaCh1bnNpZ25lZCBuZXdDYXBhY2l0eSk7CisgICAgdm9pZCByZWhhc2goVk0m LCB1bnNpZ25lZCBuZXdDYXBhY2l0eSk7CiAKICAgICAvLyBUaGUgY2FwYWNpdHkgb2YgdGhlIHRh YmxlIG9mIHZhbHVlcyBpcyBoYWxmIG9mIHRoZSBzaXplIG9mIHRoZSBpbmRleC4KICAgICB1bnNp Z25lZCB0YWJsZUNhcGFjaXR5KCkgY29uc3Q7CkBAIC0zNDgsNyArMzUyLDcgQEAgaW5saW5lIFBy b3BlcnR5VGFibGU6OlZhbHVlVHlwZSogUHJvcGVydHlUYWJsZTo6Z2V0KGNvbnN0IEtleVR5cGUm IGtleSkKICAgICB9CiB9CiAKLWlubGluZSBzdGQ6OnBhaXI8UHJvcGVydHlUYWJsZTo6ZmluZF9p dGVyYXRvciwgYm9vbD4gV0FSTl9VTlVTRURfUkVUVVJOIFByb3BlcnR5VGFibGU6OmFkZChjb25z dCBWYWx1ZVR5cGUmIGVudHJ5KQoraW5saW5lIHN0ZDo6cGFpcjxQcm9wZXJ0eVRhYmxlOjpmaW5k X2l0ZXJhdG9yLCBib29sPiBXQVJOX1VOVVNFRF9SRVRVUk4gUHJvcGVydHlUYWJsZTo6YWRkKFZN JiB2bSwgY29uc3QgVmFsdWVUeXBlJiBlbnRyeSkKIHsKICAgICBBU1NFUlQoIW1fZGVsZXRlZE9m ZnNldHMgfHwgIW1fZGVsZXRlZE9mZnNldHMtPmNvbnRhaW5zKGVudHJ5Lm9mZnNldCkpOwogCkBA IC0zNjYsNyArMzcwLDcgQEAgaW5saW5lIHN0ZDo6cGFpcjxQcm9wZXJ0eVRhYmxlOjpmaW5kX2l0 ZXJhdG9yLCBib29sPiBXQVJOX1VOVVNFRF9SRVRVUk4gUHJvcGVydHkKIAogICAgIC8vIGVuc3Vy ZSBjYXBhY2l0eSBpcyBhdmFpbGFibGUuCiAgICAgaWYgKCFjYW5JbnNlcnQoKSkgewotICAgICAg ICByZWhhc2gobV9rZXlDb3VudCArIDEpOworICAgICAgICByZWhhc2godm0sIG1fa2V5Q291bnQg KyAxKTsKICAgICAgICAgaXRlciA9IGZpbmQoZW50cnkua2V5KTsKICAgICAgICAgQVNTRVJUKCFp dGVyLmZpcnN0KTsKICAgICB9CkBAIC0zODIsNyArMzg2LDcgQEAgaW5saW5lIHN0ZDo6cGFpcjxQ cm9wZXJ0eVRhYmxlOjpmaW5kX2l0ZXJhdG9yLCBib29sPiBXQVJOX1VOVVNFRF9SRVRVUk4gUHJv cGVydHkKICAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIoaXRlciwgdHJ1ZSk7CiB9CiAKLWlubGlu ZSB2b2lkIFByb3BlcnR5VGFibGU6OnJlbW92ZShjb25zdCBmaW5kX2l0ZXJhdG9yJiBpdGVyKQor aW5saW5lIHZvaWQgUHJvcGVydHlUYWJsZTo6cmVtb3ZlKFZNJiB2bSwgY29uc3QgZmluZF9pdGVy YXRvciYgaXRlcikKIHsKICAgICAvLyBSZW1vdmluZyBhIGtleSB0aGF0IGRvZXNuJ3QgZXhpc3Qg ZG9lcyBub3RoaW5nIQogICAgIGlmICghaXRlci5maXJzdCkKQEAgLTQwMywxMiArNDA3LDEyIEBA IGlubGluZSB2b2lkIFByb3BlcnR5VGFibGU6OnJlbW92ZShjb25zdCBmaW5kX2l0ZXJhdG9yJiBp dGVyKQogICAgICsrbV9kZWxldGVkQ291bnQ7CiAKICAgICBpZiAobV9kZWxldGVkQ291bnQgKiA0 ID49IG1faW5kZXhTaXplKQotICAgICAgICByZWhhc2gobV9rZXlDb3VudCk7CisgICAgICAgIHJl aGFzaCh2bSwgbV9rZXlDb3VudCk7CiB9CiAKLWlubGluZSB2b2lkIFByb3BlcnR5VGFibGU6OnJl bW92ZShjb25zdCBLZXlUeXBlJiBrZXkpCitpbmxpbmUgdm9pZCBQcm9wZXJ0eVRhYmxlOjpyZW1v dmUoVk0mIHZtLCBjb25zdCBLZXlUeXBlJiBrZXkpCiB7Ci0gICAgcmVtb3ZlKGZpbmQoa2V5KSk7 CisgICAgcmVtb3ZlKHZtLCBmaW5kKGtleSkpOwogfQogCiAvLyByZXR1cm5zIHRoZSBudW1iZXIg b2YgdmFsdWVzIGluIHRoZSBoYXNodGFibGUuCkBAIC01MDAsNyArNTA0LDcgQEAgaW5saW5lIHZv aWQgUHJvcGVydHlUYWJsZTo6cmVpbnNlcnQoY29uc3QgVmFsdWVUeXBlJiBlbnRyeSkKICAgICAr K21fa2V5Q291bnQ7CiB9CiAKLWlubGluZSB2b2lkIFByb3BlcnR5VGFibGU6OnJlaGFzaCh1bnNp Z25lZCBuZXdDYXBhY2l0eSkKK2lubGluZSB2b2lkIFByb3BlcnR5VGFibGU6OnJlaGFzaChWTSYg dm0sIHVuc2lnbmVkIG5ld0NhcGFjaXR5KQogewogI2lmIERVTVBfUFJPUEVSVFlNQVBfU1RBVFMK ICAgICArK3Byb3BlcnR5TWFwSGFzaFRhYmxlU3RhdHMtPm51bVJlaGFzaGVzOwpAQCAtNTIzLDYg KzUyNyw4IEBAIGlubGluZSB2b2lkIFByb3BlcnR5VGFibGU6OnJlaGFzaCh1bnNpZ25lZCBuZXdD YXBhY2l0eSkKICAgICB9CiAKICAgICBQcm9wZXJ0eVRhYmxlTWFsbG9jOjpmcmVlKG9sZEVudHJ5 SW5kaWNlcyk7CisKKyAgICB2bS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkKGRhdGFT aXplKCkpOwogfQogCiBpbmxpbmUgdW5zaWduZWQgUHJvcGVydHlUYWJsZTo6dGFibGVDYXBhY2l0 eSgpIGNvbnN0IHsgcmV0dXJuIG1faW5kZXhTaXplID4+IDE7IH0KQEAgLTU1OCw3ICs1NjQsOSBA QCBpbmxpbmUgdW5zaWduZWQgUHJvcGVydHlUYWJsZTo6dXNlZENvdW50KCkgY29uc3QKIGlubGlu ZSBzaXplX3QgUHJvcGVydHlUYWJsZTo6ZGF0YVNpemUoKQogewogICAgIC8vIFRoZSBzaXplIGlu IGJ5dGVzIG9mIGRhdGEgbmVlZGVkIGZvciBieSB0aGUgdGFibGUuCi0gICAgcmV0dXJuIG1faW5k ZXhTaXplICogc2l6ZW9mKHVuc2lnbmVkKSArICgodGFibGVDYXBhY2l0eSgpKSArIDEpICogc2l6 ZW9mKFZhbHVlVHlwZSk7CisgICAgLy8gRW5zdXJlIHRoYXQgdGhpcyBmdW5jdGlvbiBjYW4gYmUg Y2FsbGVkIGNvbmN1cnJlbnRseS4KKyAgICB1bnNpZ25lZCBpbmRleFNpemUgPSBtX2luZGV4U2l6 ZTsKKyAgICByZXR1cm4gaW5kZXhTaXplICogc2l6ZW9mKHVuc2lnbmVkKSArICgoaW5kZXhTaXpl ID4+IDEpICsgMSkgKiBzaXplb2YoVmFsdWVUeXBlKTsKIH0KIAogaW5saW5lIHVuc2lnbmVkIFBy b3BlcnR5VGFibGU6OnNpemVGb3JDYXBhY2l0eSh1bnNpZ25lZCBjYXBhY2l0eSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5VGFibGUuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlUYWJsZS5jcHAKaW5kZXggMzRlM2Nm NTkxYzQxYjE0OThjNGMzYzk2ZTBkNWRkZWIyZTdhYjU0ZC4uYzBlYTYwNmIwYzc2YjcxMmMxYWIy YmFjNWFjYjQ4ZTZlOGM0ZDc1YyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvUHJvcGVydHlUYWJsZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvUHJvcGVydHlUYWJsZS5jcHAKQEAgLTExMiw2ICsxMTIsMjAgQEAgUHJvcGVydHlUYWJsZTo6 UHJvcGVydHlUYWJsZShWTSYgdm0sIHVuc2lnbmVkIGluaXRpYWxDYXBhY2l0eSwgY29uc3QgUHJv cGVydHlUYWIKICAgICAgICAgbV9kZWxldGVkT2Zmc2V0cyA9IG1ha2VVbmlxdWU8VmVjdG9yPFBy b3BlcnR5T2Zmc2V0Pj4oKm90aGVyRGVsZXRlZE9mZnNldHMpOwogfQogCit2b2lkIFByb3BlcnR5 VGFibGU6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSkKK3sKKyAgICBCYXNlOjpmaW5pc2hDcmVhdGlv bih2bSk7CisgICAgdm0uaGVhcC5yZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZChkYXRhU2l6ZSgp KTsKK30KKwordm9pZCBQcm9wZXJ0eVRhYmxlOjp2aXNpdENoaWxkcmVuKEpTQ2VsbCogY2VsbCwg U2xvdFZpc2l0b3ImIHZpc2l0b3IpCit7CisgICAgYXV0byogdGhpc09iamVjdCA9IGpzQ2FzdDxQ cm9wZXJ0eVRhYmxlKj4oY2VsbCk7CisgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyh0aGlz T2JqZWN0LCBpbmZvKCkpOworICAgIEJhc2U6OnZpc2l0Q2hpbGRyZW4oY2VsbCwgdmlzaXRvcik7 CisgICAgdmlzaXRvci5yZXBvcnRFeHRyYU1lbW9yeVZpc2l0ZWQodGhpc09iamVjdC0+ZGF0YVNp emUoKSk7Cit9CisKIHZvaWQgUHJvcGVydHlUYWJsZTo6ZGVzdHJveShKU0NlbGwqIGNlbGwpCiB7 CiAgICAgc3RhdGljX2Nhc3Q8UHJvcGVydHlUYWJsZSo+KGNlbGwpLT5Qcm9wZXJ0eVRhYmxlOjp+ UHJvcGVydHlUYWJsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvU3RydWN0dXJlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVy ZS5jcHAKaW5kZXggYjFmZTc3ODhmYmE4MGZjYTU0NDZiZjA2Y2Q4OWYwOWNkOWIxYTFlMC4uNTcz YzY1NjZkNjI4ZmU0NjRiNDU1YzIzMTgzMDZkZDJhYzE4OTRkOSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCkBAIC0zNzcsMTQgKzM3NywxNCBAQCBQcm9w ZXJ0eVRhYmxlKiBTdHJ1Y3R1cmU6Om1hdGVyaWFsaXplUHJvcGVydHlUYWJsZShWTSYgdm0sIGJv b2wgc2V0UHJvcGVydHlUYWJsZQogICAgICAgICBpZiAoc3RydWN0dXJlLT5pc1Byb3BlcnR5RGVs ZXRpb25UcmFuc2l0aW9uKCkpIHsKICAgICAgICAgICAgIGF1dG8gaXRlbSA9IHRhYmxlLT5maW5k KHN0cnVjdHVyZS0+bV90cmFuc2l0aW9uUHJvcGVydHlOYW1lLmdldCgpKTsKICAgICAgICAgICAg IEFTU0VSVChpdGVtLmZpcnN0KTsKLSAgICAgICAgICAgIHRhYmxlLT5yZW1vdmUoaXRlbSk7Cisg ICAgICAgICAgICB0YWJsZS0+cmVtb3ZlKHZtLCBpdGVtKTsKICAgICAgICAgICAgIHRhYmxlLT5h ZGREZWxldGVkT2Zmc2V0KHN0cnVjdHVyZS0+dHJhbnNpdGlvbk9mZnNldCgpKTsKICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIFByb3BlcnR5TWFwRW50cnkgZW50cnko c3RydWN0dXJlLT5tX3RyYW5zaXRpb25Qcm9wZXJ0eU5hbWUuZ2V0KCksIHN0cnVjdHVyZS0+dHJh bnNpdGlvbk9mZnNldCgpLCBzdHJ1Y3R1cmUtPnRyYW5zaXRpb25Qcm9wZXJ0eUF0dHJpYnV0ZXMo KSk7CiAgICAgICAgIGF1dG8gbmV4dE9mZnNldCA9IHRhYmxlLT5uZXh0T2Zmc2V0KHN0cnVjdHVy ZS0+aW5saW5lQ2FwYWNpdHkoKSk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQobmV4dE9mZnNldCwg bmV4dE9mZnNldCA9PSBzdHJ1Y3R1cmUtPnRyYW5zaXRpb25PZmZzZXQoKSk7Ci0gICAgICAgIGF1 dG8gcmVzdWx0ID0gdGFibGUtPmFkZChlbnRyeSk7CisgICAgICAgIGF1dG8gcmVzdWx0ID0gdGFi bGUtPmFkZCh2bSwgZW50cnkpOwogICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVzdWx0 LnNlY29uZCk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0LCByZXN1bHQuZmlyc3QuZmly c3QtPm9mZnNldCA9PSBuZXh0T2Zmc2V0KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJbmxpbmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJbmxpbmVzLmgKaW5kZXggZjE2YzAyYTc2ZDZkMTFlODJj ZmM4YWI0NjA5ZWMxOTJkNDFiYjEwYi4uN2UzZTBmYTg5MmEwODg1OWI4MDAwZDcyNTIyMDc5Nzg5 YjU0Njk3NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0 dXJlSW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVy ZUlubGluZXMuaApAQCAtNDY1LDcgKzQ2NSw3IEBAIGlubGluZSBQcm9wZXJ0eU9mZnNldCBTdHJ1 Y3R1cmU6OmFkZChWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIHVuc2lnbmVkCiAg ICAgbV9wcm9wZXJ0eUhhc2ggPSBtX3Byb3BlcnR5SGFzaCBeIHJlcC0+ZXhpc3RpbmdTeW1ib2xB d2FyZUhhc2goKTsKICAgICBtX3NlZW5Qcm9wZXJ0aWVzLmFkZChiaXR3aXNlX2Nhc3Q8dWludHB0 cl90PihyZXApKTsKIAotICAgIGF1dG8gcmVzdWx0ID0gdGFibGUtPmFkZChQcm9wZXJ0eU1hcEVu dHJ5KHJlcCwgbmV3T2Zmc2V0LCBhdHRyaWJ1dGVzKSk7CisgICAgYXV0byByZXN1bHQgPSB0YWJs ZS0+YWRkKHZtLCBQcm9wZXJ0eU1hcEVudHJ5KHJlcCwgbmV3T2Zmc2V0LCBhdHRyaWJ1dGVzKSk7 CiAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5zZWNvbmQpOwogICAgIEFTU0VSVF9V TlVTRUQocmVzdWx0LCByZXN1bHQuZmlyc3QuZmlyc3QtPm9mZnNldCA9PSBuZXdPZmZzZXQpOwog ICAgIGF1dG8gbmV3TWF4T2Zmc2V0ID0gc3RkOjptYXgobmV3T2Zmc2V0LCBtYXhPZmZzZXQoKSk7 CkBAIC01MDcsNyArNTA3LDcgQEAgaW5saW5lIFByb3BlcnR5T2Zmc2V0IFN0cnVjdHVyZTo6cmVt b3ZlKFZNJiB2bSwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgY29uc3QKICAgICAKICAgICBQ cm9wZXJ0eU9mZnNldCBvZmZzZXQgPSBwb3NpdGlvbi5maXJzdC0+b2Zmc2V0OwogCi0gICAgdGFi bGUtPnJlbW92ZShwb3NpdGlvbik7CisgICAgdGFibGUtPnJlbW92ZSh2bSwgcG9zaXRpb24pOwog ICAgIHRhYmxlLT5hZGREZWxldGVkT2Zmc2V0KG9mZnNldCk7CiAKICAgICBQcm9wZXJ0eU9mZnNl dCBuZXdNYXhPZmZzZXQgPSBtYXhPZmZzZXQoKTsK