147357 2015-07-28 02:53:05 -0700 [GTK] Use fastMalloc instead of g_slice 2015-07-28 03:04:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 1112695 0 cgarcia 2015-07-28 02:53:05 -0700 The use of g_slice is no longer encouraged by glib developers, see https://git.gnome.org/browse/gnome-devel-docs/tree/programming-guidelines/C/memory-management.page#n22 1112696 1 257640 cgarcia 2015-07-28 02:55:07 -0700 Created attachment 257640 Patch 1112697 2 cgarcia 2015-07-28 03:04:47 -0700 Committed r187485: <http://trac.webkit.org/changeset/187485> 257640 2015-07-28 02:55:07 -0700 2015-07-28 02:59:06 -0700 Patch wk2-no-gslice.diff text/plain 11842 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMjJiMmY1Li41NDMxYmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTUtMDctMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBmYXN0TWFsbG9jIGluc3RlYWQgb2YgZ19zbGljZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MzU3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHVzZSBvZiBn X3NsaWNlIGlzIG5vIGxvbmdlciBlbmNvdXJhZ2VkIGJ5IGdsaWIgZGV2ZWxvcGVycy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6bWFwR3N0QnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OnVu bWFwR3N0QnVmZmVyKToKKwogMjAxNS0wNy0yNyAgSm9uIERhdmlzICA8am9uZEBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkaW5nIFdlYiBDb21wb25lbnRzIHRvIGZlYXR1cmUgc3RhdHVzIHBhZ2Uu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv R1N0cmVhbWVyVXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3BwCmluZGV4IDhjNTU5NTUuLjk1NTQ4YWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3BwCkBAIC0xMDUsOSArMTA1LDkgQEAg Y2hhciogZ2V0R3N0QnVmZmVyRGF0YVBvaW50ZXIoR3N0QnVmZmVyKiBidWZmZXIpCiAKIHZvaWQg bWFwR3N0QnVmZmVyKEdzdEJ1ZmZlciogYnVmZmVyKQogewotICAgIEdzdE1hcEluZm8qIG1hcElu Zm8gPSBnX3NsaWNlX25ldyhHc3RNYXBJbmZvKTsKKyAgICBHc3RNYXBJbmZvKiBtYXBJbmZvID0g c3RhdGljX2Nhc3Q8R3N0TWFwSW5mbyo+KGZhc3RNYWxsb2Moc2l6ZW9mKEdzdE1hcEluZm8pKSk7 CiAgICAgaWYgKCFnc3RfYnVmZmVyX21hcChidWZmZXIsIG1hcEluZm8sIEdTVF9NQVBfV1JJVEUp KSB7Ci0gICAgICAgIGdfc2xpY2VfZnJlZShHc3RNYXBJbmZvLCBtYXBJbmZvKTsKKyAgICAgICAg ZmFzdEZyZWUobWFwSW5mbyk7CiAgICAgICAgIGdzdF9idWZmZXJfdW5yZWYoYnVmZmVyKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEyNSw3ICsxMjUsNyBAQCB2b2lkIHVubWFwR3N0QnVm ZmVyKEdzdEJ1ZmZlciogYnVmZmVyKQogICAgICAgICByZXR1cm47CiAKICAgICBnc3RfYnVmZmVy X3VubWFwKGJ1ZmZlciwgbWFwSW5mbyk7Ci0gICAgZ19zbGljZV9mcmVlKEdzdE1hcEluZm8sIG1h cEluZm8pOworICAgIGZhc3RGcmVlKG1hcEluZm8pOwogfQogCiBib29sIGluaXRpYWxpemVHU3Ry ZWFtZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IDY5Yjc0NDQuLjM5MjZlMTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxNS0wNy0yOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gVXNlIGZhc3RNYWxsb2MgaW5zdGVhZCBvZiBnX3Ns aWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcz NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg dXNlIG9mIGdfc2xpY2UgaXMgbm8gbG9uZ2VyIGVuY291cmFnZWQgYnkgZ2xpYiBkZXZlbG9wZXJz LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q3JlZGVudGlhbC5jcHA6Cisg ICAgICAgICh3ZWJraXRDcmVkZW50aWFsQ3JlYXRlKToKKyAgICAgICAgKHdlYmtpdF9jcmVkZW50 aWFsX2ZyZWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEphdmFzY3JpcHRS ZXN1bHQuY3BwOgorICAgICAgICAod2Via2l0SmF2YXNjcmlwdFJlc3VsdENyZWF0ZSk6CisgICAg ICAgICh3ZWJraXRfamF2YXNjcmlwdF9yZXN1bHRfdW5yZWYpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdE1pbWVJbmZvLmNwcDoKKyAgICAgICAgKHdlYmtpdE1pbWVJbmZvQ3Jl YXRlKToKKyAgICAgICAgKHdlYmtpdF9taW1lX2luZm9fdW5yZWYpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdE5hdmlnYXRpb25BY3Rpb24uY3BwOgorICAgICAgICAod2Via2l0 TmF2aWdhdGlvbkFjdGlvbkNyZWF0ZSk6CisgICAgICAgICh3ZWJraXRfbmF2aWdhdGlvbl9hY3Rp b25fY29weSk6CisgICAgICAgICh3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb25fZnJlZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFNjcmlwdERpYWxvZy5jcHA6CisgICAgICAgICh3ZWJraXRTY3Jp cHREaWFsb2dDb3B5KToKKyAgICAgICAgKHdlYmtpdFNjcmlwdERpYWxvZ0ZyZWUpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVzZXJDb250ZW50LmNwcDoKKyAgICAgICAgKHdl YmtpdF91c2VyX3N0eWxlX3NoZWV0X3VucmVmKToKKyAgICAgICAgKHdlYmtpdF91c2VyX3N0eWxl X3NoZWV0X25ldyk6CisgICAgICAgICh3ZWJraXRfdXNlcl9zY3JpcHRfdW5yZWYpOgorICAgICAg ICAod2Via2l0X3VzZXJfc2NyaXB0X25ldyk6CisKIDIwMTUtMDctMjcgIERhbiBCZXJuc3RlaW4g IDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSRUdSRVNTSU9OIChyMTg3Mzc2KTog Rm9ybSBlZGl0aW5nIGJ1dHRvbnMgYXJlIG1pc3NpbmcgZnJvbSB0aGUgU2hvcnRjdXQgQmFyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDcmVkZW50 aWFsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENyZWRlbnRp YWwuY3BwCmluZGV4IGM4ZGM0NzQuLmEyM2U3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENyZWRlbnRpYWwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENyZWRlbnRpYWwuY3BwCkBAIC03MSw3ICs3MSw3 IEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29yZTo6Q3JlZGVudGlhbFBlcnNpc3RlbmNlIHRvV2ViQ29y ZUNyZWRlbnRpYWxQZXJzaXN0ZW5jZShXZWJLCiAKIFdlYktpdENyZWRlbnRpYWwqIHdlYmtpdENy ZWRlbnRpYWxDcmVhdGUoY29uc3QgV2ViQ29yZTo6Q3JlZGVudGlhbCYgY29yZUNyZWRlbnRpYWwp CiB7Ci0gICAgV2ViS2l0Q3JlZGVudGlhbCogY3JlZGVudGlhbCA9IGdfc2xpY2VfbmV3KFdlYktp dENyZWRlbnRpYWwpOworICAgIFdlYktpdENyZWRlbnRpYWwqIGNyZWRlbnRpYWwgPSBzdGF0aWNf Y2FzdDxXZWJLaXRDcmVkZW50aWFsKj4oZmFzdE1hbGxvYyhzaXplb2YoV2ViS2l0Q3JlZGVudGlh bCkpKTsKICAgICBuZXcgKGNyZWRlbnRpYWwpIFdlYktpdENyZWRlbnRpYWwoY29yZUNyZWRlbnRp YWwpOwogICAgIHJldHVybiBjcmVkZW50aWFsOwogfQpAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQg d2Via2l0X2NyZWRlbnRpYWxfZnJlZShXZWJLaXRDcmVkZW50aWFsKiBjcmVkZW50aWFsKQogICAg IGdfcmV0dXJuX2lmX2ZhaWwoY3JlZGVudGlhbCk7CiAKICAgICBjcmVkZW50aWFsLT5+V2ViS2l0 Q3JlZGVudGlhbCgpOwotICAgIGdfc2xpY2VfZnJlZShXZWJLaXRDcmVkZW50aWFsLCBjcmVkZW50 aWFsKTsKKyAgICBmYXN0RnJlZShjcmVkZW50aWFsKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRKYXZhc2NyaXB0UmVzdWx0LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEphdmFzY3JpcHRSZXN1 bHQuY3BwCmluZGV4IDIyMWVhYzcuLjc5ZWM2OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEphdmFzY3JpcHRSZXN1bHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEphdmFzY3JpcHRSZXN1bHQuY3BwCkBA IC00NCw3ICs0NCw3IEBAIEdfREVGSU5FX0JPWEVEX1RZUEUoV2ViS2l0SmF2YXNjcmlwdFJlc3Vs dCwgd2Via2l0X2phdmFzY3JpcHRfcmVzdWx0LCB3ZWJraXRfamF2CiAKIFdlYktpdEphdmFzY3Jp cHRSZXN1bHQqIHdlYmtpdEphdmFzY3JpcHRSZXN1bHRDcmVhdGUoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlJiBzZXJpYWxpemVkU2NyaXB0VmFs dWUpCiB7Ci0gICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCogcmVzdWx0ID0gZ19zbGljZV9uZXco V2ViS2l0SmF2YXNjcmlwdFJlc3VsdCk7CisgICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCogcmVz dWx0ID0gc3RhdGljX2Nhc3Q8V2ViS2l0SmF2YXNjcmlwdFJlc3VsdCo+KGZhc3RNYWxsb2Moc2l6 ZW9mKFdlYktpdEphdmFzY3JpcHRSZXN1bHQpKSk7CiAgICAgbmV3IChyZXN1bHQpIFdlYktpdEph dmFzY3JpcHRSZXN1bHQod2ViVmlldywgc2VyaWFsaXplZFNjcmlwdFZhbHVlKTsKICAgICByZXR1 cm4gcmVzdWx0OwogfQpAQCAtNzcsNyArNzcsNyBAQCB2b2lkIHdlYmtpdF9qYXZhc2NyaXB0X3Jl c3VsdF91bnJlZihXZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBqYXZhc2NyaXB0UmVzdWx0KQogewog ICAgIGlmIChnX2F0b21pY19pbnRfZGVjX2FuZF90ZXN0KCZqYXZhc2NyaXB0UmVzdWx0LT5yZWZl cmVuY2VDb3VudCkpIHsKICAgICAgICAgamF2YXNjcmlwdFJlc3VsdC0+fldlYktpdEphdmFzY3Jp cHRSZXN1bHQoKTsKLSAgICAgICAgZ19zbGljZV9mcmVlKFdlYktpdEphdmFzY3JpcHRSZXN1bHQs IGphdmFzY3JpcHRSZXN1bHQpOworICAgICAgICBmYXN0RnJlZShqYXZhc2NyaXB0UmVzdWx0KTsK ICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdE1pbWVJbmZvLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdE1pbWVJbmZvLmNwcAppbmRleCA5OTU0Y2ZiLi5hZjYxZGM2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRNaW1lSW5mby5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0TWltZUluZm8uY3BwCkBAIC00Miw3 ICs0Miw3IEBAIEdfREVGSU5FX0JPWEVEX1RZUEUoV2ViS2l0TWltZUluZm8sIHdlYmtpdF9taW1l X2luZm8sIHdlYmtpdF9taW1lX2luZm9fcmVmLCB3ZWJrCiAKIFdlYktpdE1pbWVJbmZvKiB3ZWJr aXRNaW1lSW5mb0NyZWF0ZShjb25zdCBXZWJDb3JlOjpNaW1lQ2xhc3NJbmZvJiBtaW1lSW5mbykK IHsKLSAgICBXZWJLaXRNaW1lSW5mbyogaW5mbyA9IGdfc2xpY2VfbmV3KFdlYktpdE1pbWVJbmZv KTsKKyAgICBXZWJLaXRNaW1lSW5mbyogaW5mbyA9IHN0YXRpY19jYXN0PFdlYktpdE1pbWVJbmZv Kj4oZmFzdE1hbGxvYyhzaXplb2YoV2ViS2l0TWltZUluZm8pKSk7CiAgICAgbmV3IChpbmZvKSBX ZWJLaXRNaW1lSW5mbyhtaW1lSW5mbyk7CiAgICAgcmV0dXJuIGluZm87CiB9CkBAIC03NSw3ICs3 NSw3IEBAIHZvaWQgd2Via2l0X21pbWVfaW5mb191bnJlZihXZWJLaXRNaW1lSW5mbyogaW5mbykK IHsKICAgICBpZiAoZ19hdG9taWNfaW50X2RlY19hbmRfdGVzdCgmaW5mby0+cmVmZXJlbmNlQ291 bnQpKSB7CiAgICAgICAgIGluZm8tPn5XZWJLaXRNaW1lSW5mbygpOwotICAgICAgICBnX3NsaWNl X2ZyZWUoV2ViS2l0TWltZUluZm8sIGluZm8pOworICAgICAgICBmYXN0RnJlZShpbmZvKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdE5hdmlnYXRpb25BY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0TmF2aWdhdGlvbkFjdGlvbi5jcHAKaW5kZXggYWZmNjI4My4uYmNjZThiYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0TmF2aWdhdGlv bkFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 TmF2aWdhdGlvbkFjdGlvbi5jcHAKQEAgLTMwLDcgKzMwLDcgQEAgR19ERUZJTkVfQk9YRURfVFlQ RShXZWJLaXROYXZpZ2F0aW9uQWN0aW9uLCB3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb24sIHdlYmtp dF9uYXYKIAogV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogd2Via2l0TmF2aWdhdGlvbkFjdGlvbkNy ZWF0ZShXZWJLaXRVUklSZXF1ZXN0KiByZXF1ZXN0LCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uRGF0 YSYgbmF2aWdhdGlvbkFjdGlvbkRhdGEpCiB7Ci0gICAgV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiog bmF2aWdhdGlvbiA9IGdfc2xpY2VfbmV3MChXZWJLaXROYXZpZ2F0aW9uQWN0aW9uKTsKKyAgICBX ZWJLaXROYXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uID0gc3RhdGljX2Nhc3Q8V2ViS2l0TmF2 aWdhdGlvbkFjdGlvbio+KGZhc3RaZXJvZWRNYWxsb2Moc2l6ZW9mKFdlYktpdE5hdmlnYXRpb25B Y3Rpb24pKSk7CiAgICAgbmV3IChuYXZpZ2F0aW9uKSBXZWJLaXROYXZpZ2F0aW9uQWN0aW9uKHJl cXVlc3QsIG5hdmlnYXRpb25BY3Rpb25EYXRhKTsKICAgICByZXR1cm4gbmF2aWdhdGlvbjsKIH0K QEAgLTQ5LDcgKzQ5LDcgQEAgV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogd2Via2l0X25hdmlnYXRp b25fYWN0aW9uX2NvcHkoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogbmEKIHsKICAgICBnX3JldHVy bl92YWxfaWZfZmFpbChuYXZpZ2F0aW9uLCBudWxscHRyKTsKIAotICAgIFdlYktpdE5hdmlnYXRp b25BY3Rpb24qIGNvcHkgPSBnX3NsaWNlX25ldzAoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbik7Cisg ICAgV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogY29weSA9IHN0YXRpY19jYXN0PFdlYktpdE5hdmln YXRpb25BY3Rpb24qPihmYXN0WmVyb2VkTWFsbG9jKHNpemVvZihXZWJLaXROYXZpZ2F0aW9uQWN0 aW9uKSkpOwogICAgIG5ldyAoY29weSkgV2ViS2l0TmF2aWdhdGlvbkFjdGlvbihuYXZpZ2F0aW9u KTsKICAgICByZXR1cm4gY29weTsKIH0KQEAgLTY3LDcgKzY3LDcgQEAgdm9pZCB3ZWJraXRfbmF2 aWdhdGlvbl9hY3Rpb25fZnJlZShXZWJLaXROYXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uKQog ICAgIGdfcmV0dXJuX2lmX2ZhaWwobmF2aWdhdGlvbik7CiAKICAgICBuYXZpZ2F0aW9uLT5+V2Vi S2l0TmF2aWdhdGlvbkFjdGlvbigpOwotICAgIGdfc2xpY2VfZnJlZShXZWJLaXROYXZpZ2F0aW9u QWN0aW9uLCBuYXZpZ2F0aW9uKTsKKyAgICBmYXN0RnJlZShuYXZpZ2F0aW9uKTsKIH0KIAogLyoq CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2 YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmgK aW5kZXggMzRlMTdmYi4uYzk5NWNkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFByaXZhdGUuaApAQCAtNTMsMTQgKzUzLDE0IEBACiAjZGVmaW5lIFdF QktJVF9ERUZJTkVfQVNZTkNfREFUQV9TVFJVQ1Qoc3RydWN0TmFtZSkgXAogc3RhdGljIHN0cnVj dE5hbWUqIGNyZWF0ZSMjc3RydWN0TmFtZSgpIFwKIHsgXAotICAgIHN0cnVjdE5hbWUqIGRhdGEg PSBnX3NsaWNlX25ldzAoc3RydWN0TmFtZSk7IFwKKyAgICBzdHJ1Y3ROYW1lKiBkYXRhID0gc3Rh dGljX2Nhc3Q8c3RydWN0TmFtZSo+KGZhc3RaZXJvZWRNYWxsb2Moc2l6ZW9mKHN0cnVjdE5hbWUp KSk7IFwKICAgICBuZXcgKGRhdGEpIHN0cnVjdE5hbWUoKTsgXAogICAgIHJldHVybiBkYXRhOyBc CiB9IFwKIHN0YXRpYyB2b2lkIGRlc3Ryb3kjI3N0cnVjdE5hbWUoc3RydWN0TmFtZSogZGF0YSkg XAogeyBcCiAgICAgZGF0YS0+fnN0cnVjdE5hbWUoKTsgXAotICAgIGdfc2xpY2VfZnJlZShzdHJ1 Y3ROYW1lLCBkYXRhKTsgXAorICAgIGZhc3RGcmVlKGRhdGEpOyBcCiB9CiAKICNkZWZpbmUgV0VC S0lUX0RFRklORV9UWVBFKFR5cGVOYW1lLCB0eXBlX25hbWUsIFRZUEVfUEFSRU5UKSBfV0VCS0lU X0RFRklORV9UWVBFX0VYVEVOREVEKFR5cGVOYW1lLCB0eXBlX25hbWUsIFRZUEVfUEFSRU5ULCAw LCB7IH0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRTY3JpcHREaWFsb2cuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0U2NyaXB0RGlhbG9nLmNwcAppbmRleCA4NjM2NjVkLi45Y2Y4NmFiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTY3JpcHREaWFsb2cuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNjcmlwdERpYWxvZy5j cHAKQEAgLTI0LDcgKzI0LDcgQEAKIAogc3RhdGljIFdlYktpdFNjcmlwdERpYWxvZyogd2Via2l0 U2NyaXB0RGlhbG9nQ29weShXZWJLaXRTY3JpcHREaWFsb2cqIGRpYWxvZykKIHsKLSAgICBXZWJL aXRTY3JpcHREaWFsb2cqIGNvcHkgPSBnX3NsaWNlX25ldzAoV2ViS2l0U2NyaXB0RGlhbG9nKTsK KyAgICBXZWJLaXRTY3JpcHREaWFsb2cqIGNvcHkgPSBzdGF0aWNfY2FzdDxXZWJLaXRTY3JpcHRE aWFsb2cqPihmYXN0WmVyb2VkTWFsbG9jKHNpemVvZihXZWJLaXRTY3JpcHREaWFsb2cpKSk7CiAg ICAgbmV3IChjb3B5KSBXZWJLaXRTY3JpcHREaWFsb2coZGlhbG9nKTsKICAgICByZXR1cm4gY29w eTsKIH0KQEAgLTMyLDcgKzMyLDcgQEAgc3RhdGljIFdlYktpdFNjcmlwdERpYWxvZyogd2Via2l0 U2NyaXB0RGlhbG9nQ29weShXZWJLaXRTY3JpcHREaWFsb2cqIGRpYWxvZykKIHN0YXRpYyB2b2lk IHdlYmtpdFNjcmlwdERpYWxvZ0ZyZWUoV2ViS2l0U2NyaXB0RGlhbG9nKiBkaWFsb2cpCiB7CiAg ICAgZGlhbG9nLT5+V2ViS2l0U2NyaXB0RGlhbG9nKCk7Ci0gICAgZ19zbGljZV9mcmVlKFdlYktp dFNjcmlwdERpYWxvZywgZGlhbG9nKTsKKyAgICBmYXN0RnJlZShkaWFsb2cpOwogfQogCiBHX0RF RklORV9CT1hFRF9UWVBFKFdlYktpdFNjcmlwdERpYWxvZywgd2Via2l0X3NjcmlwdF9kaWFsb2cs IHdlYmtpdFNjcmlwdERpYWxvZ0NvcHksIHdlYmtpdFNjcmlwdERpYWxvZ0ZyZWUpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVc2VyQ29udGVudC5j cHAKaW5kZXggOTg3MmExMy4uYjgxZWUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0VXNlckNvbnRlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVzZXJDb250ZW50LmNwcApAQCAtMTM2LDcgKzEzNiw3 IEBAIHZvaWQgd2Via2l0X3VzZXJfc3R5bGVfc2hlZXRfdW5yZWYoV2ViS2l0VXNlclN0eWxlU2hl ZXQqIHVzZXJTdHlsZVNoZWV0KQogewogICAgIGlmIChnX2F0b21pY19pbnRfZGVjX2FuZF90ZXN0 KCZ1c2VyU3R5bGVTaGVldC0+cmVmZXJlbmNlQ291bnQpKSB7CiAgICAgICAgIHVzZXJTdHlsZVNo ZWV0LT5+V2ViS2l0VXNlclN0eWxlU2hlZXQoKTsKLSAgICAgICAgZ19zbGljZV9mcmVlKFdlYktp dFVzZXJTdHlsZVNoZWV0LCB1c2VyU3R5bGVTaGVldCk7CisgICAgICAgIGZhc3RGcmVlKHVzZXJT dHlsZVNoZWV0KTsKICAgICB9CiB9CiAKQEAgLTE2Myw3ICsxNjMsNyBAQCB2b2lkIHdlYmtpdF91 c2VyX3N0eWxlX3NoZWV0X3VucmVmKFdlYktpdFVzZXJTdHlsZVNoZWV0KiB1c2VyU3R5bGVTaGVl dCkKIFdlYktpdFVzZXJTdHlsZVNoZWV0KiB3ZWJraXRfdXNlcl9zdHlsZV9zaGVldF9uZXcoY29u c3QgZ2NoYXIqIHNvdXJjZSwgV2ViS2l0VXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3Rl ZEZyYW1lcywgV2ViS2l0VXNlclN0eWxlTGV2ZWwgbGV2ZWwsIGNvbnN0IGNoYXIqIGNvbnN0KiB3 aGl0ZWxpc3QsIGNvbnN0IGNoYXIqIGNvbnN0KiBibGFja2xpc3QpCiB7CiAgICAgZ19yZXR1cm5f dmFsX2lmX2ZhaWwoc291cmNlLCBudWxscHRyKTsKLSAgICBXZWJLaXRVc2VyU3R5bGVTaGVldCog dXNlclN0eWxlU2hlZXQgPSBnX3NsaWNlX25ldyhXZWJLaXRVc2VyU3R5bGVTaGVldCk7CisgICAg V2ViS2l0VXNlclN0eWxlU2hlZXQqIHVzZXJTdHlsZVNoZWV0ID0gc3RhdGljX2Nhc3Q8V2ViS2l0 VXNlclN0eWxlU2hlZXQqPihmYXN0TWFsbG9jKHNpemVvZihXZWJLaXRVc2VyU3R5bGVTaGVldCkp KTsKICAgICBuZXcgKHVzZXJTdHlsZVNoZWV0KSBXZWJLaXRVc2VyU3R5bGVTaGVldChzb3VyY2Us IGluamVjdGVkRnJhbWVzLCBsZXZlbCwgd2hpdGVsaXN0LCBibGFja2xpc3QpOwogICAgIHJldHVy biB1c2VyU3R5bGVTaGVldDsKIH0KQEAgLTIyMiw3ICsyMjIsNyBAQCB2b2lkIHdlYmtpdF91c2Vy X3NjcmlwdF91bnJlZihXZWJLaXRVc2VyU2NyaXB0KiB1c2VyU2NyaXB0KQogewogICAgIGlmIChn X2F0b21pY19pbnRfZGVjX2FuZF90ZXN0KCZ1c2VyU2NyaXB0LT5yZWZlcmVuY2VDb3VudCkpIHsK ICAgICAgICAgdXNlclNjcmlwdC0+fldlYktpdFVzZXJTY3JpcHQoKTsKLSAgICAgICAgZ19zbGlj ZV9mcmVlKFdlYktpdFVzZXJTY3JpcHQsIHVzZXJTY3JpcHQpOworICAgICAgICBmYXN0RnJlZSh1 c2VyU2NyaXB0KTsKICAgICB9CiB9CiAKQEAgLTI0OSw3ICsyNDksNyBAQCB2b2lkIHdlYmtpdF91 c2VyX3NjcmlwdF91bnJlZihXZWJLaXRVc2VyU2NyaXB0KiB1c2VyU2NyaXB0KQogV2ViS2l0VXNl clNjcmlwdCogd2Via2l0X3VzZXJfc2NyaXB0X25ldyhjb25zdCBnY2hhciogc291cmNlLCBXZWJL aXRVc2VyQ29udGVudEluamVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzLCBXZWJLaXRVc2VyU2Ny aXB0SW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lLCBjb25zdCBnY2hhciogY29uc3QqIHdoaXRl bGlzdCwgY29uc3QgZ2NoYXIqIGNvbnN0KiBibGFja2xpc3QpCiB7CiAgICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwoc291cmNlLCBudWxscHRyKTsKLSAgICBXZWJLaXRVc2VyU2NyaXB0KiB1c2VyU2Ny aXB0ID0gZ19zbGljZV9uZXcoV2ViS2l0VXNlclNjcmlwdCk7CisgICAgV2ViS2l0VXNlclNjcmlw dCogdXNlclNjcmlwdCA9IHN0YXRpY19jYXN0PFdlYktpdFVzZXJTY3JpcHQqPihmYXN0TWFsbG9j KHNpemVvZihXZWJLaXRVc2VyU2NyaXB0KSkpOwogICAgIG5ldyAodXNlclNjcmlwdCkgV2ViS2l0 VXNlclNjcmlwdChzb3VyY2UsIGluamVjdGVkRnJhbWVzLCBpbmplY3Rpb25UaW1lLCB3aGl0ZWxp c3QsIGJsYWNrbGlzdCk7CiAgICAgcmV0dXJuIHVzZXJTY3JpcHQ7CiB9Cg==