57611 2011-04-01 03:20:19 -0700 [GTK] Do not destroy WorkQueue event sources unless they have been cancelled 2011-04-08 03:36:06 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 57540 1 cgarcia webkit-unassigned oldest_to_newest 377694 0 cgarcia 2011-04-01 03:20:19 -0700 We are currently returning FALSE from performWork() when condition contains HUP or ERR which makes the source to be destroyed, but it's not removed from the event source list. When unregisterEventSourceHandler() is called the source might be destroyed already. To avoid that we can simply return TRUE from the callback unless it has been cancelled (condition = 0) which happens in unregisterEventSourceHandler(). 377696 1 87836 cgarcia 2011-04-01 03:29:23 -0700 Created attachment 87836 Patch This patch applies on top of patch attached to bug #57540 377860 2 87836 mrobinson 2011-04-01 09:43:30 -0700 Comment on attachment 87836 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87836&action=review Nice. > Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp:61 > if (!queue->m_isValid) > - return FALSE; > + return; It appears that Mac does not cancel the source either if the queue is invalid. Do you know in what cases this can happen? 382125 3 cgarcia 2011-04-08 03:35:51 -0700 Committed r83281: <http://trac.webkit.org/changeset/83281> 87836 2011-04-01 03:29:23 -0700 2011-04-08 03:36:06 -0700 Patch source-callback.diff text/plain 8904 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMjZlNzI3Li5hNTZjNDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMDQtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IERvIG5vdCBkZXN0cm95IFdvcmtRdWV1ZSBldmVudCBzb3VyY2VzIHVubGVzcyB0aGV5IGhhdmUg YmVlbiBjYW5jZWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU3NjExCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Xb3JrUXVldWUuaDoKKyAgICAgICAg KiBQbGF0Zm9ybS9ndGsvV29ya1F1ZXVlR3RrLmNwcDoKKyAgICAgICAgKFdvcmtRdWV1ZTo6RXZl bnRTb3VyY2U6OkV2ZW50U291cmNlKTogUmVtb3ZlIHVudXNlZCBtZW1iZXIKKyAgICAgICAgbV9k aXNwYXRjaFNvdXJjZS4KKyAgICAgICAgKFdvcmtRdWV1ZTo6RXZlbnRTb3VyY2U6OmV4ZWN1dGVF dmVudFNvdXJjZSk6IE1ha2UgaXQgcmV0dXJuIHZvaWQKKyAgICAgICAgaW5zdGVhZCBvZiBib29s ZWFuIHNpbmNlIHdlIGFyZSBhbHdheXMgaWdub3JpbmcgdGhlIHJldHVybiB2YWx1ZS4KKyAgICAg ICAgKFdvcmtRdWV1ZTo6RXZlbnRTb3VyY2U6OnBlcmZvcm1Xb3JrKTogUmV0dXJuIEZBTFNFIGZy b20gdGhlCisgICAgICAgIGNhbGxiYWNrIG9ubHkgd2hlbiB0aGUgc291cmNlIGhhcyBiZWVuIGNh bmNlbGxlZCAoY29uZGl0aW9uID0gMCkKKyAgICAgICAgdG8gbWFrZSBzdXJlIGl0J3MgZGVzdHJv eWVkIHdoZW4gdGhlIGV2ZW4gc291cmNlIGhhbmRsZXIgaXMKKyAgICAgICAgdW5yZWdpc3RlcmVk LgorICAgICAgICAoV29ya1F1ZXVlOjpyZWdpc3RlckV2ZW50U291cmNlSGFuZGxlcik6IFVzZSBH UmVmUHRyIGZvciB0aGUKKyAgICAgICAgc291cmNlLCB0byBhdm9pZCBsZWFraW5nIGl0LgorICAg ICAgICAoV29ya1F1ZXVlOjpzY2hlZHVsZVdvcmtPblNvdXJjZSk6IFJlY2VpdmUgdGhlIHNvdXJj ZSBjYWxsYmFjayBhcworICAgICAgICBwYXJhbWV0ZXIgc28gdGhhdCBpdCBjYW4gYmUgdXNlZCBi eSBzY2hlZHVsZVdvcmtPblRlcm1pbmF0aW9uKCkgdG9vLgorICAgICAgICAoV29ya1F1ZXVlOjpz Y2hlZHVsZVdvcmspOgorICAgICAgICAoV29ya1F1ZXVlOjpzY2hlZHVsZVdvcmtBZnRlckRlbGF5 KToKKyAgICAgICAgKFdvcmtRdWV1ZTo6c2NoZWR1bGVXb3JrT25UZXJtaW5hdGlvbik6IFVzZSBz Y2hlZHVsZVdvcmtPblNvdXJjZSgpLgorCiAyMDExLTAzLTMxICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIFdpbkNhaXJvIGJ1aWxkIGZp eCBhZnRlciByODI2MzIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Xb3Jr UXVldWUuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL1dvcmtRdWV1ZS5oCmluZGV4IGQ2Yjgy ZDYuLjc0ZDYwNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL1dvcmtRdWV1 ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL1dvcmtRdWV1ZS5oCkBAIC00OSw2ICs0 OSw3IEBAIGNsYXNzIFFUaHJlYWQ7CiAjaW5jbHVkZSAiUGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmll ci5oIgogdHlwZWRlZiBzdHJ1Y3QgX0dNYWluQ29udGV4dCBHTWFpbkNvbnRleHQ7CiB0eXBlZGVm IHN0cnVjdCBfR01haW5Mb29wIEdNYWluTG9vcDsKK3R5cGVkZWYgZ2Jvb2xlYW4gKCpHU291cmNl RnVuYykgKGdwb2ludGVyIGRhdGEpOwogI2VuZGlmCiAKIGNsYXNzIFdvcmtRdWV1ZSB7CkBAIC0x NjcsNyArMTY4LDcgQEAgcHJpdmF0ZToKICNlbGlmIFBMQVRGT1JNKEdUSykKICAgICBzdGF0aWMg dm9pZCogc3RhcnRXb3JrUXVldWVUaHJlYWQoV29ya1F1ZXVlKik7CiAgICAgdm9pZCB3b3JrUXVl dWVUaHJlYWRCb2R5KCk7Ci0gICAgdm9pZCBzY2hlZHVsZVdvcmtPblNvdXJjZShHU291cmNlKiwg UGFzc093blB0cjxXb3JrSXRlbT4pOworICAgIHZvaWQgc2NoZWR1bGVXb3JrT25Tb3VyY2UoR1Nv dXJjZSosIFBhc3NPd25QdHI8V29ya0l0ZW0+LCBHU291cmNlRnVuYyk7CiAKICAgICBUaHJlYWRJ ZGVudGlmaWVyIG1fd29ya1F1ZXVlVGhyZWFkOwogICAgIEdNYWluQ29udGV4dCogbV9ldmVudENv bnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvV29ya1F1ZXVl R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Xb3JrUXVldWVHdGsuY3BwCmlu ZGV4IDg5NGNkMWIuLmE5MjdlODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt L2d0ay9Xb3JrUXVldWVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9X b3JrUXVldWVHdGsuY3BwCkBAIC0xLDQgKzEsNSBAQAogLyoKKyAqIENvcHlyaWdodCAoQykgMjAx MSBJZ2FsaWEgUy5MLgogICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqIFBvcnRpb25zIENvcHlyaWdodCAoYykgMjAxMCBNb3Rvcm9sYSBNb2Jp bGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCkBAIC0zNiw5ICszNyw4IEBACiAv LyBXb3JrUXVldWU6OkV2ZW50U291cmNlCiBjbGFzcyBXb3JrUXVldWU6OkV2ZW50U291cmNlIHsK IHB1YmxpYzoKLSAgICBFdmVudFNvdXJjZShHU291cmNlKiBkaXNwYXRjaFNvdXJjZSwgUGFzc093 blB0cjxXb3JrSXRlbT4gd29ya0l0ZW0sIFdvcmtRdWV1ZSogd29ya1F1ZXVlLCBHQ2FuY2VsbGFi bGUqIGNhbmNlbGxhYmxlKQotICAgICAgICA6IG1fZGlzcGF0Y2hTb3VyY2UoZGlzcGF0Y2hTb3Vy Y2UpCi0gICAgICAgICwgbV93b3JrSXRlbSh3b3JrSXRlbSkKKyAgICBFdmVudFNvdXJjZShQYXNz T3duUHRyPFdvcmtJdGVtPiB3b3JrSXRlbSwgV29ya1F1ZXVlKiB3b3JrUXVldWUsIEdDYW5jZWxs YWJsZSogY2FuY2VsbGFibGUpCisgICAgICAgIDogbV93b3JrSXRlbSh3b3JrSXRlbSkKICAgICAg ICAgLCBtX3dvcmtRdWV1ZSh3b3JrUXVldWUpCiAgICAgICAgICwgbV9jYW5jZWxsYWJsZShjYW5j ZWxsYWJsZSkKICAgICB7CkBAIC01MSwxOSArNTEsMTcgQEAgcHVibGljOgogICAgICAgICBnX2Nh bmNlbGxhYmxlX2NhbmNlbChtX2NhbmNlbGxhYmxlKTsKICAgICB9CiAKLSAgICBzdGF0aWMgZ2Jv b2xlYW4gZXhlY3V0ZUV2ZW50U291cmNlKEV2ZW50U291cmNlKiBldmVudFNvdXJjZSkKKyAgICBz dGF0aWMgdm9pZCBleGVjdXRlRXZlbnRTb3VyY2UoRXZlbnRTb3VyY2UqIGV2ZW50U291cmNlKQog ICAgIHsKICAgICAgICAgQVNTRVJUKGV2ZW50U291cmNlKTsKICAgICAgICAgV29ya1F1ZXVlKiBx dWV1ZSA9IGV2ZW50U291cmNlLT5tX3dvcmtRdWV1ZTsKICAgICAgICAgewogICAgICAgICAgICAg TXV0ZXhMb2NrZXIgbG9ja2VyKHF1ZXVlLT5tX2lzVmFsaWRNdXRleCk7CiAgICAgICAgICAgICBp ZiAoIXF1ZXVlLT5tX2lzVmFsaWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIEZBTFNFOworICAg ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGV2ZW50U291cmNlLT5t X3dvcmtJdGVtLT5leGVjdXRlKCk7Ci0KLSAgICAgICAgcmV0dXJuIFRSVUU7CiAgICAgfQogCiAg ICAgc3RhdGljIGdib29sZWFuIHBlcmZvcm1Xb3JrT25jZShFdmVudFNvdXJjZSogZXZlbnRTb3Vy Y2UpCkBAIC03NCwxNiArNzIsMTIgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGdib29sZWFuIHBl cmZvcm1Xb3JrKEdTb2NrZXQqIHNvY2tldCwgR0lPQ29uZGl0aW9uIGNvbmRpdGlvbiwgRXZlbnRT b3VyY2UqIGV2ZW50U291cmNlKQogICAgIHsKLSAgICAgICAgaWYgKCEoY29uZGl0aW9uICYgR19J T19JTikgJiYgIShjb25kaXRpb24gJiBHX0lPX0hVUCkgJiYgIShjb25kaXRpb24gJiBHX0lPX0VS UikpCi0gICAgICAgICAgICByZXR1cm4gRkFMU0U7Ci0KLQotICAgICAgICBpZiAoIWV4ZWN1dGVF dmVudFNvdXJjZShldmVudFNvdXJjZSkpCi0gICAgICAgICAgICByZXR1cm4gRkFMU0U7Ci0KLSAg ICAgICAgaWYgKChjb25kaXRpb24gJiBHX0lPX0hVUCkgfHwgKGNvbmRpdGlvbiAmIEdfSU9fRVJS KSkKKyAgICAgICAgaWYgKCEoY29uZGl0aW9uICYgR19JT19JTikgJiYgIShjb25kaXRpb24gJiBH X0lPX0hVUCkgJiYgIShjb25kaXRpb24gJiBHX0lPX0VSUikpIHsKKyAgICAgICAgICAgIC8vIEV2 ZW50U291cmNlIGhhcyBiZWVuIGNhbmNlbGxlZCwgcmV0dXJuIEZBTFNFIHRvIGRlc3Ryb3kgdGhl IHNvdXJjZS4KICAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICAgICAgfQogCisgICAgICAg IGV4ZWN1dGVFdmVudFNvdXJjZShldmVudFNvdXJjZSk7CiAgICAgICAgIHJldHVybiBUUlVFOwog ICAgIH0KIApAQCAtMTAwLDcgKzk0LDYgQEAgcHVibGljOgogICAgIH0KICAgIAogcHVibGljOgot ICAgIEdTb3VyY2UqIG1fZGlzcGF0Y2hTb3VyY2U7CiAgICAgUGFzc093blB0cjxXb3JrSXRlbT4g bV93b3JrSXRlbTsKICAgICBXb3JrUXVldWUqIG1fd29ya1F1ZXVlOwogICAgIEdDYW5jZWxsYWJs ZSogbV9jYW5jZWxsYWJsZTsKQEAgLTE1MCwxMiArMTQzLDEyIEBAIHZvaWQgV29ya1F1ZXVlOjpy ZWdpc3RlckV2ZW50U291cmNlSGFuZGxlcihpbnQgZmlsZURlc2NyaXB0b3IsIGludCBjb25kaXRp b24sIFBhCiAgICAgR1JlZlB0cjxHU29ja2V0PiBzb2NrZXQgPSBhZG9wdEdSZWYoZ19zb2NrZXRf bmV3X2Zyb21fZmQoZmlsZURlc2NyaXB0b3IsIDApKTsKICAgICBBU1NFUlQoc29ja2V0KTsKICAg ICBHUmVmUHRyPEdDYW5jZWxsYWJsZT4gY2FuY2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxs YWJsZV9uZXcoKSk7Ci0gICAgR1NvdXJjZSogZGlzcGF0Y2hTb3VyY2UgPSBnX3NvY2tldF9jcmVh dGVfc291cmNlKHNvY2tldC5nZXQoKSwgc3RhdGljX2Nhc3Q8R0lPQ29uZGl0aW9uPihjb25kaXRp b24pLCBjYW5jZWxsYWJsZS5nZXQoKSk7CisgICAgR1JlZlB0cjxHU291cmNlPiBkaXNwYXRjaFNv dXJjZSA9IGFkb3B0R1JlZihnX3NvY2tldF9jcmVhdGVfc291cmNlKHNvY2tldC5nZXQoKSwgc3Rh dGljX2Nhc3Q8R0lPQ29uZGl0aW9uPihjb25kaXRpb24pLCBjYW5jZWxsYWJsZS5nZXQoKSkpOwog ICAgIEFTU0VSVChkaXNwYXRjaFNvdXJjZSk7Ci0gICAgRXZlbnRTb3VyY2UqIGV2ZW50U291cmNl ID0gbmV3IEV2ZW50U291cmNlKGRpc3BhdGNoU291cmNlLCBpdGVtLCB0aGlzLCBjYW5jZWxsYWJs ZS5nZXQoKSk7CisgICAgRXZlbnRTb3VyY2UqIGV2ZW50U291cmNlID0gbmV3IEV2ZW50U291cmNl KGl0ZW0sIHRoaXMsIGNhbmNlbGxhYmxlLmdldCgpKTsKICAgICBBU1NFUlQoZXZlbnRTb3VyY2Up OwogCi0gICAgZ19zb3VyY2Vfc2V0X2NhbGxiYWNrKGRpc3BhdGNoU291cmNlLCByZWludGVycHJl dF9jYXN0PEdTb3VyY2VGdW5jPigmV29ya1F1ZXVlOjpFdmVudFNvdXJjZTo6cGVyZm9ybVdvcmsp LCAKKyAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2soZGlzcGF0Y2hTb3VyY2UuZ2V0KCksIHJlaW50 ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KCZXb3JrUXVldWU6OkV2ZW50U291cmNlOjpwZXJmb3Jt V29yayksCiAgICAgICAgIGV2ZW50U291cmNlLCByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90 aWZ5PigmV29ya1F1ZXVlOjpFdmVudFNvdXJjZTo6ZGVsZXRlRXZlbnRTb3VyY2UpKTsKIAogICAg IC8vIFNldCB1cCB0aGUgZXZlbnQgc291cmNlcyB1bmRlciB0aGUgbXV0ZXggc2luY2UgdGhpcyBp cyBzaGFyZWQgYWNyb3NzIG11bHRpcGxlIHRocmVhZHMuCkBAIC0xNzAsNyArMTYzLDcgQEAgdm9p ZCBXb3JrUXVldWU6OnJlZ2lzdGVyRXZlbnRTb3VyY2VIYW5kbGVyKGludCBmaWxlRGVzY3JpcHRv ciwgaW50IGNvbmRpdGlvbiwgUGEKICAgICAgICAgbV9ldmVudFNvdXJjZXMuc2V0KGZpbGVEZXNj cmlwdG9yLCBzb3VyY2VzKTsKICAgICB9CiAKLSAgICBnX3NvdXJjZV9hdHRhY2goZGlzcGF0Y2hT b3VyY2UsIG1fZXZlbnRDb250ZXh0KTsKKyAgICBnX3NvdXJjZV9hdHRhY2goZGlzcGF0Y2hTb3Vy Y2UuZ2V0KCksIG1fZXZlbnRDb250ZXh0KTsKIH0KIAogdm9pZCBXb3JrUXVldWU6OnVucmVnaXN0 ZXJFdmVudFNvdXJjZUhhbmRsZXIoaW50IGZpbGVEZXNjcmlwdG9yKQpAQCAtMTkyLDEzICsxODUs MTEgQEAgdm9pZCBXb3JrUXVldWU6OnVucmVnaXN0ZXJFdmVudFNvdXJjZUhhbmRsZXIoaW50IGZp bGVEZXNjcmlwdG9yKQogICAgIH0KIH0KIAotdm9pZCBXb3JrUXVldWU6OnNjaGVkdWxlV29ya09u U291cmNlKEdTb3VyY2UqIGRpc3BhdGNoU291cmNlLCBQYXNzT3duUHRyPFdvcmtJdGVtPiBpdGVt KQordm9pZCBXb3JrUXVldWU6OnNjaGVkdWxlV29ya09uU291cmNlKEdTb3VyY2UqIGRpc3BhdGNo U291cmNlLCBQYXNzT3duUHRyPFdvcmtJdGVtPiBpdGVtLCBHU291cmNlRnVuYyBzb3VyY2VDYWxs YmFjaykKIHsKLSAgICBFdmVudFNvdXJjZSogZXZlbnRTb3VyY2UgPSBuZXcgRXZlbnRTb3VyY2Uo ZGlzcGF0Y2hTb3VyY2UsIGl0ZW0sIHRoaXMsIDApOworICAgIEV2ZW50U291cmNlKiBldmVudFNv dXJjZSA9IG5ldyBFdmVudFNvdXJjZShpdGVtLCB0aGlzLCAwKTsKIAotICAgIGdfc291cmNlX3Nl dF9jYWxsYmFjayhkaXNwYXRjaFNvdXJjZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgcmVp bnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4oJldvcmtRdWV1ZTo6RXZlbnRTb3VyY2U6OnBlcmZv cm1Xb3JrT25jZSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50U291cmNlLAorICAg IGdfc291cmNlX3NldF9jYWxsYmFjayhkaXNwYXRjaFNvdXJjZSwgc291cmNlQ2FsbGJhY2ssIGV2 ZW50U291cmNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PEdE ZXN0cm95Tm90aWZ5PigmV29ya1F1ZXVlOjpFdmVudFNvdXJjZTo6ZGVsZXRlRXZlbnRTb3VyY2Up KTsKIAogICAgIGdfc291cmNlX2F0dGFjaChkaXNwYXRjaFNvdXJjZSwgbV9ldmVudENvbnRleHQp OwpAQCAtMjEwLDcgKzIwMSw3IEBAIHZvaWQgV29ya1F1ZXVlOjpzY2hlZHVsZVdvcmsoUGFzc093 blB0cjxXb3JrSXRlbT4gaXRlbSkKICAgICBBU1NFUlQoZGlzcGF0Y2hTb3VyY2UpOwogICAgIGdf c291cmNlX3NldF9wcmlvcml0eShkaXNwYXRjaFNvdXJjZS5nZXQoKSwgR19QUklPUklUWV9ERUZB VUxUKTsKIAotICAgIHNjaGVkdWxlV29ya09uU291cmNlKGRpc3BhdGNoU291cmNlLmdldCgpLCBp dGVtKTsKKyAgICBzY2hlZHVsZVdvcmtPblNvdXJjZShkaXNwYXRjaFNvdXJjZS5nZXQoKSwgaXRl bSwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4oJldvcmtRdWV1ZTo6RXZlbnRTb3VyY2U6 OnBlcmZvcm1Xb3JrT25jZSkpOwogfQogCiB2b2lkIFdvcmtRdWV1ZTo6c2NoZWR1bGVXb3JrQWZ0 ZXJEZWxheShQYXNzT3duUHRyPFdvcmtJdGVtPiBpdGVtLCBkb3VibGUgZGVsYXkpCkBAIC0yMTgs NyArMjA5LDcgQEAgdm9pZCBXb3JrUXVldWU6OnNjaGVkdWxlV29ya0FmdGVyRGVsYXkoUGFzc093 blB0cjxXb3JrSXRlbT4gaXRlbSwgZG91YmxlIGRlbGF5KQogICAgIEdSZWZQdHI8R1NvdXJjZT4g ZGlzcGF0Y2hTb3VyY2UgPSBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9uZXdfc2Vjb25kcyhk ZWxheSkpOwogICAgIEFTU0VSVChkaXNwYXRjaFNvdXJjZSk7CiAKLSAgICBzY2hlZHVsZVdvcmtP blNvdXJjZShkaXNwYXRjaFNvdXJjZS5nZXQoKSwgaXRlbSk7CisgICAgc2NoZWR1bGVXb3JrT25T b3VyY2UoZGlzcGF0Y2hTb3VyY2UuZ2V0KCksIGl0ZW0sIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJj ZUZ1bmM+KCZXb3JrUXVldWU6OkV2ZW50U291cmNlOjpwZXJmb3JtV29ya09uY2UpKTsKIH0KIAog dm9pZCBXb3JrUXVldWU6OnNjaGVkdWxlV29ya09uVGVybWluYXRpb24oV2ViS2l0OjpQbGF0Zm9y bVByb2Nlc3NJZGVudGlmaWVyIHByb2Nlc3MsIFBhc3NPd25QdHI8V29ya0l0ZW0+IGl0ZW0pCkBA IC0yMjYsMTIgKzIxNyw1IEBAIHZvaWQgV29ya1F1ZXVlOjpzY2hlZHVsZVdvcmtPblRlcm1pbmF0 aW9uKFdlYktpdDo6UGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmllciBwcm9jCiAgICAgR1JlZlB0cjxH U291cmNlPiBkaXNwYXRjaFNvdXJjZSA9IGFkb3B0R1JlZihnX2NoaWxkX3dhdGNoX3NvdXJjZV9u ZXcocHJvY2VzcykpOwogICAgIEFTU0VSVChkaXNwYXRjaFNvdXJjZSk7CiAKLSAgICBFdmVudFNv dXJjZSogZXZlbnRTb3VyY2UgPSBuZXcgRXZlbnRTb3VyY2UoZGlzcGF0Y2hTb3VyY2UuZ2V0KCks IGl0ZW0sIHRoaXMsIDApOwotCi0gICAgZ19zb3VyY2Vfc2V0X2NhbGxiYWNrKGRpc3BhdGNoU291 cmNlLmdldCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PEdT b3VyY2VGdW5jPigmV29ya1F1ZXVlOjpFdmVudFNvdXJjZTo6cGVyZm9ybVdvcmtPblRlcm1pbmF0 aW9uKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnRTb3VyY2UsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KCZXb3JrUXVl dWU6OkV2ZW50U291cmNlOjpkZWxldGVFdmVudFNvdXJjZSkpOwotCi0gICAgZ19zb3VyY2VfYXR0 YWNoKGRpc3BhdGNoU291cmNlLmdldCgpLCBtX2V2ZW50Q29udGV4dCk7CisgICAgc2NoZWR1bGVX b3JrT25Tb3VyY2UoZGlzcGF0Y2hTb3VyY2UuZ2V0KCksIGl0ZW0sIHJlaW50ZXJwcmV0X2Nhc3Q8 R1NvdXJjZUZ1bmM+KCZXb3JrUXVldWU6OkV2ZW50U291cmNlOjpwZXJmb3JtV29ya09uVGVybWlu YXRpb24pKTsKIH0K