91251 2012-07-13 08:41:10 -0700 [V8] String wrappers should be Independent 2012-07-24 11:43:19 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91317 1 haraken haraken abarth antonm arv dcarney japhet jochen rniwa webkit.review.bot oldest_to_newest 669074 0 haraken 2012-07-13 08:41:10 -0700 Currently V8 String wrappers are not marked Independent. By marking them Independent, they can be reclaimed by the scavenger GC. 669077 1 152269 haraken 2012-07-13 08:43:39 -0700 Created attachment 152269 Patch 669175 2 152269 abarth 2012-07-13 10:20:41 -0700 Comment on attachment 152269 Patch Ok. 669319 3 152269 webkit.review.bot 2012-07-13 12:05:34 -0700 Comment on attachment 152269 Patch Clearing flags on attachment: 152269 Committed r122614: <http://trac.webkit.org/changeset/122614> 669320 4 webkit.review.bot 2012-07-13 12:05:39 -0700 All reviewed patches have been landed. Closing bug. 669735 5 rniwa 2012-07-13 23:41:09 -0700 It appears that two perf tests started crashing after this patch: http://build.webkit.org/builders/Chromium%20Linux%20Release%20%28Perf%29/builds/4057/steps/perf-test/logs/stdio Blame list: http://build.webkit.org/builders/Chromium%20Linux%20Release%20%28Perf%29/builds/4057 669736 6 abarth 2012-07-13 23:43:17 -0700 Shall we revert the change and study the crashes? 669737 7 rniwa 2012-07-13 23:45:37 -0700 (In reply to comment #6) > Shall we revert the change and study the crashes? That makes sense given that the blame list doesn't have other suspicious changes. Meanwhile, I'll try to confirm that this is the culprit by locally building & running tests. 669777 8 rniwa 2012-07-14 01:51:35 -0700 Confirmed. 669779 9 webkit.review.bot 2012-07-14 01:52:37 -0700 Re-opened since this is blocked by 91317 670174 10 haraken 2012-07-16 00:56:42 -0700 arv: Do you know why this patch is wrong? My question is whether making String wrappers independent is a wrong fix, or making String wrappers independent is a correct fix but some V8 binding code is wrong. For example, worker-location.html fails with the following diff: --- /usr/local/google/home/haraken/chrome-build/src/webkit/Release/layout-test-results/fast/workers/worker-location-expected.txt +++ /usr/local/google/home/haraken/chrome-build/src/webkit/Release/layout-test-results/fast/workers/worker-location-actual.txt @@ -3,7 +3,7 @@ WorkerLocation: function WorkerLocation() { [native code] } typeof location: object location: file:<...>/fast/workers/resources/worker-common.js -location.href: file:<...>/fast/workers/resources/worker-common.js +location.href: [object MessageEvent] location.protocol: file: location.host: location.hostname: 670712 11 arv 2012-07-16 15:18:40 -0700 (In reply to comment #10) > arv: Do you know why this patch is wrong? My question is whether making String wrappers independent is a wrong fix, or making String wrappers independent is a correct fix but some V8 binding code is wrong. I don't know enough about this... Looking more at the code it seems like the callback for the weak handle might not be able to get the correct isolate static void cachedStringCallback(v8::Persistent<v8::Value> wrapper, void* parameter) { StringImpl* stringImpl = static_cast<StringImpl*>(parameter); V8BindingPerIsolateData::current()->stringCache()->remove(stringImpl); wrapper.Dispose(); stringImpl->deref(); } > For example, worker-location.html fails with the following diff: > -location.href: file:<...>/fast/workers/resources/worker-common.js > +location.href: [object MessageEvent] This is strange. It seems like there was an error invoking the right toString method here. 671015 12 haraken 2012-07-16 23:25:21 -0700 > Looking more at the code it seems like the callback for the weak handle might not be able to get the correct isolate Good point! Thanks arv. Given that no one has implicit references to String wrappers, I think this patch should work fine. I'll look into it in detail. 676448 13 153973 haraken 2012-07-24 00:13:50 -0700 Created attachment 153973 Patch 676459 14 dcarney 2012-07-24 00:25:08 -0700 (In reply to comment #13) > Created an attachment (id=153973) [details] > Patch Great! I wonder if the following would even be better: if( stringImpl == m_lastStringImpl ) m_lastStringImpl = 0; Then the last string cache will continue to work after an arbitrary remove. 676463 15 153976 haraken 2012-07-24 00:29:26 -0700 Created attachment 153976 Patch 676464 16 haraken 2012-07-24 00:29:41 -0700 (In reply to comment #14) > if( stringImpl == m_lastStringImpl ) > m_lastStringImpl = 0; > > Then the last string cache will continue to work after an arbitrary remove. Good point!. Fixed. 676974 17 153976 abarth 2012-07-24 10:24:13 -0700 Comment on attachment 153976 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153976&action=review > Source/WebCore/ChangeLog:40 > + Without 'm_lastStringImpl = 0', already disposed m_lastV8String can be used > + in v8ExternalString(). This was a cause of the crashes of r122614. Ah. Interesting. 677069 18 153976 webkit.review.bot 2012-07-24 11:43:14 -0700 Comment on attachment 153976 Patch Clearing flags on attachment: 153976 Committed r123500: <http://trac.webkit.org/changeset/123500> 677070 19 webkit.review.bot 2012-07-24 11:43:19 -0700 All reviewed patches have been landed. Closing bug. 152269 2012-07-13 08:43:39 -0700 2012-07-24 00:13:44 -0700 Patch bug-91251-20120713174336.patch text/plain 1671 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA2M2U3MmJhNmVhMWU1 ZGU2YTJmMzJmNjBkODAxNzkzZTFkOTRkZC4uYWEzOGRiMWZmMjE3MzRmZDZmZDljMDk4ZGEzZWUw OGQ4OGRlMjJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTA3LTEzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFN0cmluZyB3 cmFwcGVycyBzaG91bGQgYmUgbWFya2VkIEluZGVwZW5kZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTI1MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSBWOCBTdHJpbmcgd3JhcHBlcnMg YXJlIG5vdCBtYXJrZWQgSW5kZXBlbmRlbnQuCisgICAgICAgIEJ5IG1hcmtpbmcgdGhlbSBJbmRl cGVuZGVudCwgdGhleSBjYW4gYmUgcmVjbGFpbWVkIGJ5IHRoZSBzY2F2ZW5nZXIgR0MuCisKKyAg ICAgICAgSSB0cmllZCB0byBmaW5kIHNvbWUgY2FzZXMgd2hlcmUgdGhpcyBjaGFuZ2UgcmVkdWNl cyBtZW1vcnkgdXNhZ2UsCisgICAgICAgIGJ1dCBjb3VsZG4ndCBkdWUgdG8gc2Vuc2l0aXZlIGJl aGF2aW9yIG9mIEdDLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3Iu CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3RyaW5nQ2FjaGU6OnY4RXh0ZXJuYWxTdHJpbmdTbG93KToKKworMjAxMi0wNy0xMyAgS2Vu dGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjEyMjU0NS4KICAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvMTIyNTQ1CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTE4NQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5k aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5jcHAKaW5kZXgg ODE5OGFkMGQ2YWMxZTk5NTQ5YjBhYzFlMTM5OGZmMjFmMDRkOTIxNC4uZGY3ODkxODZkODZmNGM4 YTk3YzczZDVlZDkyMmZhOTJiMDVkODBkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvVjhCaW5kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OEJpbmRpbmcuY3BwCkBAIC00OTMsNiArNDkzLDcgQEAgdjg6OkxvY2FsPHY4OjpTdHJpbmc+IFN0 cmluZ0NhY2hlOjp2OEV4dGVybmFsU3RyaW5nU2xvdyhTdHJpbmdJbXBsKiBzdHJpbmdJbXBsLAog ICAgICAgICByZXR1cm4gbmV3U3RyaW5nOwogCiAgICAgc3RyaW5nSW1wbC0+cmVmKCk7CisgICAg d3JhcHBlci5NYXJrSW5kZXBlbmRlbnQoKTsKICAgICB3cmFwcGVyLk1ha2VXZWFrKHN0cmluZ0lt cGwsIGNhY2hlZFN0cmluZ0NhbGxiYWNrKTsKICAgICBtX3N0cmluZ0NhY2hlLnNldChzdHJpbmdJ bXBsLCAqd3JhcHBlcik7CiAK 153973 2012-07-24 00:13:50 -0700 2012-07-24 00:29:20 -0700 Patch bug-91251-20120724161342.patch text/plain 3490 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg2OTIwM2M2OTE0OWY3 NmE0OTdlNjlhOTJiNGNlMmEyZjE4ZWFiNS4uNDMyMWFmYWQzNjU5NzVlYWZlNWJmNzk4M2U0ZDYy MzhmZTM4Y2U1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDEyLTA3LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFN0cmluZyB3 cmFwcGVycyBzaG91bGQgYmUgbWFya2VkIEluZGVwZW5kZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTI1MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSBWOCBTdHJpbmcgd3JhcHBlcnMg YXJlIG5vdCBtYXJrZWQgSW5kZXBlbmRlbnQuCisgICAgICAgIEJ5IG1hcmtpbmcgdGhlbSBJbmRl cGVuZGVudCwgdGhleSBjYW4gYmUgcmVjbGFpbWVkIGJ5IHRoZSBzY2F2ZW5nZXIgR0MuCisgICAg ICAgIEFsdGhvdWdoIEkgY291bGRuJ3QgZmluZCBhIGNhc2Ugd2hlcmUgdGhpcyBjaGFuZ2UgcmVk dWNlcyBtZW1vcnkgdXNhZ2UsCisgICAgICAgIHRoaXMgY2hhbmdlIHdvdWxkIGJlIGltcG9ydGFu dCBmb3IgdXBjb21pbmcgY2hhbmdlcyBpbiBzdHJpbmcgY29udmVyc2lvbgorICAgICAgICBiZXR3 ZWVuIFY4IGFuZCBXZWJLaXQgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTg1MCkuCisKKyAgICAgICAgJ21fbGFzdFN0cmluZ0ltcGwgPSAwJyBpbiBTdHJpbmdDYWNo ZTo6cmVtb3ZlKCkgaXMgaW1wb3J0YW50LgorICAgICAgICBMb29rIGF0IHRoZSBmb2xsb3dpbmcg Y29kZToKKworICAgICAgICAgICAgc3RhdGljIHZvaWQgY2FjaGVkU3RyaW5nQ2FsbGJhY2sodjg6 OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB3cmFwcGVyLCB2b2lkKiBwYXJhbWV0ZXIpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgLi4uOworICAgICAgICAgICAgICAgIHN0cmluZ0NhY2hl KCktPnJlbW92ZShzdHJpbmdJbXBsKTsKKyAgICAgICAgICAgICAgICB3cmFwcGVyLkRpc3Bvc2Uo KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdm9pZCBTdHJpbmdDYWNoZTo6cmVtb3Zl KFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg Li4uCisgICAgICAgICAgICAgICAgbV9sYXN0U3RyaW5nSW1wbCA9IDA7CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIHY4OjpMb2NhbDx2ODo6U3RyaW5nPiB2OEV4dGVybmFsU3RyaW5nKFN0 cmluZ0ltcGwqIHN0cmluZ0ltcGwsIHY4OjpJc29sYXRlKiBpc29sYXRlKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIGlmIChtX2xhc3RTdHJpbmdJbXBsLmdldCgpID09IHN0cmluZ0lt cGwpIHsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6U3RyaW5nPjo6 TmV3KG1fbGFzdFY4U3RyaW5nKTsgLy8gbV9sYXN0VjhTdHJpbmcgcG9pbnRzIHRvIGEgd3JhcHBl ciBvYmplY3QgdGhhdCB3YXMgYWNjZXNzZWQgbW9zdCByZWNlbnRseS4KKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgcmV0dXJuIHY4RXh0ZXJuYWxTdHJpbmdTbG93KHN0cmluZ0lt cGwsIGlzb2xhdGUpOworICAgICAgICAgICAgfQorCisgICAgICAgIFdpdGhvdXQgJ21fbGFzdFN0 cmluZ0ltcGwgPSAwJywgYWxyZWFkeSBkaXNwb3NlZCBtX2xhc3RWOFN0cmluZyBjYW4gYmUgdXNl ZAorICAgICAgICBpbiB2OEV4dGVybmFsU3RyaW5nKCkuIFRoaXMgd2FzIGEgY2F1c2Ugb2YgdGhl IGNyYXNoZXMgb2YgcjEyMjYxNC4KKworICAgICAgICBUZXN0czogQXQgdGhlIGluaXRpYWwgY29t bWl0IG9mIHRoaXMgcGF0Y2ggKHIxMjI2MTQpLAorICAgICAgICAgICAgICAgdGhlIGZvbGxvd2lu ZyB0ZXN0cyBoYWQgYmVlbiBicm9rZW4gZHVlIHRvIG1pc3NpbmcgJ21fbGFzdFN0cmluZ0ltcGwg PSAwJy4KKyAgICAgICAgICAgICAgIGZhc3Qvd29ya2Vycy93b3JrZXItbG9jYXRpb24uaHRtbAor ICAgICAgICAgICAgICAgRHJvbWFlby9jc3NxdWVyeS1qcXVlcnkuaHRtbAorICAgICAgICAgICAg ICAgRHJvbWFlby9qc2xpYi1ldmVudC1qcXVlcnkuaHRtbAorICAgICAgICAgICAgICAgRHJvbWFl by9qc2xpYi1zdHlsZS1qcXVlcnkuaHRtbAorICAgICAgICAgICAgICAgRHJvbWFlby9qc2xpYi1z dHlsZS1wcm90b3R5cGUuaHRtbAorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0cmluZ0NhY2hlOjpyZW1vdmUpOgorICAgICAgICAoV2Vi Q29yZTo6U3RyaW5nQ2FjaGU6OnY4RXh0ZXJuYWxTdHJpbmdTbG93KToKKwogMjAxMi0wNy0yMyAg SGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQSBGb2N1c1Njb3Bl IGZvciBhIGRpc3RyaWJ1dGVkIG5vZGUgc2hvdWxkIG5vdCBiZSBpdHMgVHJlZVNjb3BlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5jcHAKaW5kZXggZDI4MmIwZGJlZjc4Njk5 MzQyNWI5ZDc2YjA3N2EzM2QwMzZhY2YxMy4uOWVkNDk3OTdiMzEyYTQzMTRhNjc3Nzg4MjdlMGVk ODZjNzJmNDVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5k aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwCkBA IC00NjcsNiArNDY3LDcgQEAgdm9pZCBTdHJpbmdDYWNoZTo6cmVtb3ZlKFN0cmluZ0ltcGwqIHN0 cmluZ0ltcGwpCiB7CiAgICAgQVNTRVJUKG1fc3RyaW5nQ2FjaGUuY29udGFpbnMoc3RyaW5nSW1w bCkpOwogICAgIG1fc3RyaW5nQ2FjaGUucmVtb3ZlKHN0cmluZ0ltcGwpOworICAgIG1fbGFzdFN0 cmluZ0ltcGwgPSAwOwogfQogCiB2ODo6TG9jYWw8djg6OlN0cmluZz4gU3RyaW5nQ2FjaGU6OnY4 RXh0ZXJuYWxTdHJpbmdTbG93KFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwsIHY4OjpJc29sYXRlKiBp c29sYXRlKQpAQCAtNDkzLDYgKzQ5NCw3IEBAIHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBTdHJpbmdD YWNoZTo6djhFeHRlcm5hbFN0cmluZ1Nsb3coU3RyaW5nSW1wbCogc3RyaW5nSW1wbCwKICAgICAg ICAgcmV0dXJuIG5ld1N0cmluZzsKIAogICAgIHN0cmluZ0ltcGwtPnJlZigpOworICAgIHdyYXBw ZXIuTWFya0luZGVwZW5kZW50KCk7CiAgICAgd3JhcHBlci5NYWtlV2VhayhzdHJpbmdJbXBsLCBj YWNoZWRTdHJpbmdDYWxsYmFjayk7CiAgICAgbV9zdHJpbmdDYWNoZS5zZXQoc3RyaW5nSW1wbCwg KndyYXBwZXIpOwogCg== 153976 2012-07-24 00:29:26 -0700 2012-07-24 11:43:14 -0700 Patch bug-91251-20120724162917.patch text/plain 3716 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg2OTIwM2M2OTE0OWY3 NmE0OTdlNjlhOTJiNGNlMmEyZjE4ZWFiNS4uOGQ0OTU5Yjg5NTcxOGMyZTA3MmQ4NTkyNTMxNjY5 MmJhYTJiMGQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU2IEBACisyMDEyLTA3LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFN0cmluZyB3 cmFwcGVycyBzaG91bGQgYmUgbWFya2VkIEluZGVwZW5kZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTI1MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSBWOCBTdHJpbmcgd3JhcHBlcnMg YXJlIG5vdCBtYXJrZWQgSW5kZXBlbmRlbnQuCisgICAgICAgIEJ5IG1hcmtpbmcgdGhlbSBJbmRl cGVuZGVudCwgdGhleSBjYW4gYmUgcmVjbGFpbWVkIGJ5IHRoZSBzY2F2ZW5nZXIgR0MuCisgICAg ICAgIEFsdGhvdWdoIEkgY291bGRuJ3QgZmluZCBhIGNhc2Ugd2hlcmUgdGhpcyBjaGFuZ2UgcmVk dWNlcyBtZW1vcnkgdXNhZ2UsCisgICAgICAgIHRoaXMgY2hhbmdlIHdvdWxkIGJlIGltcG9ydGFu dCBmb3IgdXBjb21pbmcgY2hhbmdlcyBpbiBzdHJpbmcgY29udmVyc2lvbgorICAgICAgICBiZXR3 ZWVuIFY4IGFuZCBXZWJLaXQgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTg1MCkuCisKKyAgICAgICAgJ21fbGFzdFN0cmluZ0ltcGwgPSAwJyBpbiBTdHJpbmdDYWNo ZTo6cmVtb3ZlKCkgaXMgaW1wb3J0YW50LgorICAgICAgICBMb29rIGF0IHRoZSBmb2xsb3dpbmcg Y29kZToKKworICAgICAgICAgICAgc3RhdGljIHZvaWQgY2FjaGVkU3RyaW5nQ2FsbGJhY2sodjg6 OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB3cmFwcGVyLCB2b2lkKiBwYXJhbWV0ZXIpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgLi4uOworICAgICAgICAgICAgICAgIHN0cmluZ0NhY2hl KCktPnJlbW92ZShzdHJpbmdJbXBsKTsKKyAgICAgICAgICAgICAgICB3cmFwcGVyLkRpc3Bvc2Uo KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdm9pZCBTdHJpbmdDYWNoZTo6cmVtb3Zl KFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg Li4uCisgICAgICAgICAgICAgICAgaWYgKG1fbGFzdFN0cmluZ0ltcGwuZ2V0KCkgPT0gc3RyaW5n SW1wbCkKKyAgICAgICAgICAgICAgICAgICAgbV9sYXN0U3RyaW5nSW1wbCA9IDA7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIHY4OjpMb2NhbDx2ODo6U3RyaW5nPiB2OEV4dGVybmFsU3Ry aW5nKFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwsIHY4OjpJc29sYXRlKiBpc29sYXRlKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIGlmIChtX2xhc3RTdHJpbmdJbXBsLmdldCgpID09IHN0 cmluZ0ltcGwpIHsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6U3Ry aW5nPjo6TmV3KG1fbGFzdFY4U3RyaW5nKTsgLy8gbV9sYXN0VjhTdHJpbmcgcG9pbnRzIHRvIGEg d3JhcHBlciBvYmplY3QgdGhhdCB3YXMgYWNjZXNzZWQgbW9zdCByZWNlbnRseS4KKyAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgcmV0dXJuIHY4RXh0ZXJuYWxTdHJpbmdTbG93KHN0 cmluZ0ltcGwsIGlzb2xhdGUpOworICAgICAgICAgICAgfQorCisgICAgICAgIFdpdGhvdXQgJ21f bGFzdFN0cmluZ0ltcGwgPSAwJywgYWxyZWFkeSBkaXNwb3NlZCBtX2xhc3RWOFN0cmluZyBjYW4g YmUgdXNlZAorICAgICAgICBpbiB2OEV4dGVybmFsU3RyaW5nKCkuIFRoaXMgd2FzIGEgY2F1c2Ug b2YgdGhlIGNyYXNoZXMgb2YgcjEyMjYxNC4KKworICAgICAgICBUZXN0czogQXQgdGhlIGluaXRp YWwgY29tbWl0IG9mIHRoaXMgcGF0Y2ggKHIxMjI2MTQpLAorICAgICAgICAgICAgICAgdGhlIGZv bGxvd2luZyB0ZXN0cyBoYWQgYmVlbiBicm9rZW4gZHVlIHRvIG1pc3NpbmcgJ21fbGFzdFN0cmlu Z0ltcGwgPSAwJy4KKyAgICAgICAgICAgICAgIGZhc3Qvd29ya2Vycy93b3JrZXItbG9jYXRpb24u aHRtbAorICAgICAgICAgICAgICAgRHJvbWFlby9jc3NxdWVyeS1qcXVlcnkuaHRtbAorICAgICAg ICAgICAgICAgRHJvbWFlby9qc2xpYi1ldmVudC1qcXVlcnkuaHRtbAorICAgICAgICAgICAgICAg RHJvbWFlby9qc2xpYi1zdHlsZS1qcXVlcnkuaHRtbAorICAgICAgICAgICAgICAgRHJvbWFlby9q c2xpYi1zdHlsZS1wcm90b3R5cGUuaHRtbAorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhCaW5k aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0cmluZ0NhY2hlOjpyZW1vdmUpOgorICAgICAg ICAoV2ViQ29yZTo6U3RyaW5nQ2FjaGU6OnY4RXh0ZXJuYWxTdHJpbmdTbG93KToKKwogMjAxMi0w Ny0yMyAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQSBGb2N1 c1Njb3BlIGZvciBhIGRpc3RyaWJ1dGVkIG5vZGUgc2hvdWxkIG5vdCBiZSBpdHMgVHJlZVNjb3Bl LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5jcHAKaW5kZXggZDI4MmIwZGJl Zjc4Njk5MzQyNWI5ZDc2YjA3N2EzM2QwMzZhY2YxMy4uMDI1MWNkYWJiZDJmODk5YjYxNWQ0MGIy ODgyYmM4YzhiMTc2NTJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhCaW5kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcu Y3BwCkBAIC00NjcsNiArNDY3LDEwIEBAIHZvaWQgU3RyaW5nQ2FjaGU6OnJlbW92ZShTdHJpbmdJ bXBsKiBzdHJpbmdJbXBsKQogewogICAgIEFTU0VSVChtX3N0cmluZ0NhY2hlLmNvbnRhaW5zKHN0 cmluZ0ltcGwpKTsKICAgICBtX3N0cmluZ0NhY2hlLnJlbW92ZShzdHJpbmdJbXBsKTsKKyAgICAv LyBNYWtlIHN1cmUgdGhhdCBhbHJlYWR5IGRpc3Bvc2VkIG1fbGFzdFY4U3RyaW5nIGlzIG5vdCB1 c2VkIGluCisgICAgLy8gU3RyaW5nQ2FjaGU6OnY4RXh0ZXJuYWxTdHJpbmcoKS4KKyAgICBpZiAo bV9sYXN0U3RyaW5nSW1wbC5nZXQoKSA9PSBzdHJpbmdJbXBsKQorICAgICAgICBtX2xhc3RTdHJp bmdJbXBsID0gMDsKIH0KIAogdjg6OkxvY2FsPHY4OjpTdHJpbmc+IFN0cmluZ0NhY2hlOjp2OEV4 dGVybmFsU3RyaW5nU2xvdyhTdHJpbmdJbXBsKiBzdHJpbmdJbXBsLCB2ODo6SXNvbGF0ZSogaXNv bGF0ZSkKQEAgLTQ5Myw2ICs0OTcsNyBAQCB2ODo6TG9jYWw8djg6OlN0cmluZz4gU3RyaW5nQ2Fj aGU6OnY4RXh0ZXJuYWxTdHJpbmdTbG93KFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwsCiAgICAgICAg IHJldHVybiBuZXdTdHJpbmc7CiAKICAgICBzdHJpbmdJbXBsLT5yZWYoKTsKKyAgICB3cmFwcGVy Lk1hcmtJbmRlcGVuZGVudCgpOwogICAgIHdyYXBwZXIuTWFrZVdlYWsoc3RyaW5nSW1wbCwgY2Fj aGVkU3RyaW5nQ2FsbGJhY2spOwogICAgIG1fc3RyaW5nQ2FjaGUuc2V0KHN0cmluZ0ltcGwsICp3 cmFwcGVyKTsKIAo=