223189 2021-03-15 10:00:07 -0700 [GTK][WPE] Stop using g_memdup 2021-03-16 08:07:25 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned benjamin berto bugs-noreply calvaris cdumez cmarcelo eric.carlson ews-watchlist glenn gustavo hta jer.noble menard philipj pnormand sergio tommyw vjaquez oldest_to_newest 1739489 0 cgarcia 2021-03-15 10:00:07 -0700 It's deprecated in GLib now because of the possibility of overflow when converting from size_t to unsigned int. 1739498 1 423192 cgarcia 2021-03-15 10:10:15 -0700 Created attachment 423192 Patch 1739499 2 ews-watchlist 2021-03-15 10:11:24 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1739941 3 cgarcia 2021-03-16 08:07:25 -0700 Committed r274479 (235335@main): <https://commits.webkit.org/235335@main> 423192 2021-03-15 10:10:15 -0700 2021-03-15 10:19:36 -0700 Patch wk-memdup.diff text/plain 10987 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggODljNTA1MjkyNTg5Li4zNDYyMDkwOTkzMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIw MjEtMDMtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdW1dQRV0gU3RvcCB1c2luZyBnX21lbWR1cAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTg5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGZhc3RNZW1EdXAoKSB0byByZXBsYWNl IGdfbWVtZHVwKCkgdGhhdCBpcyBub3cgZGVwcmVjYXRlZCBpbiBHTGliIGJlY2F1c2Ugb2YgdGhl IHBvc3NpYmlsaXR5IG9mIG92ZXJmbG93CisgICAgICAgIHdoZW4gY29udmVydGluZyBmcm9tIHNp emVfdCB0byB1bnNpZ25lZCBpbnQuIFRoZXJlJ3MgYSByZXBsYWNlbWVudCBpbiBHTGliIGFscmVh ZHksIGJ1dCB3ZSB3b3VsZCBuZWVkIHRvIGRlcGVuZAorICAgICAgICBvbiB2ZXJ5IG5ldyBHTGli IHZlcnNpb24sIHNvIGJldHRlciB1c2UgZmFzdE1lbUR1cCgpIHdoZW4gcG9zc2libGUuIEluIGNh c2VzIHdoZXJlIHdlIHN0aWxsIG5lZWQgdG8gdXNlIEdMaWIKKyAgICAgICAgYWxsb2NhdG9yLCB3 ZSBjYW4gc2ltcGx5IGNhbGwgZ19tYWxsb2MoKSArIG1lbWNweSgpLgorCisgICAgICAgICogd3Rm L0Zhc3RNYWxsb2MuY3BwOgorICAgICAgICAoV1RGOjpmYXN0TWVtRHVwKToKKyAgICAgICAgKiB3 dGYvRmFzdE1hbGxvYy5oOgorCiAyMDIxLTAzLTEzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0IERETWFjQWN0aW9uIGluc3RlYWQgb2YgRERB Y3Rpb24gb24gbWFjT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Zhc3RNYWxsb2MuY3Bw IGIvU291cmNlL1dURi93dGYvRmFzdE1hbGxvYy5jcHAKaW5kZXggYzIyOGQzYjJhMjhjLi42MDNj NjM4OWE1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0Zhc3RNYWxsb2MuY3BwCisrKyBi L1NvdXJjZS9XVEYvd3RmL0Zhc3RNYWxsb2MuY3BwCkBAIC05Nyw2ICs5NywxNiBAQCBjaGFyKiBm YXN0U3RyRHVwKGNvbnN0IGNoYXIqIHNyYykKICAgICByZXR1cm4gZHVwOwogfQogCit2b2lkKiBm YXN0TWVtRHVwKGNvbnN0IHZvaWQqIG1lbSwgc2l6ZV90IGJ5dGVzKQoreworICAgIGlmICghbWVt IHx8ICFieXRlcykKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICB2b2lkKiByZXN1bHQg PSBmYXN0TWFsbG9jKGJ5dGVzKTsKKyAgICBtZW1jcHkocmVzdWx0LCBtZW0sIGJ5dGVzKTsKKyAg ICByZXR1cm4gcmVzdWx0OworfQorCiBUcnlNYWxsb2NSZXR1cm5WYWx1ZSB0cnlGYXN0WmVyb2Vk TWFsbG9jKHNpemVfdCBuKSAKIHsKICAgICB2b2lkKiByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV1RGL3d0Zi9GYXN0TWFsbG9jLmggYi9Tb3VyY2UvV1RGL3d0Zi9GYXN0TWFsbG9jLmgKaW5k ZXggZDZmZTNlYTU3ZWY3Li45YTUwMGEwMWM3MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L0Zhc3RNYWxsb2MuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9GYXN0TWFsbG9jLmgKQEAgLTkzLDYg KzkzLDcgQEAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQqIGZhc3RaZXJvZWRNYWxsb2Moc2l6ZV90 KSBSRVRVUk5TX05PTk5VTEw7CiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCogZmFzdENhbGxvYyhz aXplX3QgbnVtRWxlbWVudHMsIHNpemVfdCBlbGVtZW50U2l6ZSkgUkVUVVJOU19OT05OVUxMOwog V1RGX0VYUE9SVF9QUklWQVRFIHZvaWQqIGZhc3RSZWFsbG9jKHZvaWQqLCBzaXplX3QpIFJFVFVS TlNfTk9OTlVMTDsKIFdURl9FWFBPUlRfUFJJVkFURSBjaGFyKiBmYXN0U3RyRHVwKGNvbnN0IGNo YXIqKSBSRVRVUk5TX05PTk5VTEw7CitXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCogZmFzdE1lbUR1 cChjb25zdCB2b2lkKiwgc2l6ZV90KTsKIAogV1RGX0VYUE9SVF9QUklWQVRFIFRyeU1hbGxvY1Jl dHVyblZhbHVlIHRyeUZhc3RNYWxsb2Moc2l6ZV90KTsKIFdURl9FWFBPUlRfUFJJVkFURSBUcnlN YWxsb2NSZXR1cm5WYWx1ZSB0cnlGYXN0WmVyb2VkTWFsbG9jKHNpemVfdCk7CkBAIC0zMDgsNiAr MzA5LDcgQEAgdXNpbmcgV1RGOjpmYXN0RnJlZTsKIHVzaW5nIFdURjo6ZmFzdE1hbGxvYzsKIHVz aW5nIFdURjo6ZmFzdE1hbGxvY0dvb2RTaXplOwogdXNpbmcgV1RGOjpmYXN0TWFsbG9jU2l6ZTsK K3VzaW5nIFdURjo6ZmFzdE1lbUR1cDsKIHVzaW5nIFdURjo6ZmFzdFJlYWxsb2M7CiB1c2luZyBX VEY6OmZhc3RTdHJEdXA7CiB1c2luZyBXVEY6OmZhc3RaZXJvZWRNYWxsb2M7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZWE0MDFjMTk5MzcwLi5hOTZkZDE0MWIyN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBA QAorMjAyMS0wMy0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS11bV1BFXSBTdG9wIHVzaW5nIGdfbWVtZHVwCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMxODkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZ3N0QnVmZmVyTmV3V3JhcHBl ZEZhc3QoKSB0byBjcmVhdGUgYSBHc3RCdWZmZXIgd3JhcHBpbmcgZGF0YSBhbGxvY2F0ZWQgd2l0 aCBmYXN0IG1hbGxvYyBhbmQgdXNlIGl0IHdoZW4KKyAgICAgICAgcG9zc2libGUgaW4gY29tYmlu YXRpb24gd2l0aCBmYXN0TWVtRHVwKCkgaW5zdGVhZCBvZiBnX21lbWR1cCgpLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpnc3RCdWZmZXJOZXdXcmFwcGVkRmFzdCk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAg ICAgICAoQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL1JlYWx0aW1lSW5jb21pbmdBdWRp b1NvdXJjZUxpYldlYlJUQy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZUluY29taW5n QXVkaW9Tb3VyY2VMaWJXZWJSVEM6Ok9uRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZpZGVvRGVjb2RlckZhY3RvcnkuY3BwOgorCiAyMDIx LTAzLTEzICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIElt cHJvdmUgY29kaW5nIHN0eWxlIG9mIENTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNv bW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyQ29tbW9uLmNwcAppbmRleCAzZGY3NjQ1NjM4NGEuLjAyNmFlMTMzNjMyOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1l ckNvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL0dTdHJlYW1lckNvbW1vbi5jcHAKQEAgLTUwMyw2ICs1MDMsMTEgQEAgYm9vbCB3ZWJraXRH c3RTZXRFbGVtZW50U3RhdGVTeW5jaHJvbm91c2x5KEdzdEVsZW1lbnQqIHBpcGVsaW5lLCBHc3RT dGF0ZSB0YXJnZXQKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorR3N0QnVmZmVyKiBnc3RCdWZmZXJO ZXdXcmFwcGVkRmFzdCh2b2lkKiBkYXRhLCBzaXplX3QgbGVuZ3RoKQoreworICAgIHJldHVybiBn c3RfYnVmZmVyX25ld193cmFwcGVkX2Z1bGwoc3RhdGljX2Nhc3Q8R3N0TWVtb3J5RmxhZ3M+KDAp LCBkYXRhLCBsZW5ndGgsIDAsIGxlbmd0aCwgZGF0YSwgZmFzdEZyZWUpOworfQorCiB9CiAKICNl bmRpZiAvLyBVU0UoR1NUUkVBTUVSKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCmluZGV4IDViNmRj NmI5OGZkMy4uZmM2YThhYWQ0OGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCkBAIC0zMDAs NiArMzAwLDggQEAgYm9vbCB3ZWJraXRHc3RTZXRFbGVtZW50U3RhdGVTeW5jaHJvbm91c2x5KEdz dEVsZW1lbnQqLCBHc3RTdGF0ZSwgRnVuY3Rpb248Ym9vbCgKICAgICByZXR1cm4gdHJ1ZTsKIH0p OwogCitHc3RCdWZmZXIqIGdzdEJ1ZmZlck5ld1dyYXBwZWRGYXN0KHZvaWQqIGRhdGEsIHNpemVf dCBsZW5ndGgpOworCiB9CiAKICNpZm5kZWYgR1NUX0JVRkZFUl9EVFNfT1JfUFRTCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IDQwM2ZiMGFjNGQyZS4u ZGIzNjQ0NzM0NTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVy LmNwcApAQCAtMTEyNiw3ICsxMTI2LDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0Ns aWVudDo6ZGF0YVJlY2VpdmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IGMKIAogICAg IGNoZWNrVXBkYXRlQmxvY2tzaXplKGxlbmd0aCk7CiAKLSAgICBHc3RCdWZmZXIqIGJ1ZmZlciA9 IGdzdF9idWZmZXJfbmV3X3dyYXBwZWQoZ19tZW1kdXAoZGF0YSwgbGVuZ3RoKSwgbGVuZ3RoKTsK KyAgICBHc3RCdWZmZXIqIGJ1ZmZlciA9IGdzdEJ1ZmZlck5ld1dyYXBwZWRGYXN0KGZhc3RNZW1E dXAoZGF0YSwgbGVuZ3RoKSwgbGVuZ3RoKTsKICAgICBnc3RfYWRhcHRlcl9wdXNoKG1lbWJlcnMt PmFkYXB0ZXIuZ2V0KCksIGJ1ZmZlcik7CiAgICAgc3RvcExvYWRlcklmTmVlZGVkKHNyYywgbWVt YmVycyk7CiAgICAgbWVtYmVycy0+cmVzcG9uc2VDb25kaXRpb24ubm90aWZ5T25lKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvUmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlTGliV2ViUlRDLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VM aWJXZWJSVEMuY3BwCmluZGV4IGE5MDFmMjllOGI0Zi4uMTIxOTRjOWQ0ZTA1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvUmVhbHRpbWVJ bmNvbWluZ0F1ZGlvU291cmNlTGliV2ViUlRDLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlTGli V2ViUlRDLmNwcApAQCAtNjUsMTMgKzY1LDEzIEBAIHZvaWQgUmVhbHRpbWVJbmNvbWluZ0F1ZGlv U291cmNlTGliV2ViUlRDOjpPbkRhdGEoY29uc3Qgdm9pZCogYXVkaW9EYXRhLCBpbnQsIGluCiAg ICAgZ3N0X2F1ZGlvX2luZm9fc2V0X2Zvcm1hdCgmaW5mbywgZm9ybWF0LCBzYW1wbGVSYXRlLCBu dW1iZXJPZkNoYW5uZWxzLCBOVUxMKTsKIAogICAgIGF1dG8gYnVmZmVyU2l6ZSA9IEdTVF9BVURJ T19JTkZPX0JQRigmaW5mbykgKiBudW1iZXJPZkZyYW1lczsKLSAgICBncG9pbnRlciBidWZmZXJE YXRhID0gZ19tYWxsb2MoYnVmZmVyU2l6ZSk7CisgICAgZ3BvaW50ZXIgYnVmZmVyRGF0YSA9IGZh c3RNYWxsb2MoYnVmZmVyU2l6ZSk7CiAgICAgaWYgKG11dGVkKCkpCiAgICAgICAgIGdzdF9hdWRp b19mb3JtYXRfZmlsbF9zaWxlbmNlKGluZm8uZmluZm8sIGJ1ZmZlckRhdGEsIGJ1ZmZlclNpemUp OwogICAgIGVsc2UKICAgICAgICAgbWVtY3B5KGJ1ZmZlckRhdGEsIGF1ZGlvRGF0YSwgYnVmZmVy U2l6ZSk7CiAKLSAgICBhdXRvIGJ1ZmZlciA9IGFkb3B0R1JlZihnc3RfYnVmZmVyX25ld193cmFw cGVkKGJ1ZmZlckRhdGEsIGJ1ZmZlclNpemUpKTsKKyAgICBhdXRvIGJ1ZmZlciA9IGFkb3B0R1Jl Zihnc3RCdWZmZXJOZXdXcmFwcGVkRmFzdChidWZmZXJEYXRhLCBidWZmZXJTaXplKSk7CiAgICAg YXV0byBjYXBzID0gYWRvcHRHUmVmKGdzdF9hdWRpb19pbmZvX3RvX2NhcHMoJmluZm8pKTsKICAg ICBhdXRvIHNhbXBsZSA9IGFkb3B0R1JlZihnc3Rfc2FtcGxlX25ldyhidWZmZXIuZ2V0KCksIGNh cHMuZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKICAgICBHU3RyZWFtZXJBdWRpb0RhdGEgZGF0 YShXVEZNb3ZlKHNhbXBsZSksIGluZm8pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZpZGVvRGVjb2RlckZhY3Rvcnku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJl YW1lclZpZGVvRGVjb2RlckZhY3RvcnkuY3BwCmluZGV4IGQ2NWU1NjQ0Njc5Ni4uOTA4YmU1MDUx M2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9saWJ3 ZWJydGMvR1N0cmVhbWVyVmlkZW9EZWNvZGVyRmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZpZGVvRGVjb2RlckZh Y3RvcnkuY3BwCkBAIC0yMTMsNyArMjEzLDcgQEAgcHVibGljOgogICAgICAgICB9CiAKICAgICAg ICAgLy8gRklYTUUtIFVzZSBhIEdzdEJ1ZmZlclBvb2wuCi0gICAgICAgIGF1dG8gYnVmZmVyID0g YWRvcHRHUmVmKGdzdF9idWZmZXJfbmV3X3dyYXBwZWQoZ19tZW1kdXAoaW5wdXRJbWFnZS5kYXRh KCksIGlucHV0SW1hZ2Uuc2l6ZSgpKSwKKyAgICAgICAgYXV0byBidWZmZXIgPSBhZG9wdEdSZWYo Z3N0QnVmZmVyTmV3V3JhcHBlZEZhc3QoZmFzdE1lbUR1cChpbnB1dEltYWdlLmRhdGEoKSwgaW5w dXRJbWFnZS5zaXplKCkpLAogICAgICAgICAgICAgaW5wdXRJbWFnZS5zaXplKCkpKTsKICAgICAg ICAgR1NUX0JVRkZFUl9EVFMoYnVmZmVyLmdldCgpKSA9IChzdGF0aWNfY2FzdDxndWludDY0Pihp bnB1dEltYWdlLlRpbWVzdGFtcCgpKSAqIEdTVF9NU0VDT05EKSAtIG1fZmlyc3RCdWZmZXJEdHM7 CiAgICAgICAgIEdTVF9CVUZGRVJfUFRTKGJ1ZmZlci5nZXQoKSkgPSAoc3RhdGljX2Nhc3Q8Z3Vp bnQ2ND4ocmVuZGVyVGltZU1zKSAqIEdTVF9NU0VDT05EKSAtIG1fZmlyc3RCdWZmZXJQdHM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCmluZGV4IGQ5MTBhYjA1ZjZkMy4uZjA3MGI4ZDhlMzAyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDIxLTAzLTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXVtXUEVdIFN0b3AgdXNpbmcgZ19tZW1kdXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE4OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n bGliL1dlYktpdFdlYlJlc291cmNlLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfcmVzb3VyY2Vf Z2V0X2RhdGFfZmluaXNoKTogVXNlIGdfbWFsbG9jICsgbWVtY3B5IGluc3RlYWQgb2YgZ19tZW1k dXAuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwOgorICAg ICAgICAod2Via2l0X3dlYl92aWV3X3NhdmVfZmluaXNoKTogVXNlIGZhc3RNZW1EdXAgaW5zdGVh ZCBnX21lbWR1cC4KKwogMjAyMS0wMy0xMyAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29t PgogCiAgICAgICAgIFtHUFVQXVtNU0VdIE1lZGlhU291cmNlOjpidWZmZXJlZCBhbmQgTWVkaWFT b3VyY2U6OmFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IHVwZGF0ZSBpbiB0aGUgc2FtZSBydW4g bG9vcCBhcyBNZWRpYVNvdXJjZTo6ZW5kT2ZTdHJlYW0oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViUmVzb3VyY2UuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViUmVzb3VyY2UuY3BwCmluZGV4IDE4MTJk NGVhNjUyYi4uOTYwYWQ5NzIwNzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9XZWJLaXRXZWJSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViUmVzb3VyY2UuY3BwCkBAIC00MDEsMTUgKzQwMSwyMiBA QCB2b2lkIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEoV2ViS2l0V2ViUmVzb3VyY2UqIHJl c291cmNlLCBHQ2FuY2VsbGFibGUqIGNhbgogICovCiBndWNoYXIqIHdlYmtpdF93ZWJfcmVzb3Vy Y2VfZ2V0X2RhdGFfZmluaXNoKFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSwgR0FzeW5jUmVz dWx0KiByZXN1bHQsIGdzaXplKiBsZW5ndGgsIEdFcnJvcioqIGVycm9yKQogewotICAgIGdfcmV0 dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfUkVTT1VSQ0UocmVzb3VyY2UpLCAwKTsKLSAg ICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFsaWQocmVzdWx0LCByZXNvdXJjZSks IDApOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfUkVTT1VSQ0UocmVz b3VyY2UpLCBudWxscHRyKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFs aWQocmVzdWx0LCByZXNvdXJjZSksIG51bGxwdHIpOwogCiAgICAgR1Rhc2sqIHRhc2sgPSBHX1RB U0socmVzdWx0KTsKICAgICBpZiAoIWdfdGFza19wcm9wYWdhdGVfYm9vbGVhbih0YXNrLCBlcnJv cikpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIFJl c291cmNlR2V0RGF0YUFzeW5jRGF0YSogZGF0YSA9IHN0YXRpY19jYXN0PFJlc291cmNlR2V0RGF0 YUFzeW5jRGF0YSo+KGdfdGFza19nZXRfdGFza19kYXRhKHRhc2spKTsKICAgICBpZiAobGVuZ3Ro KQogICAgICAgICAqbGVuZ3RoID0gZGF0YS0+d2ViRGF0YS0+c2l6ZSgpOwotICAgIHJldHVybiBz dGF0aWNfY2FzdDxndWNoYXIqPihnX21lbWR1cChkYXRhLT53ZWJEYXRhLT5ieXRlcygpLCBkYXRh LT53ZWJEYXRhLT5zaXplKCkpKTsKKworICAgIGF1dG8qIGJ5dGVzID0gZGF0YS0+d2ViRGF0YS0+ Ynl0ZXMoKTsKKyAgICBpZiAoIWJ5dGVzIHx8ICFkYXRhLT53ZWJEYXRhLT5zaXplKCkpCisgICAg ICAgIHJldHVybiBudWxscHRyOworCisgICAgYXV0byogcmV0dXJuVmFsdWUgPSBnX21hbGxvYyhk YXRhLT53ZWJEYXRhLT5zaXplKCkpOworICAgIG1lbWNweShyZXR1cm5WYWx1ZSwgYnl0ZXMsIGRh dGEtPndlYkRhdGEtPnNpemUoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGd1Y2hhcio+KHJl dHVyblZhbHVlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n bGliL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIv V2ViS2l0V2ViVmlldy5jcHAKaW5kZXggZDFhOWI3YmFlMTQ0Li5jODQ0NDA0MzhlMzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3Bw CkBAIC00MTk2LDcgKzQxOTYsNyBAQCBHSW5wdXRTdHJlYW0qIHdlYmtpdF93ZWJfdmlld19zYXZl X2ZpbmlzaChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHQXN5bmNSZXN1bHQqCiAgICAgVmlld1Nh dmVBc3luY0RhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxWaWV3U2F2ZUFzeW5jRGF0YSo+KGdfdGFz a19nZXRfdGFza19kYXRhKHRhc2spKTsKICAgICBnc2l6ZSBsZW5ndGggPSBkYXRhLT53ZWJEYXRh LT5zaXplKCk7CiAgICAgaWYgKGxlbmd0aCkKLSAgICAgICAgZ19tZW1vcnlfaW5wdXRfc3RyZWFt X2FkZF9kYXRhKEdfTUVNT1JZX0lOUFVUX1NUUkVBTShkYXRhU3RyZWFtKSwgZ19tZW1kdXAoZGF0 YS0+d2ViRGF0YS0+Ynl0ZXMoKSwgbGVuZ3RoKSwgbGVuZ3RoLCBnX2ZyZWUpOworICAgICAgICBn X21lbW9yeV9pbnB1dF9zdHJlYW1fYWRkX2RhdGEoR19NRU1PUllfSU5QVVRfU1RSRUFNKGRhdGFT dHJlYW0pLCBmYXN0TWVtRHVwKGRhdGEtPndlYkRhdGEtPmJ5dGVzKCksIGxlbmd0aCksIGxlbmd0 aCwgZmFzdEZyZWUpOwogCiAgICAgcmV0dXJuIGRhdGFTdHJlYW07CiB9Cg==