51683 2010-12-28 11:35:15 -0800 [v8] Minor cleanup: make 2nd argument of removeIfPresnt accept only a value type stored in the DOM map 2011-01-18 23:41:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 antonm antonm abarth ager commit-queue dglazkov eric japhet jorlow oldest_to_newest 327287 0 antonm 2010-12-28 11:35:15 -0800 [v8] Minor cleanup: make 2nd argument of removeIfPresnt accept only a value type stored in the DOM map 327291 1 77567 antonm 2010-12-28 11:40:52 -0800 Created attachment 77567 Patch 327341 2 77567 eric 2010-12-28 13:47:45 -0800 Comment on attachment 77567 Patch How do we test this? Please explain what tests this affects in your ChagneLog or explain why testing is impossible. 327490 3 antonm 2010-12-28 23:45:16 -0800 Eric, that should be covered by the current test. The change is mostly syntactic, all it requires an additional cast which is noop in Release mode. (In reply to comment #2) > (From update of attachment 77567 [details]) > How do we test this? Please explain what tests this affects in your ChagneLog or explain why testing is impossible. 327493 4 antonm 2010-12-28 23:46:20 -0800 And just in case: this path is exercised by virtually any web page if it only touches a DOM (In reply to comment #3) > Eric, that should be covered by the current test. > > The change is mostly syntactic, all it requires an additional cast which is noop in Release mode. > > (In reply to comment #2) > > (From update of attachment 77567 [details] [details]) > > How do we test this? Please explain what tests this affects in your ChagneLog or explain why testing is impossible. 327494 5 77602 antonm 2010-12-28 23:48:23 -0800 Created attachment 77602 Patch 327983 6 77602 eric 2010-12-30 11:46:33 -0800 Comment on attachment 77602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77602&action=review > WebCore/bindings/v8/V8DOMMap.h:-63 > - virtual bool removeIfPresent(KeyType* key, v8::Persistent<v8::Data> value) = 0; Why is this virtual if Its never overridden? 327986 7 antonm 2010-12-30 11:54:03 -0800 (In reply to comment #6) > (From update of attachment 77602 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77602&action=review > > > WebCore/bindings/v8/V8DOMMap.h:-63 > > - virtual bool removeIfPresent(KeyType* key, v8::Persistent<v8::Data> value) = 0; > > Why is this virtual if Its never overridden? It's overridden (see two implementations of this 'interface'), otherwise it won't compile. 335950 8 eric 2011-01-18 11:19:55 -0800 Is this patch supposed to be up for review? If so, please flag with r? otherwise it won't get seen in the review queue and will likely be ignored. You also should CC some v8-related reviewers (of which I'm not one). 335952 9 antonm 2011-01-18 11:21:54 -0800 I am dreadful sorry, I forgot to put the r?. Done. Sorry again. (In reply to comment #8) > Is this patch supposed to be up for review? If so, please flag with r? otherwise it won't get seen in the review queue and will likely be ignored. > > You also should CC some v8-related reviewers (of which I'm not one). 335954 10 eric 2011-01-18 11:25:16 -0800 No problem at all. I don't really know what reviewers to suggest for this, but webkit-patch suggest-reviewers can calculate some for you if you find this isn't reviewed in a timely manner. 335957 11 antonm 2011-01-18 11:26:11 -0800 (In reply to comment #10) > No problem at all. I don't really know what reviewers to suggest for this, but webkit-patch suggest-reviewers can calculate some for you if you find this isn't reviewed in a timely manner. Let me add Mads and Nate. 335958 12 77602 jorlow 2011-01-18 11:30:46 -0800 Comment on attachment 77602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77602&action=review I don't understand how this is covered by existing tests. > WebCore/bindings/v8/DOMDataStore.cpp:157 > + v8::Persistent<v8::Object> v8Object = v8::Persistent<v8::Object>::Cast(value); So it's not possible that it'd be empty/null/undefined? 335965 13 antonm 2011-01-18 11:42:24 -0800 (In reply to comment #12) > (From update of attachment 77602 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77602&action=review > > I don't understand how this is covered by existing tests. Every DOM Node is added into this map when it's wrapped into JS object. And eventually, when this wrapper is garbage collected, method removeIfPresent is invoked for each domNodeMap we have. Thus one need to kill renderer process before it does any GC to miss this path. And we have plenty layout tests which exercise GC-related behaviour. > > > WebCore/bindings/v8/DOMDataStore.cpp:157 > > + v8::Persistent<v8::Object> v8Object = v8::Persistent<v8::Object>::Cast(value); > > So it's not possible that it'd be empty/null/undefined? No, it cannot be---it's a wrapper which is now only weakly reachable. And it cannot be empty by design. And null and undefined are never GCed (and never wrapped into persistent handles). Thanks a lot for your comment, Jeremy. 336361 14 77602 commit-queue 2011-01-18 23:40:57 -0800 Comment on attachment 77602 Patch Clearing flags on attachment: 77602 Committed r76104: <http://trac.webkit.org/changeset/76104> 336362 15 commit-queue 2011-01-18 23:41:02 -0800 All reviewed patches have been landed. Closing bug. 77567 2010-12-28 11:40:52 -0800 2010-12-28 23:48:17 -0800 Patch bug-51683-20101228224050.patch text/plain 4085 antonm ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzE2YTI0MmJmY2RhODM3NWI4ZDFmZDRkNTYwYmFlMTI2ZmU1ODkwMC4uZmU4OTQ1YjkwOGNhMTlm ZDNhOGJjN2EyYjBmNmZmYjUxMGZiNWYzMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0yOCAgQW50 b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFt2OF0gTWlub3IgY2xlYW51cDogbWFrZSAybmQgYXJn dW1lbnQgb2YgcmVtb3ZlSWZQcmVzbnQgYWNjZXB0IG9ubHkgYSB2YWx1ZSB0eXBlIHN0b3JlZCBp biB0aGUgRE9NIG1hcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTE2ODMKKworICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OndlYWtOb2RlQ2FsbGJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6RE9NRGF0YVN0b3JlOjpJbnRydXNpdmVET01XcmFwcGVyTWFwOjpyZW1vdmVJ ZlByZXNlbnQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5oOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1Y4RE9NTWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpXZWFrUmVmZXJl bmNlTWFwOjpyZW1vdmVJZlByZXNlbnQpOgorCiAyMDEwLTEyLTI4ICBBYmhpc2hlayBBcnlhICA8 aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNz ZWxsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwCmluZGV4IDBkMzdkYzA3MjYwNDMz OTk1ZDY2ZjAzNzk0NmI3NTI5MTE3NWM0NzUuLjUzOTNiZDk3MTczM2Q4MzY1NGFjY2RiNGUwMzIw MTFmOWVkMjk3NzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3Jl LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHAKQEAgLTE0OCwx MSArMTQ4LDEzIEBAIHZvaWQgRE9NRGF0YVN0b3JlOjp3ZWFrQWN0aXZlRE9NT2JqZWN0Q2FsbGJh Y2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB2OE9iamVjCiAgICAgRE9NRGF0YTo6aGFuZGxl V2Vha09iamVjdChET01EYXRhU3RvcmU6OkFjdGl2ZURPTU9iamVjdE1hcCwgdjg6OlBlcnNpc3Rl bnQ8djg6Ok9iamVjdD46OkNhc3QodjhPYmplY3QpLCBkb21PYmplY3QpOwogfQogCi12b2lkIERP TURhdGFTdG9yZTo6d2Vha05vZGVDYWxsYmFjayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHY4 T2JqZWN0LCB2b2lkKiBkb21PYmplY3QpCit2b2lkIERPTURhdGFTdG9yZTo6d2Vha05vZGVDYWxs YmFjayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHZhbHVlLCB2b2lkKiBkb21PYmplY3QpCiB7 CiAgICAgQVNTRVJUKFdURjo6aXNNYWluVGhyZWFkKCkpOwogCiAgICAgTm9kZSogbm9kZSA9IHN0 YXRpY19jYXN0PE5vZGUqPihkb21PYmplY3QpOworICAgIC8vIE5vZGUgd3JhcHBlcnMgbXVzdCBi ZSBKUyBvYmplY3RzLgorICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHY4T2JqZWN0ID0g djg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46OkNhc3QodmFsdWUpOwogCiAgICAgV1RGOjpNdXRl eExvY2tlciBsb2NrZXIoRE9NRGF0YVN0b3JlOjphbGxTdG9yZXNNdXRleCgpKTsKICAgICBET01E YXRhTGlzdCYgbGlzdCA9IERPTURhdGFTdG9yZTo6YWxsU3RvcmVzKCk7CkBAIC0xNzEsNyArMTcz LDcgQEAgdm9pZCBET01EYXRhU3RvcmU6OndlYWtOb2RlQ2FsbGJhY2sodjg6OlBlcnNpc3RlbnQ8 djg6OlZhbHVlPiB2OE9iamVjdCwgdm9pZCogZG8KICAgICBub2RlLT5kZXJlZigpOyAvLyBOb2Jv ZHkgb3ZlcnJpZGVzIE5vZGU6OmRlcmVmIHNvIGl0J3Mgc2FmZQogfQogCi1ib29sIERPTURhdGFT dG9yZTo6SW50cnVzaXZlRE9NV3JhcHBlck1hcDo6cmVtb3ZlSWZQcmVzZW50KE5vZGUqIG9iaiwg djg6OlBlcnNpc3RlbnQ8djg6OkRhdGE+IHZhbHVlKQorYm9vbCBET01EYXRhU3RvcmU6OkludHJ1 c2l2ZURPTVdyYXBwZXJNYXA6OnJlbW92ZUlmUHJlc2VudChOb2RlKiBvYmosIHY4OjpQZXJzaXN0 ZW50PHY4OjpPYmplY3Q+IHZhbHVlKQogewogICAgIEFTU0VSVChvYmopOwogICAgIHY4OjpQZXJz aXN0ZW50PHY4OjpPYmplY3Q+KiBlbnRyeSA9IG9iai0+d3JhcHBlcigpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaCBiL1dlYkNvcmUvYmluZGluZ3Mvdjgv RE9NRGF0YVN0b3JlLmgKaW5kZXggYTEwNTFkZDhmYTQxNTYzMTIxNjg2MzgwNjYxYWNkMzMyZmQ0 NTY2Ni4uY2ZlMjIwZTIwMTkyZDJmMjljOWMwYjBlNGQwODYxZDEwMDhkOWNmNiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L0RPTURhdGFTdG9yZS5oCkBAIC0xOTAsNyArMTkwLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICAgICAgICAgIG1fdGFibGUudmlzaXQoc3RvcmUsIHZpc2l0b3IpOwogICAg ICAgICAgICAgfQogCi0gICAgICAgICAgICB2aXJ0dWFsIGJvb2wgcmVtb3ZlSWZQcmVzZW50KE5v ZGUqIGtleSwgdjg6OlBlcnNpc3RlbnQ8djg6OkRhdGE+IHZhbHVlKTsKKyAgICAgICAgICAgIHZp cnR1YWwgYm9vbCByZW1vdmVJZlByZXNlbnQoTm9kZSosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmpl Y3Q+KTsKIAogICAgICAgICAgICAgdmlydHVhbCB2b2lkIGNsZWFyKCkKICAgICAgICAgICAgIHsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaCBiL1dlYkNvcmUvYmlu ZGluZ3MvdjgvVjhET01NYXAuaAppbmRleCBjMmI1YTlkNzZiZThiNjBlYmFiMTZkNTViNzM3YTU4 MGVmOTVhNWQyLi41MWQ5MzNhODNmYmQ3ODY0ZTc1MjMwNDIwMjNmNDkzY2Q3OWM3NzY2IDEwMDY0 NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmgKKysrIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9WOERPTU1hcC5oCkBAIC02MCw3ICs2MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdmlydHVhbCB2b2lkIHNldChLZXlUeXBlKiBvYmosIHY4OjpQZXJzaXN0ZW50PFZh bHVlVHlwZT4gd3JhcHBlcikgPSAwOwogICAgICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoS2V5 VHlwZSogb2JqKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCB2aXNpdChET01EYXRhU3RvcmUq IHN0b3JlLCBWaXNpdG9yKiB2aXNpdG9yKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgYm9vbCByZW1v dmVJZlByZXNlbnQoS2V5VHlwZSoga2V5LCB2ODo6UGVyc2lzdGVudDx2ODo6RGF0YT4gdmFsdWUp ID0gMDsKKyAgICAgICAgdmlydHVhbCBib29sIHJlbW92ZUlmUHJlc2VudChLZXlUeXBlKiwgdjg6 OlBlcnNpc3RlbnQ8VmFsdWVUeXBlPikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgY2xlYXIo KSA9IDA7CiAKICAgICAgICAgdjg6OldlYWtSZWZlcmVuY2VDYWxsYmFjayB3ZWFrUmVmZXJlbmNl Q2FsbGJhY2soKSB7IHJldHVybiBtX3dlYWtSZWZlcmVuY2VDYWxsYmFjazsgfQpAQCAtMTA1LDcg KzEwNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIGhhbmRsZS5DbGVhcigp OwogICAgICAgICB9CiAKLSAgICAgICAgYm9vbCByZW1vdmVJZlByZXNlbnQoS2V5VHlwZSoga2V5 LCB2ODo6UGVyc2lzdGVudDx2ODo6RGF0YT4gdmFsdWUpCisgICAgICAgIGJvb2wgcmVtb3ZlSWZQ cmVzZW50KEtleVR5cGUqIGtleSwgdjg6OlBlcnNpc3RlbnQ8VmFsdWVUeXBlPiB2YWx1ZSkKICAg ICAgICAgewogICAgICAgICAgICAgdHlwZW5hbWUgSGFzaE1hcDxLZXlUeXBlKiwgVmFsdWVUeXBl Kj46Oml0ZXJhdG9yIGl0ID0gbV9tYXAuZmluZChrZXkpOwogICAgICAgICAgICAgaWYgKGl0ID09 IG1fbWFwLmVuZCgpIHx8IGl0LT5zZWNvbmQgIT0gKnZhbHVlKQo= 77602 2010-12-28 23:48:23 -0800 2011-01-18 23:40:56 -0800 Patch bug-51683-20101229104821.patch text/plain 4127 antonm ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzE2YTI0MmJmY2RhODM3NWI4ZDFmZDRkNTYwYmFlMTI2ZmU1ODkwMC4uMDQ0YzMxYTM0MTNkOTU4 YTJmZWYwNDExMWJmNDI2NmZjNmFiZDk2NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMi0yOCAgQW50 b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFt2OF0gTWlub3IgY2xlYW51cDogbWFrZSAybmQgYXJn dW1lbnQgb2YgcmVtb3ZlSWZQcmVzbnQgYWNjZXB0IG9ubHkgYSB2YWx1ZSB0eXBlIHN0b3JlZCBp biB0aGUgRE9NIG1hcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTE2ODMKKworICAgICAgICBDb3ZlcmVkIGJ5IHRoZSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpET01EYXRhU3RvcmU6OndlYWtOb2RlQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6RE9N RGF0YVN0b3JlOjpJbnRydXNpdmVET01XcmFwcGVyTWFwOjpyZW1vdmVJZlByZXNlbnQpOgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4RE9NTWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpXZWFrUmVmZXJlbmNlTWFwOjpyZW1vdmVJ ZlByZXNlbnQpOgorCiAyMDEwLTEyLTI4ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01EYXRhU3RvcmUuY3BwCmluZGV4IDBkMzdkYzA3MjYwNDMzOTk1ZDY2ZjAzNzk0NmI3 NTI5MTE3NWM0NzUuLjUzOTNiZDk3MTczM2Q4MzY1NGFjY2RiNGUwMzIwMTFmOWVkMjk3NzMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHAKQEAgLTE0OCwxMSArMTQ4LDEzIEBAIHZv aWQgRE9NRGF0YVN0b3JlOjp3ZWFrQWN0aXZlRE9NT2JqZWN0Q2FsbGJhY2sodjg6OlBlcnNpc3Rl bnQ8djg6OlZhbHVlPiB2OE9iamVjCiAgICAgRE9NRGF0YTo6aGFuZGxlV2Vha09iamVjdChET01E YXRhU3RvcmU6OkFjdGl2ZURPTU9iamVjdE1hcCwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46 OkNhc3QodjhPYmplY3QpLCBkb21PYmplY3QpOwogfQogCi12b2lkIERPTURhdGFTdG9yZTo6d2Vh a05vZGVDYWxsYmFjayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHY4T2JqZWN0LCB2b2lkKiBk b21PYmplY3QpCit2b2lkIERPTURhdGFTdG9yZTo6d2Vha05vZGVDYWxsYmFjayh2ODo6UGVyc2lz dGVudDx2ODo6VmFsdWU+IHZhbHVlLCB2b2lkKiBkb21PYmplY3QpCiB7CiAgICAgQVNTRVJUKFdU Rjo6aXNNYWluVGhyZWFkKCkpOwogCiAgICAgTm9kZSogbm9kZSA9IHN0YXRpY19jYXN0PE5vZGUq Pihkb21PYmplY3QpOworICAgIC8vIE5vZGUgd3JhcHBlcnMgbXVzdCBiZSBKUyBvYmplY3RzLgor ICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHY4T2JqZWN0ID0gdjg6OlBlcnNpc3RlbnQ8 djg6Ok9iamVjdD46OkNhc3QodmFsdWUpOwogCiAgICAgV1RGOjpNdXRleExvY2tlciBsb2NrZXIo RE9NRGF0YVN0b3JlOjphbGxTdG9yZXNNdXRleCgpKTsKICAgICBET01EYXRhTGlzdCYgbGlzdCA9 IERPTURhdGFTdG9yZTo6YWxsU3RvcmVzKCk7CkBAIC0xNzEsNyArMTczLDcgQEAgdm9pZCBET01E YXRhU3RvcmU6OndlYWtOb2RlQ2FsbGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB2OE9i amVjdCwgdm9pZCogZG8KICAgICBub2RlLT5kZXJlZigpOyAvLyBOb2JvZHkgb3ZlcnJpZGVzIE5v ZGU6OmRlcmVmIHNvIGl0J3Mgc2FmZQogfQogCi1ib29sIERPTURhdGFTdG9yZTo6SW50cnVzaXZl RE9NV3JhcHBlck1hcDo6cmVtb3ZlSWZQcmVzZW50KE5vZGUqIG9iaiwgdjg6OlBlcnNpc3RlbnQ8 djg6OkRhdGE+IHZhbHVlKQorYm9vbCBET01EYXRhU3RvcmU6OkludHJ1c2l2ZURPTVdyYXBwZXJN YXA6OnJlbW92ZUlmUHJlc2VudChOb2RlKiBvYmosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+ IHZhbHVlKQogewogICAgIEFTU0VSVChvYmopOwogICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmpl Y3Q+KiBlbnRyeSA9IG9iai0+d3JhcHBlcigpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01EYXRhU3RvcmUuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgK aW5kZXggYTEwNTFkZDhmYTQxNTYzMTIxNjg2MzgwNjYxYWNkMzMyZmQ0NTY2Ni4uY2ZlMjIwZTIw MTkyZDJmMjljOWMwYjBlNGQwODYxZDEwMDhkOWNmNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5k aW5ncy92OC9ET01EYXRhU3RvcmUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFT dG9yZS5oCkBAIC0xOTAsNyArMTkwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAg ICAgICAgIG1fdGFibGUudmlzaXQoc3RvcmUsIHZpc2l0b3IpOwogICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICB2aXJ0dWFsIGJvb2wgcmVtb3ZlSWZQcmVzZW50KE5vZGUqIGtleSwgdjg6OlBl cnNpc3RlbnQ8djg6OkRhdGE+IHZhbHVlKTsKKyAgICAgICAgICAgIHZpcnR1YWwgYm9vbCByZW1v dmVJZlByZXNlbnQoTm9kZSosIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+KTsKIAogICAgICAg ICAgICAgdmlydHVhbCB2b2lkIGNsZWFyKCkKICAgICAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01N YXAuaAppbmRleCBjMmI1YTlkNzZiZThiNjBlYmFiMTZkNTViNzM3YTU4MGVmOTVhNWQyLi41MWQ5 MzNhODNmYmQ3ODY0ZTc1MjMwNDIwMjNmNDkzY2Q3OWM3NzY2IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTU1h cC5oCkBAIC02MCw3ICs2MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVh bCB2b2lkIHNldChLZXlUeXBlKiBvYmosIHY4OjpQZXJzaXN0ZW50PFZhbHVlVHlwZT4gd3JhcHBl cikgPSAwOwogICAgICAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoS2V5VHlwZSogb2JqKSA9IDA7 CiAgICAgICAgIHZpcnR1YWwgdm9pZCB2aXNpdChET01EYXRhU3RvcmUqIHN0b3JlLCBWaXNpdG9y KiB2aXNpdG9yKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgYm9vbCByZW1vdmVJZlByZXNlbnQoS2V5 VHlwZSoga2V5LCB2ODo6UGVyc2lzdGVudDx2ODo6RGF0YT4gdmFsdWUpID0gMDsKKyAgICAgICAg dmlydHVhbCBib29sIHJlbW92ZUlmUHJlc2VudChLZXlUeXBlKiwgdjg6OlBlcnNpc3RlbnQ8VmFs dWVUeXBlPikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgY2xlYXIoKSA9IDA7CiAKICAgICAg ICAgdjg6OldlYWtSZWZlcmVuY2VDYWxsYmFjayB3ZWFrUmVmZXJlbmNlQ2FsbGJhY2soKSB7IHJl dHVybiBtX3dlYWtSZWZlcmVuY2VDYWxsYmFjazsgfQpAQCAtMTA1LDcgKzEwNSw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIGhhbmRsZS5DbGVhcigpOwogICAgICAgICB9CiAK LSAgICAgICAgYm9vbCByZW1vdmVJZlByZXNlbnQoS2V5VHlwZSoga2V5LCB2ODo6UGVyc2lzdGVu dDx2ODo6RGF0YT4gdmFsdWUpCisgICAgICAgIGJvb2wgcmVtb3ZlSWZQcmVzZW50KEtleVR5cGUq IGtleSwgdjg6OlBlcnNpc3RlbnQ8VmFsdWVUeXBlPiB2YWx1ZSkKICAgICAgICAgewogICAgICAg ICAgICAgdHlwZW5hbWUgSGFzaE1hcDxLZXlUeXBlKiwgVmFsdWVUeXBlKj46Oml0ZXJhdG9yIGl0 ID0gbV9tYXAuZmluZChrZXkpOwogICAgICAgICAgICAgaWYgKGl0ID09IG1fbWFwLmVuZCgpIHx8 IGl0LT5zZWNvbmQgIT0gKnZhbHVlKQo=