96289 2012-09-10 10:57:40 -0700 [V8] V8HTMLDocument::write and friends should not indirect through Frame 2012-09-10 13:21:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric haraken japhet webkit.review.bot oldest_to_newest 716274 0 abarth 2012-09-10 10:57:40 -0700 [V8] V8HTMLDocument::write and friends should not indirect through Frame 716276 1 163167 abarth 2012-09-10 10:59:06 -0700 Created attachment 163167 Patch 716278 2 163167 haraken 2012-09-10 11:01:15 -0700 Comment on attachment 163167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163167&action=review LGTM but I'd like to delegate the review to eric. > Source/WebCore/ChangeLog:9 > + throught the Frame to find the active document. This patch makes these Nit: through 716298 3 163169 abarth 2012-09-10 11:14:01 -0700 Created attachment 163169 Patch 716299 4 163169 eric 2012-09-10 11:14:55 -0700 Comment on attachment 163169 Patch LGTM. 716419 5 163169 abarth 2012-09-10 13:21:00 -0700 Comment on attachment 163169 Patch Clearing flags on attachment: 163169 Committed r128095: <http://trac.webkit.org/changeset/128095> 716420 6 abarth 2012-09-10 13:21:02 -0700 All reviewed patches have been landed. Closing bug. 163167 2012-09-10 10:59:06 -0700 2012-09-10 11:13:59 -0700 Patch bug-96289-20120910105842.patch text/plain 4308 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRlNmU3NTc4YjkwOTFk OWQ4YjVjZWNkMDM1NWM1ZmI4NDBhNTRjYS4uNGQxMDVjODVlODIyZDc3ZmNhNTQzZmNiNjMwYTUy NjViODNlNDllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTEwICBBZGFt IEJhcnRoICA8YWJhcnRoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFY4SFRNTERvY3Vt ZW50Ojp3cml0ZSBhbmQgZnJpZW5kcyBzaG91bGQgbm90IGluZGlyZWN0IHRocm91Z2ggRnJhbWUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mjg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgaXMg bm8gcmVhc29uIHdoeSBkb2N1bWVudC53cml0ZSBhbmQgZnJpZW5kcyBuZWVkIHRvIGluZGlyZWN0 CisgICAgICAgIHRocm91Z2h0IHRoZSBGcmFtZSB0byBmaW5kIHRoZSBhY3RpdmUgZG9jdW1lbnQu IFRoaXMgcGF0Y2ggbWFrZXMgdGhlc2UKKyAgICAgICAgZnVuY3Rpb25zIHdvcmsgdGhlIHNhbWUg YXMgdGhlIEpTQyB2ZXJzaW9ucy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L0JpbmRpbmdTdGF0 ZS5jcHA6CisgICAgICAgICogYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmg6CisgICAgICAgICAg ICAtIFRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgbGFzdCBjYWxsZXJzIG9mIGFjdGl2ZUZyYW1lLCBz byB3ZSBjYW4KKyAgICAgICAgICAgICAgcmVtb3ZlIHRoZSBmdW5jdGlvbiBlbnRpcmVseS4KKyAg ICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VjhIVE1MRG9jdW1lbnQ6OndyaXRlQ2FsbGJhY2spOgorICAgICAgICAo V2ViQ29yZTo6VjhIVE1MRG9jdW1lbnQ6OndyaXRlbG5DYWxsYmFjayk6CisgICAgICAgIChXZWJD b3JlOjpWOEhUTUxEb2N1bWVudDo6b3BlbkNhbGxiYWNrKToKKwogMjAxMi0wOS0xMCAgTWlrZSBX ZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENsYXJpZnkgdGhlIGNhdXNlIG9m IGNvbnNvbGUgd2FybmluZ3MgZ2VuZXJhdGVkIGJ5ICJjcm9zcy1vcmlnaW4iIGFjY2VzcyB0byBz YW5kYm94ZWQgaWZyYW1lcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0JpbmRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9CaW5kaW5nU3Rh dGUuY3BwCmluZGV4IGM1OWJiODkxNTUyMWRiOTIxMDUwMTc2MzlhYTQ1OWY4OWU4ZjY0OWEuLmY0 ZDUwM2Y0Y2U3YmVjZTA3ZjYzMGY4MGI2ZjFiYzQ0MmIzYjRhYWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0JpbmRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmNwcApAQCAtNjYsMTQgKzY2LDYgQEAgRE9NV2lu ZG93KiBmaXJzdERPTVdpbmRvdyhCaW5kaW5nU3RhdGUqKQogICAgIHJldHVybiB0b0RPTVdpbmRv dyh2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpKTsKIH0KIAotRnJhbWUqIGFjdGl2ZUZyYW1lKEJp bmRpbmdTdGF0ZSopCi17Ci0gICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCA9IGFj dGl2ZUNvbnRleHQoKTsKLSAgICBpZiAoY29udGV4dC5Jc0VtcHR5KCkpCi0gICAgICAgIHJldHVy biAwOwotICAgIHJldHVybiB0b0ZyYW1lSWZOb3REZXRhY2hlZChjb250ZXh0KTsKLX0KLQogRnJh bWUqIGZpcnN0RnJhbWUoQmluZGluZ1N0YXRlKikKIHsKICAgICB2ODo6SGFuZGxlPHY4OjpDb250 ZXh0PiBjb250ZXh0ID0gdjg6OkNvbnRleHQ6OkdldEVudGVyZWQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0JpbmRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmgKaW5kZXggOTU2NDIyNGVhMGU5MzhjYjg4YjNlNjUy YmY2ZGEyMWNjZDk1NTk4ZC4uMTllODQ0ZjJjOGQ5YzQ5ZTliMzk3MTM2MWU1YTY4ZWYwYmRiZDc4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmgKQEAgLTQ5LDcg KzQ5LDYgQEAgcHVibGljOgogRE9NV2luZG93KiBhY3RpdmVET01XaW5kb3coQmluZGluZ1N0YXRl Kik7CiBET01XaW5kb3cqIGZpcnN0RE9NV2luZG93KEJpbmRpbmdTdGF0ZSopOwogCi1GcmFtZSog YWN0aXZlRnJhbWUoQmluZGluZ1N0YXRlKik7CiBGcmFtZSogZmlyc3RGcmFtZShCaW5kaW5nU3Rh dGUqKTsKIAogLy8gRklYTUU6IFdoZW4gaW1wbGVtZW50aW5nIHRoaXMgZnVuY3Rpb24gZm9yIEpT Qywgd2UgbmVlZCB0byB1bmRlcnN0YW5kIGlmIHRoZXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcAppbmRl eCBjYTM5NzU0N2RiMDQxMzIyYWJmNWZlMWY3YTczZGUwMjdlZDE4OWMxLi5iZTUzNDMxMDk2NWYw MTBkNzM0Y2E1NzVkYTRmZjk4M2M5M2FmMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAKQEAgLTEx OSw4ICsxMTksNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIVE1MRG9jdW1lbnQ6OndyaXRl Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKICAgICBJTkNfU1RBVFMoIkRP TS5IVE1MRG9jdW1lbnQud3JpdGUoKSIpOwogICAgIEhUTUxEb2N1bWVudCogaHRtbERvY3VtZW50 ID0gVjhIVE1MRG9jdW1lbnQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwotICAgIEZyYW1lKiBm cmFtZSA9IGFjdGl2ZUZyYW1lKEJpbmRpbmdTdGF0ZTo6aW5zdGFuY2UoKSk7Ci0gICAgaHRtbERv Y3VtZW50LT53cml0ZSh3cml0ZUhlbHBlckdldFN0cmluZyhhcmdzKSwgZnJhbWUgPyBmcmFtZS0+ ZG9jdW1lbnQoKSA6IE5VTEwpOworICAgIGh0bWxEb2N1bWVudC0+d3JpdGUod3JpdGVIZWxwZXJH ZXRTdHJpbmcoYXJncyksIGFjdGl2ZURPTVdpbmRvdyhCaW5kaW5nU3RhdGU6Omluc3RhbmNlKCkp LT5kb2N1bWVudCgpKTsKICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogfQogCkBAIC0xMjgs OCArMTI3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTERvY3VtZW50Ojp3cml0ZWxu Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKICAgICBJTkNfU1RBVFMoIkRP TS5IVE1MRG9jdW1lbnQud3JpdGVsbigpIik7CiAgICAgSFRNTERvY3VtZW50KiBodG1sRG9jdW1l bnQgPSBWOEhUTUxEb2N1bWVudDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7Ci0gICAgRnJhbWUq IGZyYW1lID0gYWN0aXZlRnJhbWUoQmluZGluZ1N0YXRlOjppbnN0YW5jZSgpKTsKLSAgICBodG1s RG9jdW1lbnQtPndyaXRlbG4od3JpdGVIZWxwZXJHZXRTdHJpbmcoYXJncyksIGZyYW1lID8gZnJh bWUtPmRvY3VtZW50KCkgOiBOVUxMKTsKKyAgICBodG1sRG9jdW1lbnQtPndyaXRlbG4od3JpdGVI ZWxwZXJHZXRTdHJpbmcoYXJncyksIGFjdGl2ZURPTVdpbmRvdyhCaW5kaW5nU3RhdGU6Omluc3Rh bmNlKCkpLT5kb2N1bWVudCgpKTsKICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogfQogCkBA IC0xNjAsOSArMTU4LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTERvY3VtZW50Ojpv cGVuQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICAgICAgfQogICAgIH0K IAotICAgIEZyYW1lKiBmcmFtZSA9IGFjdGl2ZUZyYW1lKEJpbmRpbmdTdGF0ZTo6aW5zdGFuY2Uo KSk7Ci0gICAgaHRtbERvY3VtZW50LT5vcGVuKGZyYW1lID8gZnJhbWUtPmRvY3VtZW50KCkgOiBO VUxMKTsKLSAgICAvLyBSZXR1cm4gdGhlIGRvY3VtZW50LgorICAgIGh0bWxEb2N1bWVudC0+b3Bl bihhY3RpdmVET01XaW5kb3coQmluZGluZ1N0YXRlOjppbnN0YW5jZSgpKS0+ZG9jdW1lbnQoKSk7 CiAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CiB9CiAK 163169 2012-09-10 11:14:01 -0700 2012-09-10 13:20:59 -0700 Patch bug-96289-20120910111337.patch text/plain 4307 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRlNmU3NTc4YjkwOTFk OWQ4YjVjZWNkMDM1NWM1ZmI4NDBhNTRjYS4uZjQ4MzUxNzg2OTkzMDI4MzYwMTY4OTdkMDMzMWI4 MzhlYjVmYjllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTEwICBBZGFt IEJhcnRoICA8YWJhcnRoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFY4SFRNTERvY3Vt ZW50Ojp3cml0ZSBhbmQgZnJpZW5kcyBzaG91bGQgbm90IGluZGlyZWN0IHRocm91Z2ggRnJhbWUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mjg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgaXMg bm8gcmVhc29uIHdoeSBkb2N1bWVudC53cml0ZSBhbmQgZnJpZW5kcyBuZWVkIHRvIGluZGlyZWN0 CisgICAgICAgIHRocm91Z2ggdGhlIEZyYW1lIHRvIGZpbmQgdGhlIGFjdGl2ZSBkb2N1bWVudC4g VGhpcyBwYXRjaCBtYWtlcyB0aGVzZQorICAgICAgICBmdW5jdGlvbnMgd29yayB0aGUgc2FtZSBh cyB0aGUgSlNDIHZlcnNpb25zLgorCisgICAgICAgICogYmluZGluZ3MvdjgvQmluZGluZ1N0YXRl LmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9CaW5kaW5nU3RhdGUuaDoKKyAgICAgICAgICAg IC0gVGhpcyBwYXRjaCByZW1vdmVzIHRoZSBsYXN0IGNhbGxlcnMgb2YgYWN0aXZlRnJhbWUsIHNv IHdlIGNhbgorICAgICAgICAgICAgICByZW1vdmUgdGhlIGZ1bmN0aW9uIGVudGlyZWx5LgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOEhUTUxEb2N1bWVudDo6d3JpdGVDYWxsYmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpWOEhUTUxEb2N1bWVudDo6d3JpdGVsbkNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNv cmU6OlY4SFRNTERvY3VtZW50OjpvcGVuQ2FsbGJhY2spOgorCiAyMDEyLTA5LTEwICBNaWtlIFdl c3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2xhcmlmeSB0aGUgY2F1c2Ugb2Yg Y29uc29sZSB3YXJuaW5ncyBnZW5lcmF0ZWQgYnkgImNyb3NzLW9yaWdpbiIgYWNjZXNzIHRvIHNh bmRib3hlZCBpZnJhbWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv QmluZGluZ1N0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0JpbmRpbmdTdGF0 ZS5jcHAKaW5kZXggYzU5YmI4OTE1NTIxZGI5MjEwNTAxNzYzOWFhNDU5Zjg5ZThmNjQ5YS4uZjRk NTAzZjRjZTdiZWNlMDdmNjMwZjgwYjZmMWJjNDQyYjNiNGFhZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9CaW5kaW5nU3RhdGUuY3BwCkBAIC02NiwxNCArNjYsNiBAQCBET01XaW5k b3cqIGZpcnN0RE9NV2luZG93KEJpbmRpbmdTdGF0ZSopCiAgICAgcmV0dXJuIHRvRE9NV2luZG93 KHY4OjpDb250ZXh0OjpHZXRFbnRlcmVkKCkpOwogfQogCi1GcmFtZSogYWN0aXZlRnJhbWUoQmlu ZGluZ1N0YXRlKikKLXsKLSAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gYWN0 aXZlQ29udGV4dCgpOwotICAgIGlmIChjb250ZXh0LklzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu IDA7Ci0gICAgcmV0dXJuIHRvRnJhbWVJZk5vdERldGFjaGVkKGNvbnRleHQpOwotfQotCiBGcmFt ZSogZmlyc3RGcmFtZShCaW5kaW5nU3RhdGUqKQogewogICAgIHY4OjpIYW5kbGU8djg6OkNvbnRl eHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvQmluZGluZ1N0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9CaW5kaW5nU3RhdGUuaAppbmRleCA5NTY0MjI0ZWEwZTkzOGNiODhiM2U2NTJi ZjZkYTIxY2NkOTU1OThkLi4xOWU4NDRmMmM4ZDljNDllOWIzOTcxMzYxZTVhNjhlZjBiZGJkNzg0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9CaW5kaW5nU3RhdGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9CaW5kaW5nU3RhdGUuaApAQCAtNDksNyAr NDksNiBAQCBwdWJsaWM6CiBET01XaW5kb3cqIGFjdGl2ZURPTVdpbmRvdyhCaW5kaW5nU3RhdGUq KTsKIERPTVdpbmRvdyogZmlyc3RET01XaW5kb3coQmluZGluZ1N0YXRlKik7CiAKLUZyYW1lKiBh Y3RpdmVGcmFtZShCaW5kaW5nU3RhdGUqKTsKIEZyYW1lKiBmaXJzdEZyYW1lKEJpbmRpbmdTdGF0 ZSopOwogCiAvLyBGSVhNRTogV2hlbiBpbXBsZW1lbnRpbmcgdGhpcyBmdW5jdGlvbiBmb3IgSlND LCB3ZSBuZWVkIHRvIHVuZGVyc3RhbmQgaWYgdGhlcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9jdW1lbnRDdXN0b20uY3BwCmluZGV4 IGNhMzk3NTQ3ZGIwNDEzMjJhYmY1ZmUxZjdhNzNkZTAyN2VkMTg5YzEuLmJlNTM0MzEwOTY1ZjAx MGQ3MzRjYTU3NWRhNGZmOTgzYzkzYWYzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcApAQCAtMTE5 LDggKzExOSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxEb2N1bWVudDo6d3JpdGVD YWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAgIElOQ19TVEFUUygiRE9N LkhUTUxEb2N1bWVudC53cml0ZSgpIik7CiAgICAgSFRNTERvY3VtZW50KiBodG1sRG9jdW1lbnQg PSBWOEhUTUxEb2N1bWVudDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7Ci0gICAgRnJhbWUqIGZy YW1lID0gYWN0aXZlRnJhbWUoQmluZGluZ1N0YXRlOjppbnN0YW5jZSgpKTsKLSAgICBodG1sRG9j dW1lbnQtPndyaXRlKHdyaXRlSGVscGVyR2V0U3RyaW5nKGFyZ3MpLCBmcmFtZSA/IGZyYW1lLT5k b2N1bWVudCgpIDogTlVMTCk7CisgICAgaHRtbERvY3VtZW50LT53cml0ZSh3cml0ZUhlbHBlckdl dFN0cmluZyhhcmdzKSwgYWN0aXZlRE9NV2luZG93KEJpbmRpbmdTdGF0ZTo6aW5zdGFuY2UoKSkt PmRvY3VtZW50KCkpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiB9CiAKQEAgLTEyOCw4 ICsxMjcsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIVE1MRG9jdW1lbnQ6OndyaXRlbG5D YWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAgIElOQ19TVEFUUygiRE9N LkhUTUxEb2N1bWVudC53cml0ZWxuKCkiKTsKICAgICBIVE1MRG9jdW1lbnQqIGh0bWxEb2N1bWVu dCA9IFY4SFRNTERvY3VtZW50Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBGcmFtZSog ZnJhbWUgPSBhY3RpdmVGcmFtZShCaW5kaW5nU3RhdGU6Omluc3RhbmNlKCkpOwotICAgIGh0bWxE b2N1bWVudC0+d3JpdGVsbih3cml0ZUhlbHBlckdldFN0cmluZyhhcmdzKSwgZnJhbWUgPyBmcmFt ZS0+ZG9jdW1lbnQoKSA6IE5VTEwpOworICAgIGh0bWxEb2N1bWVudC0+d3JpdGVsbih3cml0ZUhl bHBlckdldFN0cmluZyhhcmdzKSwgYWN0aXZlRE9NV2luZG93KEJpbmRpbmdTdGF0ZTo6aW5zdGFu Y2UoKSktPmRvY3VtZW50KCkpOwogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiB9CiAKQEAg LTE2MCw5ICsxNTgsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIVE1MRG9jdW1lbnQ6Om9w ZW5DYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgICAgICB9CiAgICAgfQog Ci0gICAgRnJhbWUqIGZyYW1lID0gYWN0aXZlRnJhbWUoQmluZGluZ1N0YXRlOjppbnN0YW5jZSgp KTsKLSAgICBodG1sRG9jdW1lbnQtPm9wZW4oZnJhbWUgPyBmcmFtZS0+ZG9jdW1lbnQoKSA6IE5V TEwpOwotICAgIC8vIFJldHVybiB0aGUgZG9jdW1lbnQuCisgICAgaHRtbERvY3VtZW50LT5vcGVu KGFjdGl2ZURPTVdpbmRvdyhCaW5kaW5nU3RhdGU6Omluc3RhbmNlKCkpLT5kb2N1bWVudCgpKTsK ICAgICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKIH0KIAo=