52796 2011-01-20 03:42:47 -0800 [Qt][WK2] Null ptr deref in UI process after web process has crashed 2011-01-20 10:09:02 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 kimmo.t.kinnunen kimmo.t.kinnunen commit-queue oldest_to_newest 337240 0 kimmo.t.kinnunen 2011-01-20 03:42:47 -0800 UI process creates a redundant drawing area during initialization. This is only used to pass drawing area type until QWKPagePrivate::createDrawingArea() is called. Side-effect of this is that when web process dies and ui process re-initializes the connection, the new createDrawingArea() call refers to invalid ptr and thus ui process crashes. Introduced in: https://bugs.webkit.org/show_bug.cgi?id=52184 337288 1 79585 kimmo.t.kinnunen 2011-01-20 05:23:37 -0800 Created attachment 79585 Patch to fix the null pointer deref 337307 2 79591 kimmo.t.kinnunen 2011-01-20 06:12:45 -0800 Created attachment 79591 Fix 2, contains initialization of the backingstoretype private var 337308 3 79591 kling 2011-01-20 06:17:15 -0800 Comment on attachment 79591 Fix 2, contains initialization of the backingstoretype private var D'oh. r=me 337409 4 79591 commit-queue 2011-01-20 10:08:56 -0800 Comment on attachment 79591 Fix 2, contains initialization of the backingstoretype private var Clearing flags on attachment: 79591 Committed r76262: <http://trac.webkit.org/changeset/76262> 337411 5 commit-queue 2011-01-20 10:09:02 -0800 All reviewed patches have been landed. Closing bug. 79585 2011-01-20 05:23:37 -0800 2011-01-20 06:12:45 -0800 Patch to fix the null pointer deref process-restoration-01.patch text/plain 5461 kimmo.t.kinnunen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkYzZkYzViLi5lYjMwNWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDEtMjAgIEtpbW1vIEtpbm51bmVuICA8a2ltbW8udC5raW5udW5lbkBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVt b3ZlIG51bGwgcHRyIGRlcmVmIHRoYXQgaGFwcGVucyB3aGVuIHJlYXR0YWNoaW5nIHRvCisgICAg ICAgIGEgbmV3IHdlYiBwcm9jZXNzLgorCisgICAgICAgIFtRdF1bV0syXSBOdWxsIHB0ciBkZXJl ZiBpbiBVSSBwcm9jZXNzIGFmdGVyIHdlYiBwcm9jZXNzIGhhcyBjcmFzaGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mjc5NgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9xdC9xZ3JhcGhpY3N3a3ZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNz V0tWaWV3OjpRR3JhcGhpY3NXS1ZpZXcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdr cGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlUHJpdmF0ZTo6UVdLUGFnZVByaXZhdGUpOgorICAg ICAgICAoUVdLUGFnZVByaXZhdGU6OmluaXQpOgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OmNy ZWF0ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OmRpZFJlbGF1 bmNoUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaDoKKwog MjAxMS0wMS0xOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggdGhlIFdlYktpdDIgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHAKaW5kZXggZjAxYzViMi4uZWMyMzc2MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZ3JhcGhpY3N3a3Zp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2 aWV3LmNwcApAQCAtNjYsMjQgKzY2LDE0IEBAIFFHcmFwaGljc1dLVmlldzo6UUdyYXBoaWNzV0tW aWV3KFFXS0NvbnRleHQqIGNvbnRleHQsIEJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0CiAgICAg c2V0Rm9jdXNQb2xpY3koUXQ6OlN0cm9uZ0ZvY3VzKTsKICAgICBzZXRBY2NlcHRIb3ZlckV2ZW50 cyh0cnVlKTsKIAotICAgIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gZHJhd2luZ0FyZWFQ cm94eTsKIAotICAgIGQtPnBhZ2UgPSBuZXcgUVdLUGFnZShjb250ZXh0KTsKLQotICAgIHN3aXRj aCAoYmFja2luZ1N0b3JlVHlwZSkgewogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQot ICAgIGNhc2UgVGlsZWQ6Ci0gICAgICAgIGRyYXdpbmdBcmVhUHJveHkgPSBUaWxlZERyYXdpbmdB cmVhUHJveHk6OmNyZWF0ZSh0aGlzLCB0b0ltcGwocGFnZSgpLT5wYWdlUmVmKCkpKTsKKyAgICBp ZiAoYmFja2luZ1N0b3JlVHlwZSA9PSBUaWxlZCkKICAgICAgICAgY29ubmVjdCh0aGlzLCBTSUdO QUwoc2NhbGVDaGFuZ2VkKCkpLCB0aGlzLCBTTE9UKG9uU2NhbGVDaGFuZ2VkKCkpKTsKLSAgICAg ICAgYnJlYWs7CiAjZW5kaWYKLSAgICBjYXNlIFNpbXBsZToKLSAgICBkZWZhdWx0OgotICAgICAg ICBkcmF3aW5nQXJlYVByb3h5ID0gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0 ZSh0aGlzLCB0b0ltcGwocGFnZSgpLT5wYWdlUmVmKCkpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAg fQogCi0gICAgZC0+cGFnZS0+ZC0+aW5pdCh0aGlzLCBkcmF3aW5nQXJlYVByb3h5KTsKKyAgICBk LT5wYWdlID0gbmV3IFFXS1BhZ2UoY29udGV4dCk7CisgICAgZC0+cGFnZS0+ZC0+aW5pdCh0aGlz LCBiYWNraW5nU3RvcmVUeXBlKTsKICAgICBjb25uZWN0KGQtPnBhZ2UsIFNJR05BTCh0aXRsZUNo YW5nZWQoUVN0cmluZykpLCB0aGlzLCBTSUdOQUwodGl0bGVDaGFuZ2VkKFFTdHJpbmcpKSk7CiAg ICAgY29ubmVjdChkLT5wYWdlLCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSksIHRoaXMsIFNJR05BTChs b2FkU3RhcnRlZCgpKSk7CiAgICAgY29ubmVjdChkLT5wYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVk KGJvb2wpKSwgdGhpcywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAKaW5kZXggZjY0NWRiOC4uZmJmZTRkYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCkBAIC04OCw2 ICs4OCw3IEBAIFFXS1BhZ2VQcml2YXRlOjpRV0tQYWdlUHJpdmF0ZShRV0tQYWdlKiBxcSwgUVdL Q29udGV4dCogYykKICAgICAsIGNvbnRleHQoYykKICAgICAsIHByZWZlcmVuY2VzKDApCiAgICAg LCBjcmVhdGVOZXdQYWdlRm4oMCkKKyAgICAsIGJhY2tpbmdTdG9yZVR5cGUoUUdyYXBoaWNzV0tW aWV3OjpTaW1wbGUpCiB7CiAgICAgbWVtc2V0KGFjdGlvbnMsIDAsIHNpemVvZihhY3Rpb25zKSk7 CiAgICAgcGFnZSA9IGNvbnRleHQtPmQtPmNvbnRleHQtPmNyZWF0ZVdlYlBhZ2UodGhpcywgMCk7 CkBAIC0xMDAsMTAgKzEwMSw5IEBAIFFXS1BhZ2VQcml2YXRlOjp+UVdLUGFnZVByaXZhdGUoKQog ICAgIGRlbGV0ZSBoaXN0b3J5OwogfQogCi12b2lkIFFXS1BhZ2VQcml2YXRlOjppbml0KFFHcmFw aGljc0l0ZW0qIHZpZXcsIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gcHJveHkpCit2b2lk IFFXS1BhZ2VQcml2YXRlOjppbml0KFFHcmFwaGljc0l0ZW0qIHZpZXcsIFFHcmFwaGljc1dLVmll dzo6QmFja2luZ1N0b3JlVHlwZSBiYWNraW5nU3RvcmVUeXBlKQogewogICAgIHRoaXMtPnZpZXcg PSB2aWV3OwotICAgIHBhZ2UtPnNldERyYXdpbmdBcmVhKHByb3h5KTsKICAgICBwYWdlLT5pbml0 aWFsaXplV2ViUGFnZSgpOwogfQogCkBAIC0xMzEsNyArMTMxLDcgQEAgUGFzc093blB0cjxEcmF3 aW5nQXJlYVByb3h5PiBRV0tQYWdlUHJpdmF0ZTo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiAg ICAgUUdyYXBoaWNzV0tWaWV3KiB3a1ZpZXcgPSBzdGF0aWNfY2FzdDxRR3JhcGhpY3NXS1ZpZXcq Pih2aWV3KTsKIAogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIGlmIChwYWdl LT5kcmF3aW5nQXJlYSgpLT5pbmZvKCkudHlwZSA9PSBEcmF3aW5nQXJlYUluZm86OlRpbGVkKQor ICAgIGlmIChiYWNraW5nU3RvcmVUeXBlID09IFFHcmFwaGljc1dLVmlldzo6VGlsZWQpCiAgICAg ICAgIHJldHVybiBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh3a1ZpZXcsIHBhZ2UuZ2V0 KCkpOwogI2VuZGlmCiAgICAgcmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5Ojpj cmVhdGUod2tWaWV3LCBwYWdlLmdldCgpKTsKQEAgLTM4NSw2ICszODUsMTMgQEAgdm9pZCBRV0tQ YWdlUHJpdmF0ZTo6dG91Y2hFdmVudChRVG91Y2hFdmVudCogZXZlbnQpCiAjZW5kaWYKIH0KIAor dm9pZCBRV0tQYWdlUHJpdmF0ZTo6ZGlkUmVsYXVuY2hQcm9jZXNzKCkKK3sKKyAgICBRR3JhcGhp Y3NXS1ZpZXcqIHdrVmlldyA9IHN0YXRpY19jYXN0PFFHcmFwaGljc1dLVmlldyo+KHZpZXcpOwor ICAgIGlmICh3a1ZpZXcpCisgICAgICAgIHEtPnNldFZpZXdwb3J0U2l6ZSh3a1ZpZXctPnNpemUo KS50b1NpemUoKSk7Cit9CisKIFFXS1BhZ2U6OlFXS1BhZ2UoUVdLQ29udGV4dCogY29udGV4dCkK ICAgICA6IGQobmV3IFFXS1BhZ2VQcml2YXRlKHRoaXMsIGNvbnRleHQpKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgKaW5kZXggYTE1Yjg1MS4uNDIwZmY2 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3Au aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCkBAIC0y NCw2ICsyNCw3IEBACiAjaW5jbHVkZSAiRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIlBh Z2VDbGllbnQuaCIKICNpbmNsdWRlICJxd2twYWdlLmgiCisjaW5jbHVkZSAicWdyYXBoaWNzd2t2 aWV3LmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25Q dHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CkBAIC00MSw3ICs0Miw3IEBAIHB1YmxpYzoK IAogICAgIHN0YXRpYyBRV0tQYWdlUHJpdmF0ZSogZ2V0KFFXS1BhZ2UqIHBhZ2UpIHsgcmV0dXJu IHBhZ2UtPmQ7IH0KIAotICAgIHZvaWQgaW5pdChRR3JhcGhpY3NJdGVtKiwgV1RGOjpQYXNzT3du UHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4pOworICAgIHZvaWQgaW5pdChRR3JhcGhpY3NJ dGVtKiwgUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBlKTsKIAogICAgIC8vIFBhZ2VD bGllbnQKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PiBj cmVhdGVEcmF3aW5nQXJlYVByb3h5KCk7CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoKICNlbmRp ZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCB2b2lkIHBhZ2VE aWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2aXJ0dWFsIHZv aWQgcHJvY2Vzc0RpZENyYXNoKCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJlbGF1bmNoUHJv Y2VzcygpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRSZWxhdW5jaFByb2Nlc3MoKTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUm KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluZFpvb21hYmxlQXJlYShjb25zdCBXZWJDb3JlOjpJ bnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJDb3JlOjpDdXJz b3ImKTsKQEAgLTEyMCw2ICsxMjEsNyBAQCBwdWJsaWM6CiAKICAgICBRUG9pbnQgdHJpcGxlQ2xp Y2s7CiAgICAgUUJhc2ljVGltZXIgdHJpcGxlQ2xpY2tUaW1lcjsKKyAgICBRR3JhcGhpY3NXS1Zp ZXc6OkJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0b3JlVHlwZTsKIH07CiAKIGNsYXNzIFF0Vmll d3BvcnRBdHRyaWJ1dGVzUHJpdmF0ZSA6IHB1YmxpYyBRU2hhcmVkRGF0YSB7Cg== 79591 2011-01-20 06:12:45 -0800 2011-01-20 10:08:56 -0800 Fix 2, contains initialization of the backingstoretype private var process-restoration-02.patch text/plain 5671 kimmo.t.kinnunen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkYzZkYzViLi45NmEyZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDEtMjAgIEtpbW1vIEtpbm51bmVuICA8a2ltbW8udC5raW5udW5lbkBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVt b3ZlIG51bGwgcHRyIGRlcmVmIHRoYXQgaGFwcGVucyB3aGVuIHJlYXR0YWNoaW5nIHRvCisgICAg ICAgIGEgbmV3IHdlYiBwcm9jZXNzLgorCisgICAgICAgIEltcGxlbWVudCBkaWRSZWxhdW5jaFBy b2Nlc3MgdGhhdCBzZXRzIHRoZSBkcmF3aW5nIGFyZWEgc2l6ZQorICAgICAgICBhZnRlciB0aGUg ZHJhd2luZyBhcmVhIGlzIHJlLWluc3RhbnRpYXRlZC4KKworICAgICAgICBbUXRdW1dLMl0gTnVs bCBwdHIgZGVyZWYgaW4gVUkgcHJvY2VzcyBhZnRlciB3ZWIgcHJvY2VzcyBoYXMgY3Jhc2hlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI3OTYKKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2aWV3LmNwcDoKKyAgICAgICAg KFFHcmFwaGljc1dLVmlldzo6UUdyYXBoaWNzV0tWaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL3F0L3F3a3BhZ2UuY3BwOgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OlFXS1BhZ2VQcml2 YXRlKToKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjppbml0KToKKyAgICAgICAgKFFXS1BhZ2VQ cml2YXRlOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRl OjpkaWRSZWxhdW5jaFByb2Nlc3MpOiBSZXNldCBkcmF3aW5nIGFyZWEgc2l6ZSBhZnRlciBjcmFz aC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oOgorCiAyMDExLTAxLTE5 ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0 aGUgV2ViS2l0MiBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcWdyYXBoaWNzd2t2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcWdyYXBoaWNzd2t2aWV3LmNwcAppbmRleCBmMDFjNWIyLi5lYzIzNzYwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZ3JhcGhpY3N3a3ZpZXcuY3BwCkBA IC02NiwyNCArNjYsMTQgQEAgUUdyYXBoaWNzV0tWaWV3OjpRR3JhcGhpY3NXS1ZpZXcoUVdLQ29u dGV4dCogY29udGV4dCwgQmFja2luZ1N0b3JlVHlwZSBiYWNraW5nU3QKICAgICBzZXRGb2N1c1Bv bGljeShRdDo6U3Ryb25nRm9jdXMpOwogICAgIHNldEFjY2VwdEhvdmVyRXZlbnRzKHRydWUpOwog Ci0gICAgUGFzc093blB0cjxEcmF3aW5nQXJlYVByb3h5PiBkcmF3aW5nQXJlYVByb3h5OwogCi0g ICAgZC0+cGFnZSA9IG5ldyBRV0tQYWdlKGNvbnRleHQpOwotCi0gICAgc3dpdGNoIChiYWNraW5n U3RvcmVUeXBlKSB7CiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgY2FzZSBU aWxlZDoKLSAgICAgICAgZHJhd2luZ0FyZWFQcm94eSA9IFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6 Y3JlYXRlKHRoaXMsIHRvSW1wbChwYWdlKCktPnBhZ2VSZWYoKSkpOworICAgIGlmIChiYWNraW5n U3RvcmVUeXBlID09IFRpbGVkKQogICAgICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChzY2FsZUNo YW5nZWQoKSksIHRoaXMsIFNMT1Qob25TY2FsZUNoYW5nZWQoKSkpOwotICAgICAgICBicmVhazsK ICNlbmRpZgotICAgIGNhc2UgU2ltcGxlOgotICAgIGRlZmF1bHQ6Ci0gICAgICAgIGRyYXdpbmdB cmVhUHJveHkgPSBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMsIHRv SW1wbChwYWdlKCktPnBhZ2VSZWYoKSkpOwotICAgICAgICBicmVhazsKLSAgICB9CiAKLSAgICBk LT5wYWdlLT5kLT5pbml0KHRoaXMsIGRyYXdpbmdBcmVhUHJveHkpOworICAgIGQtPnBhZ2UgPSBu ZXcgUVdLUGFnZShjb250ZXh0KTsKKyAgICBkLT5wYWdlLT5kLT5pbml0KHRoaXMsIGJhY2tpbmdT dG9yZVR5cGUpOwogICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFMKHRpdGxlQ2hhbmdlZChRU3Ry aW5nKSksIHRoaXMsIFNJR05BTCh0aXRsZUNoYW5nZWQoUVN0cmluZykpKTsKICAgICBjb25uZWN0 KGQtPnBhZ2UsIFNJR05BTChsb2FkU3RhcnRlZCgpKSwgdGhpcywgU0lHTkFMKGxvYWRTdGFydGVk KCkpKTsKICAgICBjb25uZWN0KGQtPnBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCB0 aGlzLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2twYWdlLmNwcAppbmRleCBmNjQ1ZGI4Li44MDcwNDRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAKQEAgLTg4LDYgKzg4LDcgQEAg UVdLUGFnZVByaXZhdGU6OlFXS1BhZ2VQcml2YXRlKFFXS1BhZ2UqIHFxLCBRV0tDb250ZXh0KiBj KQogICAgICwgY29udGV4dChjKQogICAgICwgcHJlZmVyZW5jZXMoMCkKICAgICAsIGNyZWF0ZU5l d1BhZ2VGbigwKQorICAgICwgYmFja2luZ1N0b3JlVHlwZShRR3JhcGhpY3NXS1ZpZXc6OlNpbXBs ZSkKIHsKICAgICBtZW1zZXQoYWN0aW9ucywgMCwgc2l6ZW9mKGFjdGlvbnMpKTsKICAgICBwYWdl ID0gY29udGV4dC0+ZC0+Y29udGV4dC0+Y3JlYXRlV2ViUGFnZSh0aGlzLCAwKTsKQEAgLTEwMCwx MCArMTAxLDEwIEBAIFFXS1BhZ2VQcml2YXRlOjp+UVdLUGFnZVByaXZhdGUoKQogICAgIGRlbGV0 ZSBoaXN0b3J5OwogfQogCi12b2lkIFFXS1BhZ2VQcml2YXRlOjppbml0KFFHcmFwaGljc0l0ZW0q IHZpZXcsIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gcHJveHkpCit2b2lkIFFXS1BhZ2VQ cml2YXRlOjppbml0KFFHcmFwaGljc0l0ZW0qIHZpZXcsIFFHcmFwaGljc1dLVmlldzo6QmFja2lu Z1N0b3JlVHlwZSBiYWNraW5nU3RvcmVUeXBlKQogewogICAgIHRoaXMtPnZpZXcgPSB2aWV3Owot ICAgIHBhZ2UtPnNldERyYXdpbmdBcmVhKHByb3h5KTsKKyAgICB0aGlzLT5iYWNraW5nU3RvcmVU eXBlID0gYmFja2luZ1N0b3JlVHlwZTsKICAgICBwYWdlLT5pbml0aWFsaXplV2ViUGFnZSgpOwog fQogCkBAIC0xMzEsNyArMTMyLDcgQEAgUGFzc093blB0cjxEcmF3aW5nQXJlYVByb3h5PiBRV0tQ YWdlUHJpdmF0ZTo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiAgICAgUUdyYXBoaWNzV0tWaWV3 KiB3a1ZpZXcgPSBzdGF0aWNfY2FzdDxRR3JhcGhpY3NXS1ZpZXcqPih2aWV3KTsKIAogI2lmIEVO QUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIGlmIChwYWdlLT5kcmF3aW5nQXJlYSgpLT5p bmZvKCkudHlwZSA9PSBEcmF3aW5nQXJlYUluZm86OlRpbGVkKQorICAgIGlmIChiYWNraW5nU3Rv cmVUeXBlID09IFFHcmFwaGljc1dLVmlldzo6VGlsZWQpCiAgICAgICAgIHJldHVybiBUaWxlZERy YXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh3a1ZpZXcsIHBhZ2UuZ2V0KCkpOwogI2VuZGlmCiAgICAg cmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUod2tWaWV3LCBwYWdl LmdldCgpKTsKQEAgLTM4NSw2ICszODYsMTMgQEAgdm9pZCBRV0tQYWdlUHJpdmF0ZTo6dG91Y2hF dmVudChRVG91Y2hFdmVudCogZXZlbnQpCiAjZW5kaWYKIH0KIAordm9pZCBRV0tQYWdlUHJpdmF0 ZTo6ZGlkUmVsYXVuY2hQcm9jZXNzKCkKK3sKKyAgICBRR3JhcGhpY3NXS1ZpZXcqIHdrVmlldyA9 IHN0YXRpY19jYXN0PFFHcmFwaGljc1dLVmlldyo+KHZpZXcpOworICAgIGlmICh3a1ZpZXcpCisg ICAgICAgIHEtPnNldFZpZXdwb3J0U2l6ZSh3a1ZpZXctPnNpemUoKS50b1NpemUoKSk7Cit9CisK IFFXS1BhZ2U6OlFXS1BhZ2UoUVdLQ29udGV4dCogY29udGV4dCkKICAgICA6IGQobmV3IFFXS1Bh Z2VQcml2YXRlKHRoaXMsIGNvbnRleHQpKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdrcGFnZV9wLmgKaW5kZXggYTE1Yjg1MS4uNDIwZmY2MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5j bHVkZSAiRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIlBhZ2VDbGllbnQuaCIKICNpbmNs dWRlICJxd2twYWdlLmgiCisjaW5jbHVkZSAicWdyYXBoaWNzd2t2aWV3LmgiCiAjaW5jbHVkZSAi V2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3 dGYvUmVmUHRyLmg+CkBAIC00MSw3ICs0Miw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBRV0tQ YWdlUHJpdmF0ZSogZ2V0KFFXS1BhZ2UqIHBhZ2UpIHsgcmV0dXJuIHBhZ2UtPmQ7IH0KIAotICAg IHZvaWQgaW5pdChRR3JhcGhpY3NJdGVtKiwgV1RGOjpQYXNzT3duUHRyPFdlYktpdDo6RHJhd2lu Z0FyZWFQcm94eT4pOworICAgIHZvaWQgaW5pdChRR3JhcGhpY3NJdGVtKiwgUUdyYXBoaWNzV0tW aWV3OjpCYWNraW5nU3RvcmVUeXBlKTsKIAogICAgIC8vIFBhZ2VDbGllbnQKICAgICB2aXJ0dWFs IFBhc3NPd25QdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5nQXJlYVBy b3h5KCk7CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNv bnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZENyYXNo KCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJlbGF1bmNoUHJvY2VzcygpIHsgfQorICAgIHZp cnR1YWwgdm9pZCBkaWRSZWxhdW5jaFByb2Nlc3MoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hh bmdlQ29udGVudHNTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkRmluZFpvb21hYmxlQXJlYShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmly dHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJDb3JlOjpDdXJzb3ImKTsKQEAgLTEyMCw2ICsx MjEsNyBAQCBwdWJsaWM6CiAKICAgICBRUG9pbnQgdHJpcGxlQ2xpY2s7CiAgICAgUUJhc2ljVGlt ZXIgdHJpcGxlQ2xpY2tUaW1lcjsKKyAgICBRR3JhcGhpY3NXS1ZpZXc6OkJhY2tpbmdTdG9yZVR5 cGUgYmFja2luZ1N0b3JlVHlwZTsKIH07CiAKIGNsYXNzIFF0Vmlld3BvcnRBdHRyaWJ1dGVzUHJp dmF0ZSA6IHB1YmxpYyBRU2hhcmVkRGF0YSB7Cg==