134517 2014-07-01 15:29:01 -0700 Possible crash in IconDatabase in WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread 2014-07-03 09:19:46 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson bunhere cdumez commit-queue gyuyoung.kim japhet sergio oldest_to_newest 1019789 0 beidson 2014-07-01 15:29:01 -0700 Possible crash in IconDatabase in WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread The main thread callbacks from the background thread reference "this". But in WebKit2 land with WebContexts coming and going, there's no guarantee "this" will still be around. My proposed fix is for the WebCore::IconDatabase's owner (In this case WebIconDatabase) to detect the situation where the WebCore::IconDatabase is not yet finished and hang around until it is. <rdar://problem/17437687> 1019793 1 234207 beidson 2014-07-01 15:37:47 -0700 Created attachment 234207 Patch v1 1020262 2 234207 eric.carlson 2014-07-03 08:17:41 -0700 Comment on attachment 234207 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=234207&action=review > Source/WebCore/loader/icon/IconDatabase.cpp:2083 > + // If there's still callbacks in flight from the sync thread we cannot possibly be closed. Grammar nit: "If there are still callbacks" > Source/WebCore/loader/icon/IconDatabase.cpp:2087 > + // Even if there's no more pending callbacks the database might otherwise still be open. Ditto. 1020268 3 beidson 2014-07-03 09:19:46 -0700 http://trac.webkit.org/changeset/170754 234207 2014-07-01 15:37:47 -0700 2014-07-03 09:09:30 -0700 Patch v1 patch text/plain 11888 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTBjYTZjLi44NzNiYWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzgg QEAKKzIwMTQtMDctMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFBvc3NpYmxlIGNyYXNoIGluIEljb25EYXRhYmFzZSBpbiBXZWJDb3JlOjpJY29uRGF0YWJh c2U6OmRpc3BhdGNoRGlkUmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJlYWQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE3NDM3Njg3PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzNDUxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNpbmNlIFdlYkNvcmU6Okljb25EYXRhYmFzZSBpcyBub3QgUmVmQ291bnRlZCB0aGVy ZeKAmXMgbm8gb2J2aW91cyB3YXkgdG8ga2VlcCBpdCBhbGl2ZSB1bnRpbCBpdCBpcworICAgICAg ICB0cnVseSBubyBsb25nZXIgbmVlZGVkLgorCisgICAgICAgIFRoaXMgaXNu4oCZdCBnZW5lcmFs bHkgYSBwcm9ibGVtIGJlY2F1c2UgdGhleSBhcmUgdXN1YWxseSBhIHNpbmdsZXRvbiB0aGF0IGxh c3RzIHRoZSBsaWZldGltZSBvZiB0aGUgcHJvY2Vzcy4KKworICAgICAgICBJbiB0aGUgV2ViS2l0 MiBjYXNlLCBXZWJDb3JlOjpJY29uRGF0YWJhc2VzIGNhbiBjb21lIGFuZCBnbyBhcyB0aGVpciBv d25pbmcgV2ViSWNvbkRhdGFiYXNlcyBjb21lIGFuZCBnby4KKworICAgICAgICBTbyB3ZSBjYW4g cmVseSBvbiBXZWJJY29uRGF0YWJhc2UgdG8gaGFuZGxlIHRoZSBsaWZldGltZSBhcHByb3ByaWF0 ZWx5LiAKKworICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmNsb3NlKTogSWYgdGhlIGRhdGFiYXNlIGlzIGFjdHVh bGx5IGNsb3NlZCwgbm90aWZ5IHRoZSBjbGllbnQuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0 YWJhc2U6Okljb25EYXRhYmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6Omlz T3Blbik6IFRha2UgaW50byBhY2NvdW50IHdoZXRoZXIgdGhlcmXigJlzIGFueSBtYWluIHRocmVh ZCBjYWxsYmFja3MsIHBsdXMgd2hhdAorICAgICAgICAgIGlzIGNvdmVyZWQgYnkgaXNPcGVuQmVz aWRlc01haW5UaHJlYWRDYWxsYmFja3MuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6 OmlzT3BlbkJlc2lkZXNNYWluVGhyZWFkQ2FsbGJhY2tzKTogVGFrZSBpbnRvIGFjY291bnQgd2hl dGhlciB0aGUgc3luYyB0aHJlYWQKKyAgICAgICAgICBpcyBzdGlsbCBydW5uaW5nIGFuZCB3aGV0 aGVyIG9yIG5vdCB0aGUgZGF0YWJhc2UgZmlsZSBpcyBzdGlsbCBvcGVuLgorICAgICAgICAoV2Vi Q29yZTo6SWNvbkRhdGFiYXNlOjpjaGVja0Nsb3NlZEFmdGVyTWFpblRocmVhZENhbGxiYWNrKTog Q2hlY2tzIHRvIHNlZSBpZiB0aGUgZGF0YWJhc2UgaGFzIGp1c3QKKyAgICAgICAgICBiZWNvbWUg MTAwJSBjbG9zZWQgYW5kIC0gaWYgc28gLSBub3RpZnkgdGhlIGNsaWVudC4KKyAgICAgICAgKFdl YkNvcmU6Okljb25EYXRhYmFzZTo6ZGlzcGF0Y2hEaWRJbXBvcnRJY29uVVJMRm9yUGFnZVVSTE9u TWFpblRocmVhZCk6IFVwZGF0ZWQgdG8gaW5jcmVtZW50IHRoZSBtYWluIHRocmVhZAorICAgICAg ICAgIGNhbGxiYWNrIGNvdW50IGFuZCB0byBjYWxsIGNoZWNrQ2xvc2VkQWZ0ZXJNYWluVGhyZWFk Q2FsbGJhY2sgd2hlbiBkb25lLgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpkaXNw YXRjaERpZEltcG9ydEljb25EYXRhRm9yUGFnZVVSTE9uTWFpblRocmVhZCk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpkaXNwYXRjaERpZFJlbW92ZUFsbEljb25zT25N YWluVGhyZWFkKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRpc3Bh dGNoRGlkRmluaXNoVVJMSW1wb3J0T25NYWluVGhyZWFkKTogRGl0dG8uCisgICAgICAgICogbG9h ZGVyL2ljb24vSWNvbkRhdGFiYXNlLmg6CisKKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0 YWJhc2VDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZUNsaWVudDo6ZGlk Q2xvc2UpOiBBZGRlZC4gRm9yIHRoZSBJY29uRGF0YWJhc2UgdG8gdGVsbCBpdHMgY2xpZW50IGl0 IGlzIDEwMCUgY2xvc2VkLgorCiAyMDE0LTA3LTAxICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2VsZWN0ZWQgRE9NIGVsZW1l bnQgaGlnaGxpZ2h0cyBpbnZpc2libGUgbmVhciBib3R0b20gb2YgdGhlIHZpZXdwb3J0ICh0b3BD b250ZW50SW5zZXQ/KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNv bkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5j cHAKaW5kZXggOWEyYjYyZi4uZTc2ODQ2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNv bi9JY29uRGF0YWJhc2UuY3BwCkBAIC0xNjgsNyArMTY4LDExIEBAIHZvaWQgSWNvbkRhdGFiYXNl OjpjbG9zZSgpCiAgICAgbV9yZW1vdmVJY29uc1JlcXVlc3RlZCA9IGZhbHNlOwogCiAgICAgbV9z eW5jREIuY2xvc2UoKTsKLSAgICBBU1NFUlQoIWlzT3BlbigpKTsKKworICAgIC8vIElmIHRoZXJl IGFyZSBzdGlsbCBtYWluIHRocmVhZCBjYWxsYmFja3MgaW4gZmxpZ2h0IHRoZW4gdGhlIGRhdGFi YXNlIG1pZ2h0IG5vdCBhY3R1YWxseSBiZSBjbG9zZWQgeWV0LgorICAgIC8vIEJ1dCBpZiBpdCBp cyBjbG9zZWQsIG5vdGlmeSB0aGUgY2xpZW50IG5vdy4KKyAgICBpZiAoIWlzT3BlbigpICYmIG1f Y2xpZW50KQorICAgICAgICBtX2NsaWVudC0+ZGlkQ2xvc2UoKTsKIH0KIAogdm9pZCBJY29uRGF0 YWJhc2U6OnJlbW92ZUFsbEljb25zKCkKQEAgLTc5Myw2ICs3OTcsNyBAQCBJY29uRGF0YWJhc2U6 Okljb25EYXRhYmFzZSgpCiAgICAgLCBtX3N5bmNUaHJlYWRIYXNXb3JrVG9EbyhmYWxzZSkKICAg ICAsIG1fcmV0YWluT3JSZWxlYXNlSWNvblJlcXVlc3RlZChmYWxzZSkKICAgICAsIG1faW5pdGlh bFBydW5pbmdDb21wbGV0ZShmYWxzZSkKKyAgICAsIG1fbWFpblRocmVhZENhbGxiYWNrQ291bnQo MCkKICAgICAsIG1fY2xpZW50KGRlZmF1bHRDbGllbnQoKSkKIHsKICAgICBMT0coSWNvbkRhdGFi YXNlLCAiQ3JlYXRpbmcgSWNvbkRhdGFiYXNlICVwIiwgdGhpcyk7CkBAIC04NjQsOCArODY5LDEz IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzeW5jVGltZXJGaXJlZChUaW1lcjxJY29uRGF0YWJhc2U+ JikKIAogYm9vbCBJY29uRGF0YWJhc2U6OmlzT3BlbigpIGNvbnN0CiB7CisgICAgcmV0dXJuIGlz T3BlbkJlc2lkZXNNYWluVGhyZWFkQ2FsbGJhY2tzKCkgfHwgbV9tYWluVGhyZWFkQ2FsbGJhY2tD b3VudDsKK30KKworYm9vbCBJY29uRGF0YWJhc2U6OmlzT3BlbkJlc2lkZXNNYWluVGhyZWFkQ2Fs bGJhY2tzKCkgY29uc3QKK3sKICAgICBNdXRleExvY2tlciBsb2NrZXIobV9zeW5jTG9jayk7Ci0g ICAgcmV0dXJuIG1fc3luY0RCLmlzT3BlbigpOworICAgIHJldHVybiBtX3N5bmNUaHJlYWRSdW5u aW5nIHx8IG1fc3luY0RCLmlzT3BlbigpOwogfQogCiBTdHJpbmcgSWNvbkRhdGFiYXNlOjpkYXRh YmFzZVBhdGgoKSBjb25zdApAQCAtMjA2Niw0MSArMjA3Niw3MCBAQCB2b2lkIEljb25EYXRhYmFz ZTo6c2V0V2FzRXhjbHVkZWRGcm9tQmFja3VwKCkKICAgICBTUUxpdGVTdGF0ZW1lbnQobV9zeW5j REIsICJJTlNFUlQgSU5UTyBJY29uRGF0YWJhc2VJbmZvIChrZXksIHZhbHVlKSBWQUxVRVMgKCdF eGNsdWRlZEZyb21CYWNrdXAnLCAxKSIpLmV4ZWN1dGVDb21tYW5kKCk7CiB9CiAKK3ZvaWQgSWNv bkRhdGFiYXNlOjpjaGVja0Nsb3NlZEFmdGVyTWFpblRocmVhZENhbGxiYWNrKCkKK3sKKyAgICBB U1NFUlRfTk9UX1NZTkNfVEhSRUFEKCk7CisKKyAgICAvLyBJZiB0aGVyZSdzIHN0aWxsIGNhbGxi YWNrcyBpbiBmbGlnaHQgZnJvbSB0aGUgc3luYyB0aHJlYWQgd2UgY2Fubm90IHBvc3NpYmx5IGJl IGNsb3NlZC4KKyAgICBpZiAoLS1tX21haW5UaHJlYWRDYWxsYmFja0NvdW50KQorICAgICAgICBy ZXR1cm47CisKKyAgICAvLyBFdmVuIGlmIHRoZXJlJ3Mgbm8gbW9yZSBwZW5kaW5nIGNhbGxiYWNr cyB0aGUgZGF0YWJhc2UgbWlnaHQgb3RoZXJ3aXNlIHN0aWxsIGJlIG9wZW4uCisgICAgaWYgKGlz T3BlbkJlc2lkZXNNYWluVGhyZWFkQ2FsbGJhY2tzKCkpCisgICAgICAgIHJldHVybjsKKworICAg IC8vIFRoaXMgZGF0YWJhc2UgaXMgbm93IGFjdHVhbGx5IGNsb3NlZCEgQnV0IGZpcnN0IG5vdGlm eSB0aGUgY2xpZW50LgorICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAgbV9jbGllbnQtPmRpZENs b3NlKCk7Cit9CisKIHZvaWQgSWNvbkRhdGFiYXNlOjpkaXNwYXRjaERpZEltcG9ydEljb25VUkxG b3JQYWdlVVJMT25NYWluVGhyZWFkKGNvbnN0IFN0cmluZyYgcGFnZVVSTCkKIHsKICAgICBBU1NF UlRfSUNPTl9TWU5DX1RIUkVBRCgpOworICAgICsrbV9tYWluVGhyZWFkQ2FsbGJhY2tDb3VudDsK IAogICAgIFN0cmluZyBwYWdlVVJMQ29weSA9IHBhZ2VVUkwuaXNvbGF0ZWRDb3B5KCk7CiAgICAg Y2FsbE9uTWFpblRocmVhZChbdGhpcywgcGFnZVVSTENvcHldIHsKLSAgICAgICAgbV9jbGllbnQt PmRpZEltcG9ydEljb25VUkxGb3JQYWdlVVJMKHBhZ2VVUkxDb3B5KTsKKyAgICAgICAgaWYgKG1f Y2xpZW50KQorICAgICAgICAgICAgbV9jbGllbnQtPmRpZEltcG9ydEljb25VUkxGb3JQYWdlVVJM KHBhZ2VVUkxDb3B5KTsKKyAgICAgICAgY2hlY2tDbG9zZWRBZnRlck1haW5UaHJlYWRDYWxsYmFj aygpOwogICAgIH0pOwogfQogCiB2b2lkIEljb25EYXRhYmFzZTo6ZGlzcGF0Y2hEaWRJbXBvcnRJ Y29uRGF0YUZvclBhZ2VVUkxPbk1haW5UaHJlYWQoY29uc3QgU3RyaW5nJiBwYWdlVVJMKQogewog ICAgIEFTU0VSVF9JQ09OX1NZTkNfVEhSRUFEKCk7CisgICAgKyttX21haW5UaHJlYWRDYWxsYmFj a0NvdW50OwogCiAgICAgU3RyaW5nIHBhZ2VVUkxDb3B5ID0gcGFnZVVSTC5pc29sYXRlZENvcHko KTsKICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlzLCBwYWdlVVJMQ29weV0gewotICAgICAgICBt X2NsaWVudC0+ZGlkSW1wb3J0SWNvbkRhdGFGb3JQYWdlVVJMKHBhZ2VVUkxDb3B5KTsKKyAgICAg ICAgaWYgKG1fY2xpZW50KQorICAgICAgICAgICAgbV9jbGllbnQtPmRpZEltcG9ydEljb25EYXRh Rm9yUGFnZVVSTChwYWdlVVJMQ29weSk7CisgICAgICAgIGNoZWNrQ2xvc2VkQWZ0ZXJNYWluVGhy ZWFkQ2FsbGJhY2soKTsKICAgICB9KTsKIH0KIAogdm9pZCBJY29uRGF0YWJhc2U6OmRpc3BhdGNo RGlkUmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJlYWQoKQogewogICAgIEFTU0VSVF9JQ09OX1NZTkNf VEhSRUFEKCk7CisgICAgKyttX21haW5UaHJlYWRDYWxsYmFja0NvdW50OwogCiAgICAgY2FsbE9u TWFpblRocmVhZChbdGhpc10gewotICAgICAgICBtX2NsaWVudC0+ZGlkUmVtb3ZlQWxsSWNvbnMo KTsKKyAgICAgICAgaWYgKG1fY2xpZW50KQorICAgICAgICAgICAgbV9jbGllbnQtPmRpZFJlbW92 ZUFsbEljb25zKCk7CisgICAgICAgIGNoZWNrQ2xvc2VkQWZ0ZXJNYWluVGhyZWFkQ2FsbGJhY2so KTsKICAgICB9KTsKIH0KIAogdm9pZCBJY29uRGF0YWJhc2U6OmRpc3BhdGNoRGlkRmluaXNoVVJM SW1wb3J0T25NYWluVGhyZWFkKCkKIHsKICAgICBBU1NFUlRfSUNPTl9TWU5DX1RIUkVBRCgpOwor ICAgICsrbV9tYWluVGhyZWFkQ2FsbGJhY2tDb3VudDsKIAogICAgIGNhbGxPbk1haW5UaHJlYWQo W3RoaXNdIHsKLSAgICAgICAgbV9jbGllbnQtPmRpZEZpbmlzaFVSTEltcG9ydCgpOworICAgICAg ICBpZiAobV9jbGllbnQpCisgICAgICAgICAgICBtX2NsaWVudC0+ZGlkRmluaXNoVVJMSW1wb3J0 KCk7CisgICAgICAgIGNoZWNrQ2xvc2VkQWZ0ZXJNYWluVGhyZWFkQ2FsbGJhY2soKTsKICAgICB9 KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuaAppbmRleCBk MmQ4MTdjLi41NzEzNDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9J Y29uRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJh c2UuaApAQCAtMjAzLDYgKzIwMyw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCB3YXNFeGNsdWRlZEZy b21CYWNrdXAoKTsKICAgICB2b2lkIHNldFdhc0V4Y2x1ZGVkRnJvbUJhY2t1cCgpOwogCisgICAg Ym9vbCBpc09wZW5CZXNpZGVzTWFpblRocmVhZENhbGxiYWNrcygpIGNvbnN0OworICAgIHZvaWQg Y2hlY2tDbG9zZWRBZnRlck1haW5UaHJlYWRDYWxsYmFjaygpOworCiAgICAgYm9vbCBtX2luaXRp YWxQcnVuaW5nQ29tcGxldGU7CiAgICAgICAgIAogICAgIHZvaWQgc2V0SWNvblVSTEZvclBhZ2VV UkxJblNRTERhdGFiYXNlKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpOwpAQCAtMjIxLDYg KzIyNCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaERpZEltcG9ydEljb25EYXRhRm9y UGFnZVVSTE9uTWFpblRocmVhZChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGRpc3BhdGNoRGlk UmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJlYWQoKTsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmluaXNo VVJMSW1wb3J0T25NYWluVGhyZWFkKCk7CisgICAgc3RkOjphdG9taWM8dWludDMyX3Q+IG1fbWFp blRocmVhZENhbGxiYWNrQ291bnQ7CiAgICAgCiAgICAgLy8gVGhlIGNsaWVudCBpcyBzZXQgYnkg dGhlIG1haW4gdGhyZWFkIGJlZm9yZSB0aGUgdGhyZWFkIHN0YXJ0cywgYW5kIGZyb20gdGhlbiBv biBpcyBvbmx5IHVzZWQgYnkgdGhlIHN5bmMgdGhyZWFkCiAgICAgSWNvbkRhdGFiYXNlQ2xpZW50 KiBtX2NsaWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25E YXRhYmFzZUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNl Q2xpZW50LmgKaW5kZXggNWEwNjkxMC4uMjg3YjBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlQ2xpZW50LmgKQEAgLTQyLDYgKzQyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChjb25zdCBTdHJpbmcm KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlbW92ZUFsbEljb25zKCkgPSAwOwogICAgIHZp cnR1YWwgdm9pZCBkaWRGaW5pc2hVUkxJbXBvcnQoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRp ZENsb3NlKCkgeyB9CiB9OwogIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZSAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCAzODllOTBiLi41MjQxMDhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTQtMDct MDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIFBvc3NpYmxl IGNyYXNoIGluIEljb25EYXRhYmFzZSBpbiBXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRpc3BhdGNo RGlkUmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJlYWQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3 NDM3Njg3PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDUx NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0Ojp+V2Vi Q29udGV4dCk6IEluc3RlYWQgb2YgZGlyZWN0bHkgZGVyZWbigJlpbmcgdGhlIFdlYkljb25EYXRh YmFzZSwgYXNrIGl0IHRvCisgICAgICAgICAgZGVyZWYgaXRzZWxmIHdoZW4gYXBwcm9wcmlhdGUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViSWNvbkRhdGFiYXNlOjpXZWJJY29uRGF0YWJhc2UpOgorICAgICAgICAoV2ViS2l0 OjpXZWJJY29uRGF0YWJhc2U6OmRpZENsb3NlKTogSWYgdGhpcyBXZWJJY29uRGF0YWJhc2UgaXMg c3VwcG9zZWQgdG8gZGVyZWYgaXRzZWxmIHdoZW4KKyAgICAgICAgICBhcHByb3ByaWF0ZSwgZG8g c28gbm93LgorICAgICAgICAoV2ViS2l0OjpXZWJJY29uRGF0YWJhc2U6OmRlcmVmV2hlbkFwcHJv cHJpYXRlKTogSWYgdGhlIFdlYkNvcmU6Okljb25EYXRhYmFzZSBpcyBzdGlsbCBvcGVuIHRoZW4K KyAgICAgICAgICBkZWZlciB0aGlzIGRlcmVmLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJY29u RGF0YWJhc2UuaDoKKworMjAxNC0wNy0wMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CisKICAgICAgICAgRml4IFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIgdGVhcmRvd24KICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3NTIzOTk4PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNDUxMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5jcHAKaW5kZXggMDU4MzYxYy4uOWE3ZjJiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJDb250ZXh0LmNwcApAQCAtMjU3LDcgKzI1Nyw5IEBAIFdlYkNvbnRleHQ6On5XZWJDb250 ZXh0KCkKIAogICAgIG1faWNvbkRhdGFiYXNlLT5pbnZhbGlkYXRlKCk7CiAgICAgbV9pY29uRGF0 YWJhc2UtPmNsZWFyQ29udGV4dCgpOwotICAgIAorICAgIFdlYkljb25EYXRhYmFzZSogcmF3SWNv bkRhdGFiYXNlID0gbV9pY29uRGF0YWJhc2UucmVsZWFzZSgpLmxlYWtSZWYoKTsKKyAgICByYXdJ Y29uRGF0YWJhc2UtPmRlcmVmV2hlbkFwcHJvcHJpYXRlKCk7CisKICNpZiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKICAgICBtX3BsdWdpblNpdGVEYXRhTWFuYWdlci0+aW52YWxpZGF0ZSgp OwogICAgIG1fcGx1Z2luU2l0ZURhdGFNYW5hZ2VyLT5jbGVhckNvbnRleHQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAKaW5kZXggNGQ0MDYwZi4uYjhk MWM0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAK QEAgLTUyLDYgKzUyLDcgQEAgV2ViSWNvbkRhdGFiYXNlOjpXZWJJY29uRGF0YWJhc2UoV2ViQ29u dGV4dCYgY29udGV4dCkKICAgICA6IG1fd2ViQ29udGV4dCgmY29udGV4dCkKICAgICAsIG1fdXJs SW1wb3J0Q29tcGxldGVkKGZhbHNlKQogICAgICwgbV9kYXRhYmFzZUNsZWFudXBEaXNhYmxlZChm YWxzZSkKKyAgICAsIG1fc2hvdWxkRGVyZWZXaGVuQXBwcm9wcmlhdGUoZmFsc2UpCiB7CiAgICAg bV93ZWJDb250ZXh0LT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYkljb25EYXRhYmFz ZTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCAqdGhpcyk7CiB9CkBAIC0yODQsNiArMjg1LDI0IEBA IHZvaWQgV2ViSWNvbkRhdGFiYXNlOjpkaWRGaW5pc2hVUkxJbXBvcnQoKQogICAgIG1fdXJsSW1w b3J0Q29tcGxldGVkID0gdHJ1ZTsKIH0KIAordm9pZCBXZWJJY29uRGF0YWJhc2U6OmRpZENsb3Nl KCkKK3sKKyAgICBpZiAoIW1fc2hvdWxkRGVyZWZXaGVuQXBwcm9wcmlhdGUpCisgICAgICAgIHJl dHVybjsKKworICAgIGRlcmVmKCk7Cit9CisKK3ZvaWQgV2ViSWNvbkRhdGFiYXNlOjpkZXJlZldo ZW5BcHByb3ByaWF0ZSgpCit7CisgICAgaWYgKG1faWNvbkRhdGFiYXNlSW1wbCAmJiBtX2ljb25E YXRhYmFzZUltcGwtPmlzT3BlbigpKSB7CisgICAgICAgIG1fc2hvdWxkRGVyZWZXaGVuQXBwcm9w cmlhdGUgPSB0cnVlOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZGVyZWYoKTsKK30K Kwogdm9pZCBXZWJJY29uRGF0YWJhc2U6Om5vdGlmeUljb25EYXRhUmVhZHlGb3JQYWdlVVJMKGNv bnN0IFN0cmluZyYgcGFnZVVSTCkKIHsKICAgICBtX2ljb25EYXRhYmFzZUNsaWVudC5pY29uRGF0 YVJlYWR5Rm9yUGFnZVVSTCh0aGlzLCBBUEk6OlVSTDo6Y3JlYXRlKHBhZ2VVUkwpLmdldCgpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuaAppbmRleCBmMzI0NDVj Li43MjQ2MTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRh dGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5o CkBAIC04NCw2ICs4NCwxMSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFByaXZhdGVCcm93c2lu Z0VuYWJsZWQoYm9vbCk7CiAKKyAgICAvLyBDYWxsZWQgd2hlbiB0aGUgV2ViQ29udGV4dCBpcyB0 aHJvdWdoIHdpdGggdGhpcyBXZWJJY29uRGF0YWJhc2UgYnV0IHRoZQorICAgIC8vIFdlYkNvcmU6 Okljb25EYXRhYmFzZSBwb3NzaWJseSBpc24ndCBkb25lIHNodXR0aW5nIGRvd24uCisgICAgLy8g SW4gdGhhdCBjYXNlIHRoaXMgV2ViSWNvbkRhdGFiYXNlIHdpbGwgZGVyZWYoKSBpdHNlbGYgd2hl biB0aGUgdGltZSBpcyByaWdodC4KKyAgICB2b2lkIGRlcmVmV2hlbkFwcHJvcHJpYXRlKCk7CisK IHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2ViSWNvbkRhdGFiYXNlKFdlYkNvbnRleHQmKTsKIApA QCAtOTMsNiArOTgsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VJY29u Rm9yUGFnZVVSTChjb25zdCBTdHJpbmcmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlk UmVtb3ZlQWxsSWNvbnMoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoVVJM SW1wb3J0KCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZENsb3NlKCkgb3ZlcnJpZGU7 CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNl aXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgb3ZlcnJp ZGU7CkBAIC0xMDUsNiArMTExLDcgQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2Vi Q29yZTo6SWNvbkRhdGFiYXNlPiBtX2ljb25EYXRhYmFzZUltcGw7CiAgICAgYm9vbCBtX3VybElt cG9ydENvbXBsZXRlZDsKICAgICBib29sIG1fZGF0YWJhc2VDbGVhbnVwRGlzYWJsZWQ7CisgICAg Ym9vbCBtX3Nob3VsZERlcmVmV2hlbkFwcHJvcHJpYXRlOwogICAgIEhhc2hNYXA8dWludDY0X3Qs IFN0cmluZz4gbV9wZW5kaW5nTG9hZERlY2lzaW9uVVJMTWFwOwogCiAgICAgV2ViSWNvbkRhdGFi YXNlQ2xpZW50IG1faWNvbkRhdGFiYXNlQ2xpZW50Owo=