105115 2012-12-15 15:38:04 -0800 The network process should use the correct NSURLCache location and set its size correctly for the CacheModel 2012-12-15 16:23:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 792232 0 sam 2012-12-15 15:38:04 -0800 The network process should use the correct NSURLCache location and set its size correctly for the CacheModel 792239 1 179628 sam 2012-12-15 15:46:08 -0800 Created attachment 179628 Patch 792245 2 sam 2012-12-15 16:23:59 -0800 Landed in http://trac.webkit.org/changeset/137821. 179628 2012-12-15 15:46:08 -0800 2012-12-15 15:58:26 -0800 Patch bug-105115-20121215154329.patch text/plain 19971 sam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjUwY2JiYmExYzUwNTIy MWJiMDU0NjYxMzdlNzZmOTQxZjlhNmY5Zi4uMDA3MjUzZjE1OTg2YzQzMzQxMDU4YmFlZjRlNzll MzFjM2UzNTIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEyLTEyLTE1ICBTYW0g V2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVGhlIG5ldHdvcmsgcHJvY2VzcyBz aG91bGQgdXNlIHRoZSBjb3JyZWN0IE5TVVJMQ2FjaGUgbG9jYXRpb24gYW5kIHNldCBpdHMgc2l6 ZSBjb3JyZWN0bHkgZm9yIHRoZSBDYWNoZU1vZGVsCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x Mjg0ODUwNT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwNTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUHJvY2Vzczo6TmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UHJvY2Vzczo6aW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3M6OnNldENhY2hlTW9kZWwpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05l dHdvcmtQcm9jZXNzLmg6CisgICAgICAgIChOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplKToKKyAgICAgICAgKFdlYktpdDo6bWVt b3J5U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OnZvbHVtZUZyZWVTaXplKToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtU2V0Q2FjaGVNb2RlbCk6CisgICAgICAgIENv cHkgY29kZSBmcm9tIHRoZSBXZWJQcm9jZXNzIHRvIHNldCB1cCB0aGUgTlNVUkxDYWNoZSBjb3Jy ZWN0bHkgKGxvY2F0aW9uIGFuZCBzaXplKS4KKyAgICAgICAgV2Ugc2hvdWxkIGV2ZW50dWFsbHkg bW92ZSB0aGUgY2FsY3VsYXRpb24gb2YgdGhpcyB0byB0aGUgV2ViQ29udGV4dCBzbyBpdCBjYW4g YmUgZG9uZQorICAgICAgICBvbmNlLgorCisgICAgICAgICogU2hhcmVkL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVk L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKE5l dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgQWRkIHRoZSBuZWNlc3Nh cnkgY3JlYXRpb24gcGFyYW1ldGVycyB0byBzZXQgdXAgdGhlIGNhY2hlLgorCisgICAgICAgICog VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAgICAgICog VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOgorICAgICAgICAoTmV0d29y a1Byb2Nlc3NQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQ cm9jZXNzUHJveHlNYWMubW06CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjplbnN1cmVOZXR3b3JrUHJvY2Vzcyk6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnNldENhY2hlTW9kZWwpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJDb250ZXh0Lmg6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViQ29udGV4 dCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXpl TmV0d29ya1Byb2Nlc3MpOgorICAgICAgICBNb3ZlIGluaXRpYWxpemluZyB0aGUgTmV0d29ya1By b2Nlc3MgdG8ganVzdCBhZnRlciBjcmVhdGluZyAobWF0Y2hpbmcgdGhlIFdlYlByb2Nlc3MpLAor ICAgICAgICByYXRoZXIgdGhhbiB3YWl0aW5nIGZvciBpdCBmaW5pc2ggbG9hZGluZyBiZWZvcmUg c2VuZGluZyB0aGUgY3JlYXRpb24gcGFyYW1ldGVycy4KKyAgICAgICAgQWRkaXRpb25hbGx5LCB0 aGlzIG1vdmVzIHRoZSBzZXR0aW5nIHVwIG9mIHRoZSBjcmVhdGlvbiBwYXJhbWV0ZXJzIHRvIHRo ZSBXZWJDb250ZXh0LAorICAgICAgICBhcyB0aGF0IGlzIHdoZXJlIGFsbCB0aGUgaW50ZXJlc3Rp bmcgc3RhdGUgcmVzaWRlcyAoYW5kIGFsc28gbWF0Y2hlcyB0aGUgV2ViUHJvY2VzcykuCisKIDIw MTItMTItMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgdGhlIHVubmVlZGVkIE5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCBtZXNzYWdlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXgg ODUxOGMyMGFiZjg0YTczNDkwODc0NzYxYTBmMDk5ZDM1OTUxZjZkZC4uOTA1NGI1MWQ1MGE5OWM4 NDZjMzk1Nzc0MzY0YWY0MDdlMzMxNzY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtNTEsNiArNTEsOCBAQCBOZXR3b3JrUHJv Y2VzcyYgTmV0d29ya1Byb2Nlc3M6OnNoYXJlZCgpCiB9CiAKIE5ldHdvcmtQcm9jZXNzOjpOZXR3 b3JrUHJvY2VzcygpCisgICAgOiBtX2hhc1NldENhY2hlTW9kZWwoZmFsc2UpCisgICAgLCBtX2Nh Y2hlTW9kZWwoQ2FjaGVNb2RlbERvY3VtZW50Vmlld2VyKQogewogfQogCkBAIC05OCwxMyArMTAw LDE1IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZShDb3Jl SVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6U3RyCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6Omlu aXRpYWxpemVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBwbGF0Zm9ybUluaXRpYWxpemUocGFyYW1ldGVycyk7 Ci0KICNpZiAhTE9HX0RJU0FCTEVECiAgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZUxvZ2dpbmdDaGFu bmVsc0lmTmVjZXNzYXJ5KCk7CiAgICAgV2ViS2l0Ojppbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5l Y2Vzc2FyeSgpOwogI2VuZGlmIC8vICFMT0dfRElTQUJMRUQKIAorICAgIHBsYXRmb3JtSW5pdGlh bGl6ZShwYXJhbWV0ZXJzKTsKKworICAgIHNldENhY2hlTW9kZWwoc3RhdGljX2Nhc3Q8dWludDMy X3Q+KHBhcmFtZXRlcnMuY2FjaGVNb2RlbCkpOworCiAjaWYgUExBVEZPUk0oTUFDKSB8fCBVU0Uo Q0ZORVRXT1JLKQogICAgIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjpzZXRQcml2YXRlQnJvd3Np bmdTdG9yYWdlU2Vzc2lvbklkZW50aWZpZXJCYXNlKHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxl SWRlbnRpZmllcik7CiAjZW5kaWYKQEAgLTE0MSw2ICsxNDUsMTcgQEAgdm9pZCBOZXR3b3JrUHJv Y2Vzczo6ZGVzdHJveVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKQogICAgIFJlbW90ZU5ldHdvcmtp bmdDb250ZXh0OjpkZXN0cm95UHJpdmF0ZUJyb3dzaW5nU2Vzc2lvbigpOwogfQogCit2b2lkIE5l dHdvcmtQcm9jZXNzOjpzZXRDYWNoZU1vZGVsKHVpbnQzMl90IGNtKQoreworICAgIENhY2hlTW9k ZWwgY2FjaGVNb2RlbCA9IHN0YXRpY19jYXN0PENhY2hlTW9kZWw+KGNtKTsKKworICAgIGlmICgh bV9oYXNTZXRDYWNoZU1vZGVsIHx8IGNhY2hlTW9kZWwgIT0gbV9jYWNoZU1vZGVsKSB7CisgICAg ICAgIG1faGFzU2V0Q2FjaGVNb2RlbCA9IHRydWU7CisgICAgICAgIG1fY2FjaGVNb2RlbCA9IGNh Y2hlTW9kZWw7CisgICAgICAgIHBsYXRmb3JtU2V0Q2FjaGVNb2RlbChjYWNoZU1vZGVsKTsKKyAg ICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdP UktfUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv Y2Vzcy5oCmluZGV4IDhkY2YxMDY1OWVlNTY0ZGNlMWMxZjkxN2NjMTNmNGYzNDQ5ZjJlOGIuLjBj ODBlMzZkMWNkYjlkZGJhYTRjMjM0YWQ2NWI2YzE2MTE0ZThkOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKKysrIGIvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaApAQCAtMjgsNiArMjgsNyBAQAog CiAjaWYgRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKIAorI2luY2x1ZGUgIkNhY2hlTW9kZWwuaCIK ICNpbmNsdWRlICJDaGlsZFByb2Nlc3MuaCIKICNpbmNsdWRlICJOZXR3b3JrUmVzb3VyY2VMb2Fk U2NoZWR1bGVyLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTcyLDYgKzczLDEwIEBA IHByaXZhdGU6CiAgICAgdm9pZCBjcmVhdGVOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcygp OwogICAgIHZvaWQgZW5zdXJlUHJpdmF0ZUJyb3dzaW5nU2Vzc2lvbigpOwogICAgIHZvaWQgZGVz dHJveVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKKyAgICB2b2lkIHNldENhY2hlTW9kZWwodWlu dDMyX3QpOworICAgIAorICAgIC8vIFBsYXRmb3JtIEhlbHBlcnMKKyAgICB2b2lkIHBsYXRmb3Jt U2V0Q2FjaGVNb2RlbChDYWNoZU1vZGVsKTsKIAogICAgIC8vIFRoZSBjb25uZWN0aW9uIHRvIHRo ZSBVSSBwcm9jZXNzLgogICAgIFJlZlB0cjxDb3JlSVBDOjpDb25uZWN0aW9uPiBtX3VpQ29ubmVj dGlvbjsKQEAgLTgwLDYgKzg1LDEwIEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFJlZlB0cjxOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gPiBtX3dlYlByb2Nlc3NDb25uZWN0aW9uczsKIAog ICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIgbV9uZXR3b3JrUmVzb3VyY2VMb2FkU2No ZWR1bGVyOworCisgICAgU3RyaW5nIG1fZGlza0NhY2hlRGlyZWN0b3J5OworICAgIGJvb2wgbV9o YXNTZXRDYWNoZU1vZGVsOworICAgIENhY2hlTW9kZWwgbV9jYWNoZU1vZGVsOwogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KaW5kZXggZTYzNWFjYjE5OGUxNTc5MGY5NDQ0 ZjhkYjJmZWFhMzA0ZjY1NTc4MS4uMTNlZDNlMTk4ZGExNjNhOTIxN2JmMGJjZjlmN2ZmYzE5OGNk MjNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdv cmtQcm9jZXNzTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9O ZXR3b3JrUHJvY2Vzc01hYy5tbQpAQCAtMjksOCArMjksMTIgQEAKICNpZiBFTkFCTEUoTkVUV09S S19QUk9DRVNTKQogCiAjaW1wb3J0ICJOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5o IgorI2ltcG9ydCAiU2FuZGJveEV4dGVuc2lvbi5oIgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6 ZWRTdHJpbmdzLmg+CiAjaW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KKyNpbXBvcnQg PG1hY2gvaG9zdF9pbmZvLmg+CisjaW1wb3J0IDxtYWNoL21hY2guaD4KKyNpbXBvcnQgPG1hY2gv bWFjaF9lcnJvci5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwpAQCAtMzksMTIgKzQzLDc0IEBAIG5hbWVzcGFjZSBXZWJLaXQgewog CiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemUoY29uc3QgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CisgICAgbV9kaXNrQ2FjaGVE aXJlY3RvcnkgPSBwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeTsKKworICAgIGlmICghbV9k aXNrQ2FjaGVEaXJlY3RvcnkuaXNOdWxsKCkpIHsKKyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6 Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlKTsKKyAgICAgICAgTlNVSW50ZWdlciBjYWNoZU1lbW9yeUNhcGFjaXR5ID0gcGFyYW1l dGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHk7CisgICAgICAgIE5TVUludGVnZXIgY2FjaGVE aXNrQ2FwYWNpdHkgPSBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHk7CisKKyAgICAg ICAgUmV0YWluUHRyPE5TVVJMQ2FjaGU+IHBhcmVudFByb2Nlc3NVUkxDYWNoZShBZG9wdE5TLCBb W05TVVJMQ2FjaGUgYWxsb2NdIGluaXRXaXRoTWVtb3J5Q2FwYWNpdHk6Y2FjaGVNZW1vcnlDYXBh Y2l0eSBkaXNrQ2FwYWNpdHk6Y2FjaGVEaXNrQ2FwYWNpdHkgZGlza1BhdGg6cGFyYW1ldGVycy5k aXNrQ2FjaGVEaXJlY3RvcnldKTsKKyAgICAgICAgW05TVVJMQ2FjaGUgc2V0U2hhcmVkVVJMQ2Fj aGU6cGFyZW50UHJvY2Vzc1VSTENhY2hlLmdldCgpXTsKKyAgICB9CisKKyAgICAvLyBGSVhNRTog VGhpcyBzaG91bGQgYmUgbW92ZWQgdG8gZWFybGllciBpbiB0aGUgc2V0dXAgcHJvY2VzcywgYXMg dGhpcyB3b24ndCB3b3JrIG9uY2Ugc2FuZGJveGluZyBpcyBlbmFibGUuCiAgICAgTlNTdHJpbmcg KmFwcGxpY2F0aW9uTmFtZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9TVFJJ TkcoIiVAIE5ldHdvcmtpbmciLCAidmlzaWJsZSBuYW1lIG9mIHRoZSBuZXR3b3JrIHByb2Nlc3Mu IFRoZSBhcmd1bWVudCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZS4iKSwKICAgICAgICAgKE5TU3Ry aW5nICopcGFyYW1ldGVycy5wYXJlbnRQcm9jZXNzTmFtZV07CiAgICAgCiAgICAgV0tTZXRWaXNp YmxlQXBwbGljYXRpb25OYW1lKChDRlN0cmluZ1JlZilhcHBsaWNhdGlvbk5hbWUpOwogfQogCitz dGF0aWMgdWludDY0X3QgbWVtb3J5U2l6ZSgpCit7CisgICAgc3RhdGljIGhvc3RfYmFzaWNfaW5m b19kYXRhX3QgaG9zdEluZm87CisKKyAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2U7Cisg ICAgZGlzcGF0Y2hfb25jZSgmb25jZSwgXigpIHsKKyAgICAgICAgbWFjaF9wb3J0X3QgaG9zdCA9 IG1hY2hfaG9zdF9zZWxmKCk7CisgICAgICAgIG1hY2hfbXNnX3R5cGVfbnVtYmVyX3QgY291bnQg PSBIT1NUX0JBU0lDX0lORk9fQ09VTlQ7CisgICAgICAgIGtlcm5fcmV0dXJuX3QgciA9IGhvc3Rf aW5mbyhob3N0LCBIT1NUX0JBU0lDX0lORk8sIChob3N0X2luZm9fdCkmaG9zdEluZm8sICZjb3Vu dCk7CisgICAgICAgIG1hY2hfcG9ydF9kZWFsbG9jYXRlKG1hY2hfdGFza19zZWxmKCksIGhvc3Qp OworCisgICAgICAgIGlmIChyICE9IEtFUk5fU1VDQ0VTUykKKyAgICAgICAgICAgIExPR19FUlJP UigiJXMgOiBob3N0X2luZm8oJWQpIDogJXMuXG4iLCBfX0ZVTkNUSU9OX18sIHIsIG1hY2hfZXJy b3Jfc3RyaW5nKHIpKTsKKyAgICB9KTsKKworICAgIHJldHVybiBob3N0SW5mby5tYXhfbWVtOwor fQorCitzdGF0aWMgdWludDY0X3Qgdm9sdW1lRnJlZVNpemUoY29uc3QgU3RyaW5nJiBwYXRoKQor eworICAgIE5TRGljdGlvbmFyeSAqZmlsZVN5c3RlbUF0dHJpYnV0ZXNEaWN0aW9uYXJ5ID0gW1tO U0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBhdHRyaWJ1dGVzT2ZGaWxlU3lzdGVtRm9yUGF0 aDooTlNTdHJpbmcgKilwYXRoIGVycm9yOk5VTExdOworICAgIHJldHVybiBbW2ZpbGVTeXN0ZW1B dHRyaWJ1dGVzRGljdGlvbmFyeSBvYmplY3RGb3JLZXk6TlNGaWxlU3lzdGVtRnJlZVNpemVdIHVu c2lnbmVkTG9uZ0xvbmdWYWx1ZV07Cit9CisKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3Jt U2V0Q2FjaGVNb2RlbChDYWNoZU1vZGVsIGNhY2hlTW9kZWwpCit7CisKKyAgICAvLyBBcyBhIGZ1 ZGdlIGZhY3RvciwgdXNlIDEwMDAgaW5zdGVhZCBvZiAxMDI0LCBpbiBjYXNlIHRoZSByZXBvcnRl ZCBieXRlIAorICAgIC8vIGNvdW50IGRvZXNuJ3QgYWxpZ24gZXhhY3RseSB0byBhIG1lZ2FieXRl IGJvdW5kYXJ5LgorICAgIHVpbnQ2NF90IG1lbVNpemUgPSBtZW1vcnlTaXplKCkgLyAxMDI0IC8g MTAwMDsKKyAgICB1aW50NjRfdCBkaXNrRnJlZVNpemUgPSB2b2x1bWVGcmVlU2l6ZShtX2Rpc2tD YWNoZURpcmVjdG9yeSkgLyAxMDI0IC8gMTAwMDsKKworICAgIHVuc2lnbmVkIGNhY2hlVG90YWxD YXBhY2l0eSA9IDA7CisgICAgdW5zaWduZWQgY2FjaGVNaW5EZWFkQ2FwYWNpdHkgPSAwOworICAg IHVuc2lnbmVkIGNhY2hlTWF4RGVhZENhcGFjaXR5ID0gMDsKKyAgICBkb3VibGUgZGVhZERlY29k ZWREYXRhRGVsZXRpb25JbnRlcnZhbCA9IDA7CisgICAgdW5zaWduZWQgcGFnZUNhY2hlQ2FwYWNp dHkgPSAwOworICAgIHVuc2lnbmVkIGxvbmcgdXJsQ2FjaGVNZW1vcnlDYXBhY2l0eSA9IDA7Cisg ICAgdW5zaWduZWQgbG9uZyB1cmxDYWNoZURpc2tDYXBhY2l0eSA9IDA7CisKKyAgICBjYWxjdWxh dGVDYWNoZVNpemVzKGNhY2hlTW9kZWwsIG1lbVNpemUsIGRpc2tGcmVlU2l6ZSwKKyAgICAgICAg Y2FjaGVUb3RhbENhcGFjaXR5LCBjYWNoZU1pbkRlYWRDYXBhY2l0eSwgY2FjaGVNYXhEZWFkQ2Fw YWNpdHksIGRlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwsCisgICAgICAgIHBhZ2VDYWNo ZUNhcGFjaXR5LCB1cmxDYWNoZU1lbW9yeUNhcGFjaXR5LCB1cmxDYWNoZURpc2tDYXBhY2l0eSk7 CisKKworICAgIE5TVVJMQ2FjaGUgKm5zdXJsQ2FjaGUgPSBbTlNVUkxDYWNoZSBzaGFyZWRVUkxD YWNoZV07CisgICAgW25zdXJsQ2FjaGUgc2V0TWVtb3J5Q2FwYWNpdHk6dXJsQ2FjaGVNZW1vcnlD YXBhY2l0eV07CisgICAgW25zdXJsQ2FjaGUgc2V0RGlza0NhcGFjaXR5OnN0ZDo6bWF4PHVuc2ln bmVkIGxvbmc+KHVybENhY2hlRGlza0NhcGFjaXR5LCBbbnN1cmxDYWNoZSBkaXNrQ2FwYWNpdHld KV07IC8vIERvbid0IHNocmluayBhIGJpZyBkaXNrIGNhY2hlLCBzaW5jZSB0aGF0IHdvdWxkIGNh dXNlIGNodXJuLgorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJM RShORVRXT1JLX1BST0NFU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0 d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5k ZXggNmM4MDBlOThjM2UzMzk2OTY2NmIwZGZiODc3YjMwNTQ1MjczOTRhMC4uMjNkYWFjZjg1MWY1 MDBjMjIyMzJkNmU1NTNiZGFhNTczZTMyZjA1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv U2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcApAQCAtMzgsMjMgKzM4LDQwIEBAIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzOjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycygpCiAKIHZvaWQgTmV0d29y a1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29k ZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAgZW5jb2RlciA8PCBkaXNrQ2FjaGVEaXJlY3Rvcnk7 CisgICAgZW5jb2RlciA8PCBkaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CisgICAg ZW5jb2RlciA8PCBwcml2YXRlQnJvd3NpbmdFbmFibGVkOworICAgIGVuY29kZXIuZW5jb2RlRW51 bShjYWNoZU1vZGVsKTsKKwogI2lmIFBMQVRGT1JNKE1BQykKICAgICBlbmNvZGVyIDw8IHBhcmVu dFByb2Nlc3NOYW1lOwogICAgIGVuY29kZXIgPDwgdWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcjsK KworICAgIGVuY29kZXIgPDwgbnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5OworICAgIGVuY29kZXIg PDwgbnNVUkxDYWNoZURpc2tDYXBhY2l0eTsKICNlbmRpZgotICAgIGVuY29kZXIgPDwgcHJpdmF0 ZUJyb3dzaW5nRW5hYmxlZDsKIH0KIAogYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHJlc3VsdCkKIHsKKyAgICBpZiAoIWRlY29kZXItPmRl Y29kZShyZXN1bHQuZGlza0NhY2hlRGlyZWN0b3J5KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHJlc3VsdC5kaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNp b25IYW5kbGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGUocmVzdWx0LnByaXZhdGVCcm93c2luZ0VuYWJsZWQpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGVFbnVtKHJlc3VsdC5jYWNoZU1vZGVsKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAoIWRlY29kZXItPmRl Y29kZShyZXN1bHQucGFyZW50UHJvY2Vzc05hbWUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LnVpUHJvY2Vzc0J1bmRsZUlkZW50aWZpZXIp KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLSAgICBpZiAoIWRlY29kZXItPmRlY29k ZShyZXN1bHQucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCkpCisgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGUocmVzdWx0Lm5zVVJMQ2FjaGVNZW1vcnlDYXBhY2l0eSkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShyZXN1bHQubnNVUkxDYWNoZURpc2tDYXBhY2l0 eSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogCiAgICAgcmV0dXJuIHRydWU7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0 d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCAyMGM2ZDFkNzc3Yjg2ZjY2MTMx NTZjMmQzZGM5N2RlMzkwM2VjNzIxLi42MzUwMzY4MmNmOTNmODlmNTdlMjkyYjJlYjkyYTRmOGU2 YmVhMGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3Jr UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9O ZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTI4LDYgKzI4LDgg QEAKIAogI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCiAKKyNpbmNsdWRlICJDYWNoZU1vZGVs LmgiCisjaW5jbHVkZSAiU2FuZGJveEV4dGVuc2lvbi5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgogCiBuYW1lc3BhY2UgQ29yZUlQQyB7CkBAIC00MywxMiArNDUsMTkgQEAgc3Ry dWN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICB2b2lkIGVuY29kZShD b3JlSVBDOjpBcmd1bWVudEVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUo Q29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiwgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMmKTsKIAorICAgIGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDsKKyAgICBDYWNoZU1vZGVs IGNhY2hlTW9kZWw7CisKKyAgICBTdHJpbmcgZGlza0NhY2hlRGlyZWN0b3J5OworICAgIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSBkaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CisK ICNpZiBQTEFURk9STShNQUMpCiAgICAgU3RyaW5nIHBhcmVudFByb2Nlc3NOYW1lOwogICAgIFN0 cmluZyB1aVByb2Nlc3NCdW5kbGVJZGVudGlmaWVyOwotI2VuZGlmCiAKLSAgICBib29sIHByaXZh dGVCcm93c2luZ0VuYWJsZWQ7CisgICAgdWludDY0X3QgbnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5 OworICAgIHVpbnQ2NF90IG5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHk7CisjZW5kaWYKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAppbmRleCAyYWUwNGZhMTIzNDBhNWVi ODRmNjE5YmJmOWVkZGExZDc3YTU1ZGVmLi5iY2YwYTllZmRjOGU0NWRmZGFhNzc1ZmRkMzFiMGI5 YThhZDEzNTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9O ZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0 d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTQ1LDEyICsxNDUsNiBAQCB2b2lkIE5l dHdvcmtQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxh dW5jaGVyLCBDb3JlSVBDOgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcGFyYW1ldGVyczsKLSAgICBwbGF0Zm9ybUluaXRpYWxp emVOZXR3b3JrUHJvY2VzcyhwYXJhbWV0ZXJzKTsKLQotICAgIC8vIEluaXRpYWxpemUgdGhlIG5l dHdvcmsgaG9zdCBwcm9jZXNzLgotICAgIGNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6TmV0 d29ya1Byb2Nlc3M6OkluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhwYXJhbWV0ZXJzKSwgMCk7Ci0K ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9udW1QZW5kaW5nQ29ubmVjdGlvblJlcXVl c3RzOyArK2kpCiAgICAgICAgIGNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1By b2Nlc3M6OkNyZWF0ZU5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKCksIDApOwogICAgIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oCmluZGV4IDBiOTFlMzQwYTkyMDAzYTA0MjNjYzA0YjJlOTEzZjVjZWUwMzdjNGUu LmMzNDAyZjlkYjBlOTZjOWYzOTQxNjMwMDc2MGFmOTRhODZiNzRiNjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgK QEAgLTU5LDcgKzU5LDYgQEAgcHJpdmF0ZToKICAgICBOZXR3b3JrUHJvY2Vzc1Byb3h5KFdlYkNv bnRleHQqKTsKIAogICAgIHZpcnR1YWwgdm9pZCBnZXRMYXVuY2hPcHRpb25zKFByb2Nlc3NMYXVu Y2hlcjo6TGF1bmNoT3B0aW9ucyYpIE9WRVJSSURFOwotICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFs aXplTmV0d29ya1Byb2Nlc3MoTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmKTsKIAog ICAgIHZvaWQgbmV0d29ya1Byb2Nlc3NDcmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9tYWMvTmV0d29ya1Byb2Nl c3NQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3 b3JrUHJvY2Vzc1Byb3h5TWFjLm1tCmluZGV4IDZiOWEzNTFmZTYwMGU3YjBmMDQzN2M5MTRjZmE2 Y2I3MjkyNTUzNmIuLjkwMWM3MDdmNGU2ZWQ4Mjg2NGRhYzUwMzM1YjQ0M2U0MzMwOWE0NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3b3JrUHJv Y2Vzc1Byb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL21h Yy9OZXR3b3JrUHJvY2Vzc1Byb3h5TWFjLm1tCkBAIC0yNiw3ICsyNiw2IEBACiAjaW1wb3J0ICJj b25maWcuaCIKICNpbXBvcnQgIk5ldHdvcmtQcm9jZXNzUHJveHkuaCIKIAotI2ltcG9ydCAiTmV0 d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbXBvcnQgIk5ldHdvcmtQcm9jZXNz TWVzc2FnZXMuaCIKIAogI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCkBAIC0zNSwxMiArMzQs NiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZv aWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3Mo TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCi17Ci0gICAgcGFy YW1ldGVycy5wYXJlbnRQcm9jZXNzTmFtZSA9IFtbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10g cHJvY2Vzc05hbWVdOwotICAgIHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllciA9 IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl07Ci19Ci0KIHZvaWQgTmV0 d29ya1Byb2Nlc3NQcm94eTo6c2V0QXBwbGljYXRpb25Jc09jY2x1ZGVkKGJvb2wgYXBwbGljYXRp b25Jc09jY2x1ZGVkKQogewogICAgIGlmICghaXNWYWxpZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IGE3ZjllYzlmZDY3M2I5ZjMzNzE0NTNhNDMwN2QxNGRj M2MyZjNhNDEuLmYyZGU3OTZhMjlmN2RlNDg0YmM5NWI5MmYxMDNhNDViNDk5MjhhYjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKQEAgLTcyLDYgKzcyLDcgQEAKICNl bmRpZgogCiAjaWYgRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKKyNpbmNsdWRlICJOZXR3b3JrUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzTWVzc2Fn ZXMuaCIKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzc1Byb3h5LmgiCiAjZW5kaWYKQEAgLTM2Myw2 ICszNjQsMjAgQEAgdm9pZCBXZWJDb250ZXh0OjplbnN1cmVOZXR3b3JrUHJvY2VzcygpCiAgICAg ICAgIHJldHVybjsKIAogICAgIG1fbmV0d29ya1Byb2Nlc3MgPSBOZXR3b3JrUHJvY2Vzc1Byb3h5 OjpjcmVhdGUodGhpcyk7CisKKyAgICBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyBw YXJhbWV0ZXJzOworCisgICAgcGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3RvcnkgPSBkaXNrQ2Fj aGVEaXJlY3RvcnkoKTsKKyAgICBpZiAoIXBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5Lmlz RW1wdHkoKSkKKyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdy aXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5LCBwYXJhbWV0ZXJzLmRp c2tDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisKKyAgICBwYXJhbWV0ZXJzLmNhY2hl TW9kZWwgPSBtX2NhY2hlTW9kZWw7CisKKyAgICAvLyBBZGQgYW55IHBsYXRmb3JtIHNwZWNpZmlj IHBhcmFtZXRlcnMKKyAgICBwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhwYXJhbWV0 ZXJzKTsKKworICAgIC8vIEluaXRpYWxpemUgdGhlIG5ldHdvcmsgcHJvY2Vzcy4KKyAgICBtX25l dHdvcmtQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6SW5pdGlhbGl6ZU5l dHdvcmtQcm9jZXNzKHBhcmFtZXRlcnMpLCAwKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0OjpyZW1v dmVOZXR3b3JrUHJvY2Vzc1Byb3h5KE5ldHdvcmtQcm9jZXNzUHJveHkqIG5ldHdvcmtQcm9jZXNz UHJveHkpCkBAIC04MTcsNiArODMyLDggQEAgdm9pZCBXZWJDb250ZXh0OjpzZXRDYWNoZU1vZGVs KENhY2hlTW9kZWwgY2FjaGVNb2RlbCkKIHsKICAgICBtX2NhY2hlTW9kZWwgPSBjYWNoZU1vZGVs OwogICAgIHNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0Q2FjaGVN b2RlbChzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9jYWNoZU1vZGVsKSkpOworCisgICAgLy8gRklY TUU6IEluZm9ybSB0aGUgTmV0d29yayBQcm9jZXNzIGlmIGluIHVzZS4KIH0KIAogdm9pZCBXZWJD b250ZXh0OjpzZXREZWZhdWx0UmVxdWVzdFRpbWVvdXRJbnRlcnZhbChkb3VibGUgdGltZW91dElu dGVydmFsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKaW5kZXggNzY5NjQ3NGYw M2Y2MjYzMGE0YmM3YmI3NGUwOWU5MjRjN2I2ODkxZS4uMTkxN2M1Yzg1YmQ2ZWIxMWQ0NWM1MjAz NTljN2M5NzdhZTI5MWZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCkBA IC01MSw2ICs1MSw3IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgRG93bmxvYWRQcm94 eTsKK2NsYXNzIE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBXZWJBcHBsaWNhdGlvbkNhY2hl TWFuYWdlclByb3h5OwogY2xhc3MgV2ViQ29va2llTWFuYWdlclByb3h5OwogY2xhc3MgV2ViRGF0 YWJhc2VNYW5hZ2VyUHJveHk7CkBAIC01OCw3ICs1OSw2IEBAIGNsYXNzIFdlYkdlb2xvY2F0aW9u TWFuYWdlclByb3h5OwogY2xhc3MgV2ViSWNvbkRhdGFiYXNlOwogY2xhc3MgV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlclByb3h5OwogY2xhc3MgV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTsKLWNs YXNzIE5ldHdvcmtQcm9jZXNzUHJveHk7CiBjbGFzcyBXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJv eHk7CiBjbGFzcyBXZWJQYWdlR3JvdXA7CiBjbGFzcyBXZWJQYWdlUHJveHk7CkBAIC03Nyw2ICs3 Nyw5IEBAIGNsYXNzIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5OwogI2lmIFVTRShTT1VQKQog Y2xhc3MgV2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHk7CiAjZW5kaWYKKyNpZiBFTkFCTEUoTkVU V09SS19QUk9DRVNTKQorc3RydWN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOwor I2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCiBleHRlcm4gTlNTdHJpbmcgKlNjaGVtZUZvckN1 c3RvbVByb3RvY29sUmVnaXN0ZXJlZE5vdGlmaWNhdGlvbk5hbWU7CkBAIC0yODIsNiArMjg1LDEw IEBAIHByaXZhdGU6CiAKICAgICBXZWJQcm9jZXNzUHJveHkqIGNyZWF0ZU5ld1dlYlByb2Nlc3Mo KTsKIAorI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCisgICAgdm9pZCBwbGF0Zm9ybUluaXRp YWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYpOwor I2VuZGlmCisKICNpZiBQTEFURk9STShNQUMpCiAgICAgdm9pZCBnZXRQYXN0ZWJvYXJkVHlwZXMo Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgVmVjdG9yPFN0cmluZz4mIHBhc3RlYm9hcmRU eXBlcyk7CiAgICAgdm9pZCBnZXRQYXN0ZWJvYXJkUGF0aG5hbWVzRm9yVHlwZShjb25zdCBTdHJp bmcmIHBhc3RlYm9hcmROYW1lLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRUeXBlLCBWZWN0b3I8 U3RyaW5nPiYgcGF0aG5hbWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV2ViQ29udGV4dE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi Q29udGV4dE1hYy5tbQppbmRleCAzMDRlZTEyYjk0MzNmNjIyM2RhMjMzZWU0M2U3Y2VmZWZiNzAx OGY2Li5mYzcxMmI0ZTI2Y2RlZDQ3OWNhNTNmNDJmMzc5MmVjNTA5YWZiYjZlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCkBAIC0yNiwyMCArMjYs MjMgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViQ29udGV4dC5oIgogCi0jaW1w b3J0ICJOZXR3b3JrUHJvY2Vzc1Byb3h5LmgiCiAjaW1wb3J0ICJQbHVnaW5Qcm9jZXNzTWFuYWdl ci5oIgogI2ltcG9ydCAiU2hhcmVkV29ya2VyUHJvY2Vzc01hbmFnZXIuaCIKICNpbXBvcnQgIldL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJLaXRTeXN0 ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgIldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIK ICNpbXBvcnQgIldlYlByb2Nlc3NNZXNzYWdlcy5oIgorI2ltcG9ydCA8UXVhcnR6Q29yZS9DQVJl bW90ZUxheWVyU2VydmVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NvbG9yLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbXBvcnQgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4K ICNpbXBvcnQgPFdlYkNvcmUvUGxhdGZvcm1QYXN0ZWJvYXJkLmg+CiAjaW1wb3J0IDxzeXMvcGFy YW0uaD4KIAotI2ltcG9ydCA8UXVhcnR6Q29yZS9DQVJlbW90ZUxheWVyU2VydmVyLmg+CisjaWYg RU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKKyNpbXBvcnQgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzLmgiCisjaW1wb3J0ICJOZXR3b3JrUHJvY2Vzc1Byb3h5LmgiCisjZW5kaWYKIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTEzNCw2ICsxMzcsMTggQEAgdm9pZCBXZWJD b250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMmIHBhcmEKICAgICAgICAgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZEZv ckN1c3RvbVByb3RvY29scy5hcHBlbmQoW3NjaGVtZXMgb2JqZWN0QXRJbmRleDppXSk7CiB9CiAK KyNpZiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQordm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUlu aXRpYWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKK3sKKyAgICBOU1VSTENhY2hlICp1cmxDYWNoZSA9IFtOU1VSTENhY2hlIHNo YXJlZFVSTENhY2hlXTsKKyAgICBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVNZW1vcnlDYXBhY2l0eSA9 IFt1cmxDYWNoZSBtZW1vcnlDYXBhY2l0eV07CisgICAgcGFyYW1ldGVycy5uc1VSTENhY2hlRGlz a0NhcGFjaXR5ID0gW3VybENhY2hlIGRpc2tDYXBhY2l0eV07CisKKyAgICBwYXJhbWV0ZXJzLnBh cmVudFByb2Nlc3NOYW1lID0gW1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNzTmFt ZV07CisgICAgcGFyYW1ldGVycy51aVByb2Nlc3NCdW5kbGVJZGVudGlmaWVyID0gW1tOU0J1bmRs ZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXTsKK30KKyNlbmRpZgorCiB2b2lkIFdlYkNv bnRleHQ6OnBsYXRmb3JtSW52YWxpZGF0ZUNvbnRleHQoKQogewogICAgIHVucmVnaXN0ZXJOb3Rp ZmljYXRpb25PYnNlcnZlcnMoKTsK