80814 2012-03-11 22:51:47 -0700 Web Inspector: WebKit2: update how the Web Inspector resources are loaded 2012-03-12 11:23:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy andersca bweinstein joepeck sam timothy webkit.review.bot oldest_to_newest 575947 0 timothy 2012-03-11 22:51:47 -0700 We need to update how WebKit2 loads the Web Inspector resources. <rdar://problem/10359959> 575954 1 131284 timothy 2012-03-11 22:57:28 -0700 Created attachment 131284 Proposed Change 576230 2 131284 webkit.review.bot 2012-03-12 10:14:34 -0700 Comment on attachment 131284 Proposed Change Rejecting attachment 131284 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Hunk #1 FAILED at 35. Hunk #2 FAILED at 83. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm.rej patching file Source/WebKit2/WebProcess/mac/WebProcessMac.mm Hunk #1 FAILED at 249. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit2/WebProcess/mac/WebProcessMac.mm.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'John Sulli..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/11938947 576308 3 timothy 2012-03-12 11:23:56 -0700 Landed manually as r110425. 131284 2012-03-11 22:57:28 -0700 2012-03-12 10:14:34 -0700 Proposed Change 0001-Update-how-the-Web-Inspector-resources-are-loaded.patch text/plain 22314 timothy RnJvbSAwMDdjYzQ1NDE1NWM0YzA4ZGM3NjkyYWQ5M2Y1ZWJmZDVhZDRlYjBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBTdW4sIDExIE1hciAyMDEyIDIyOjU2OjM3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gVXBk YXRlIGhvdyB0aGUgV2ViIEluc3BlY3RvciByZXNvdXJjZXMgYXJlIGxvYWRlZC4KCmh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDgxNApyZGFyOi8vcHJvYmxlbS8xMDM1 OTk1OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFNoYXJlZC9XZWJQcmVmZXJlbmNl c1N0b3JlLmg6CihXZWJLaXQpOiBBZGRlZCBJbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFj ZS4KKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CihXZWJLaXQ6Oldl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6IFJlbW92ZWQgd2ViSW5zcGVjdG9y TG9jYWxpemVkU3RyaW5nc1BhdGguCihXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnM6OmRlY29kZSk6IERpdHRvLgoqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz Lmg6IERpdHRvLgooV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyk6IERpdHRvLgoqIFVJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwOgoqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2 YXRlLmg6CiogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgooV0tQcmVmZXJlbmNl c1NldEluc3BlY3RvclVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKTogQWRkZWQuCihXS1ByZWZlcmVu Y2VzR2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UpOiBBZGRlZC4KKiBVSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5j cHA6CihXZWJLaXQ6OldlYkNvbnRleHQ6OmVuc3VyZVdlYlByb2Nlc3MpOiBSZW1vdmVkIHdlYklu c3BlY3RvckxvY2FsaXplZFN0cmluZ3NQYXRoLgoqIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmg6CihX ZWJDb250ZXh0KTogRGl0dG8uCiogVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5t bToKKFdlYktpdDo6aW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2UpOiBBZGRl ZC4KKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmNyZWF0ZUluc3BlY3RvcldpbmRvdyk6IFVz ZSBpbnNwZWN0b3JSZWFsbHlVc2VzV2ViS2l0VXNlckludGVyZmFjZQp0byBkZXRlcm1pbmUgaWYg dGV4dHVyZSBzaG91bGQgYmUgdXNlZC4KKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6Omluc3Bl Y3RvclBhZ2VVUkwpOiBDaG9vc2UgdGhlIHJpZ2h0IHBhdGguCihXZWJLaXQ6OldlYkluc3BlY3Rv clByb3h5OjppbnNwZWN0b3JCYXNlVVJMKTogRGl0dG8uCiogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl Ykluc3BlY3Rvci5oOgoqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViSW5zcGVjdG9yTWFjLm1t OgooV2ViS2l0OjppbnNwZWN0b3JSZWFsbHlVc2VzV2ViS2l0VXNlckludGVyZmFjZSk6CihXZWJL aXQ6OldlYkluc3BlY3Rvcjo6c2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UpOiBB ZGRlZC4KKFdlYktpdDo6V2ViSW5zcGVjdG9yOjpsb2NhbGl6ZWRTdHJpbmdzVVJMKToKKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CihXZWJLaXQ6OldlYlBhZ2U6OnBsYXRm b3JtUHJlZmVyZW5jZXNEaWRDaGFuZ2UpOiBDYWxsIFdlYkluc3BlY3Rvcjo6c2V0SW5zcGVjdG9y VXNlc1dlYktpdFVzZXJJbnRlcmZhY2UuCiogV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5t bToKKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IFJl bW92ZWQgY2FsbCB0byBXZWJJbnNwZWN0b3I6OnNldExvY2FsaXplZFN0cmluZ3NQYXRoLgotLS0K IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA0 MiArKysrKysrKysrKysrKysrKysrKwogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuaCAgICAgICAgfCAgICAxICsKIC4uLi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycy5jcHAgICAgICAgIHwgICAgMyAtCiAuLi4vV2ViS2l0Mi9TaGFyZWQvV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oICB8ICAgIDEgLQogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAgICAgICAgfCAgIDE1IC0tLS0tLS0KIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmggIHwgICAgMyAtCiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAgICB8ICAgMTAgKysrKysK IC4uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oIHwgICAg NCArKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwICAgICAgICAgICAg fCAgICAyIC0KIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmggICAgICAgICAg ICAgIHwgICAxMSAtLS0tLQogLi4uL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQ cm94eU1hYy5tbSAgfCAgIDMzICsrKysrKysrKysrKy0tLS0KIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3IuaCAgIHwgICAgNyArKy0KIC4uLi9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1hYy5tbSAgICAgIHwgICAyOSArKysrKysrKystLS0t CiAuLi4vV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0gICB8ICAg IDYgKystCiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tICAg ICB8ICAgIDQgKy0KIDE1IGZpbGVzIGNoYW5nZWQsIDExMyBpbnNlcnRpb25zKCspLCA1OCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmEwMjU5Zi4uYzNiZTBiZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDQ1IEBACisyMDEyLTAzLTExICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxl LmNvbT4KKworICAgICAgICBVcGRhdGUgaG93IHRoZSBXZWIgSW5zcGVjdG9yIHJlc291cmNlcyBh cmUgbG9hZGVkLgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgwODE0CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzEwMzU5OTU5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2Vi UHJlZmVyZW5jZXNTdG9yZS5oOgorICAgICAgICAoV2ViS2l0KTogQWRkZWQgSW5zcGVjdG9yVXNl c1dlYktpdFVzZXJJbnRlcmZhY2UuCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzOjplbmNvZGUpOiBSZW1vdmVkIHdlYkluc3BlY3RvckxvY2FsaXplZFN0cmluZ3NQYXRo LgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUp OiBEaXR0by4KKyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5o OiBEaXR0by4KKyAgICAgICAgKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMpOiBEaXR0by4K KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRJbnNwZWN0b3JV c2VzV2ViS2l0VXNlckludGVyZmFjZSk6IEFkZGVkLgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dEluc3BlY3RvclVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKTogQWRkZWQuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNz L1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjplbnN1cmVXZWJQ cm9jZXNzKTogUmVtb3ZlZCB3ZWJJbnNwZWN0b3JMb2NhbGl6ZWRTdHJpbmdzUGF0aC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAoV2ViQ29udGV4dCk6IERpdHRv LgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW06CisgICAg ICAgIChXZWJLaXQ6Omluc3BlY3RvclJlYWxseVVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKTogQWRk ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpjcmVhdGVJbnNwZWN0b3JX aW5kb3cpOiBVc2UgaW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2UKKyAgICAg ICAgdG8gZGV0ZXJtaW5lIGlmIHRleHR1cmUgc2hvdWxkIGJlIHVzZWQuCisgICAgICAgIChXZWJL aXQ6OldlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKTogQ2hvb3NlIHRoZSByaWdo dCBwYXRoLgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yQmFz ZVVSTCk6IERpdHRvLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3Iu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1hYy5tbToK KyAgICAgICAgKFdlYktpdDo6aW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2Up OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OnNldEluc3BlY3RvclVzZXNXZWJLaXRV c2VySW50ZXJmYWNlKTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6bG9j YWxpemVkU3RyaW5nc1VSTCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQ YWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybVByZWZlcmVuY2Vz RGlkQ2hhbmdlKTogQ2FsbCBXZWJJbnNwZWN0b3I6OnNldEluc3BlY3RvclVzZXNXZWJLaXRVc2Vy SW50ZXJmYWNlLgorICAgICAgICAqIFdlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3Mp OiBSZW1vdmVkIGNhbGwgdG8gV2ViSW5zcGVjdG9yOjpzZXRMb2NhbGl6ZWRTdHJpbmdzUGF0aC4K KwogMjAxMi0wMy0xMSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYktpdDIgbGFja3MgQVBJIGZvciBvYnRhaW5pbmcgYSByZXByZXNlbnRhdGlvbiBvZiB0aGUg UmVuZGVyTGF5ZXIgdHJlZSBvZiBhIHBhZ2UsIGxpa2UgV2ViUmVuZGVyTGF5ZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCmluZGV4IGNiNzAzMDkuLjBmZmNk MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3Jl LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaApAQCAt OTUsNiArOTUsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhNZWRpYVBsYXliYWNr UmVxdWlyZXNVc2VyR2VzdHVyZSwgbWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUsIEJv b2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oTWVkaWFQbGF5YmFja0FsbG93c0lubGluZSwg bWVkaWFQbGF5YmFja0FsbG93c0lubGluZSwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3Jv KEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkLCBpbnNwZWN0b3JTdGFydHNBdHRhY2hlZCwgQm9vbCwg Ym9vbCwgdHJ1ZSkgXAorICAgIG1hY3JvKEluc3BlY3RvclVzZXNXZWJLaXRVc2VySW50ZXJmYWNl LCBpbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFjZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwK ICAgICBtYWNybyhTaG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVkVGV4dCwgc2hvd3NUb29sVGlwT3Zl clRydW5jYXRlZFRleHQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oTW9ja1Njcm9s bGJhcnNFbmFibGVkLCBtb2NrU2Nyb2xsYmFyc0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBc CiAgICAgbWFjcm8oV2ViQXVkaW9FbmFibGVkLCB3ZWJBdWRpb0VuYWJsZWQsIEJvb2wsIGJvb2ws IGZhbHNlKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggOGUxZDE2NC4uYzhlY2FmZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNw cApAQCAtNTQsNyArNTQsNiBAQCB2b2lkIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVu Y29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbgogICAgIGVuY29kZXIt PmVuY29kZShhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KTsKICAgICBlbmNvZGVyLT5lbmNvZGUo ZGF0YWJhc2VEaXJlY3RvcnkpOwogICAgIGVuY29kZXItPmVuY29kZShsb2NhbFN0b3JhZ2VEaXJl Y3RvcnkpOwotICAgIGVuY29kZXItPmVuY29kZSh3ZWJJbnNwZWN0b3JMb2NhbGl6ZWRTdHJpbmdz UGF0aCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHVybFNjaGVtZXNSZWdpc3RlcmVyZEFzRW1wdHlE b2N1bWVudCk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHVybFNjaGVtZXNSZWdpc3RlcmVkQXNTZWN1 cmUpOwogICAgIGVuY29kZXItPmVuY29kZSh1cmxTY2hlbWVzRm9yV2hpY2hEb21haW5SZWxheGF0 aW9uSXNGb3JiaWRkZW4pOwpAQCAtMTE3LDggKzExNiw2IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2Rlciwg V2ViCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwYXJh bWV0ZXJzLmxvY2FsU3RvcmFnZURpcmVjdG9yeSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICBpZiAoIWRlY29kZXItPmRlY29kZShwYXJhbWV0ZXJzLndlYkluc3BlY3RvckxvY2FsaXplZFN0 cmluZ3NQYXRoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVj b2RlKHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZXJkQXNFbXB0eURvY3VtZW50KSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMu dXJsU2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCAzYTM3NjRkLi45YjUx ZjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgKQEAgLTU3LDcgKzU3LDYgQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMgewogICAgIFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OyAgICAK ICAgICBTdHJpbmcgZGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgU3RyaW5nIGxvY2FsU3RvcmFnZURp cmVjdG9yeTsKLSAgICBTdHJpbmcgd2ViSW5zcGVjdG9yTG9jYWxpemVkU3RyaW5nc1BhdGg7CiAK ICAgICBWZWN0b3I8U3RyaW5nPiB1cmxTY2hlbWVzUmVnaXN0ZXJlcmRBc0VtcHR5RG9jdW1lbnQ7 CiAgICAgVmVjdG9yPFN0cmluZz4gdXJsU2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKaW5kZXggY2VmODk3Ny4u ODg5MGU4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29u dGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5j cHAKQEAgLTIzNSwyMSArMjM1LDYgQEAgdm9pZCBXS0NvbnRleHRTZXRMb2NhbFN0b3JhZ2VEaXJl Y3RvcnkoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVmIGxvY2EKICAgICB0b0lt cGwoY29udGV4dFJlZiktPnNldExvY2FsU3RvcmFnZURpcmVjdG9yeSh0b0ltcGwobG9jYWxTdG9y YWdlRGlyZWN0b3J5KS0+c3RyaW5nKCkpOwogfQogCi12b2lkIFdLQ29udGV4dFNldE92ZXJyaWRl V2ViSW5zcGVjdG9yQmFzZURpcmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tTdHJp bmdSZWYgd2ViSW5zcGVjdG9yQmFzZURpcmVjdG9yeSkKLXsKLSAgICB0b0ltcGwoY29udGV4dFJl ZiktPnNldE92ZXJyaWRlV2ViSW5zcGVjdG9yQmFzZURpcmVjdG9yeSh0b0ltcGwod2ViSW5zcGVj dG9yQmFzZURpcmVjdG9yeSktPnN0cmluZygpKTsKLX0KLQotdm9pZCBXS0NvbnRleHRTZXRPdmVy cmlkZVdlYkluc3BlY3RvclBhZ2VQYXRoKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1N0cmlu Z1JlZiB3ZWJJbnNwZWN0b3JQYWdlUGF0aCkKLXsKLSAgICB0b0ltcGwoY29udGV4dFJlZiktPnNl dE92ZXJyaWRlV2ViSW5zcGVjdG9yUGFnZVBhdGgodG9JbXBsKHdlYkluc3BlY3RvclBhZ2VQYXRo KS0+c3RyaW5nKCkpOwotfQotCi12b2lkIFdLQ29udGV4dFNldE92ZXJyaWRlV2ViSW5zcGVjdG9y TG9jYWxpemVkU3RyaW5nc1BhdGgoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVm IHdlYkluc3BlY3RvckxvY2FsaXplZFN0cmluZ3NQYXRoKQotewotICAgIHRvSW1wbChjb250ZXh0 UmVmKS0+c2V0T3ZlcnJpZGVXZWJJbnNwZWN0b3JMb2NhbGl6ZWRTdHJpbmdzUGF0aCh0b0ltcGwo d2ViSW5zcGVjdG9yTG9jYWxpemVkU3RyaW5nc1BhdGgpLT5zdHJpbmcoKSk7Ci19Ci0KIHZvaWQg V0tDb250ZXh0RGlzYWJsZVByb2Nlc3NUZXJtaW5hdGlvbihXS0NvbnRleHRSZWYgY29udGV4dFJl ZikKIHsKICAgICB0b0ltcGwoY29udGV4dFJlZiktPmRpc2FibGVQcm9jZXNzVGVybWluYXRpb24o KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQ cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0 ZS5oCmluZGV4IGFkNjlkYTEuLjAxZGFjNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaApAQCAtNjIsOSArNjIsNiBAQCBXS19FWFBP UlQgdm9pZCBXS0NvbnRleHRTZXRJY29uRGF0YWJhc2VQYXRoKFdLQ29udGV4dFJlZiBjb250ZXh0 LCBXS1N0cmluZ1JlZiBpYwogLy8gd2Ugc2hvdWxkIHJlYWxseSBjaGFuZ2UgdGhlc2Ugc2V0dGlu Z3MgdG8gYmUgb24gV2ViUHJlZmVyZW5jZXMgYW5kIGNoYW5nZWFibGUgYXQgcnVudGltZS4KIFdL X0VYUE9SVCB2b2lkIFdLQ29udGV4dFNldERhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dFJlZiBj b250ZXh0LCBXS1N0cmluZ1JlZiBkYXRhYmFzZURpcmVjdG9yeSk7CiBXS19FWFBPUlQgdm9pZCBX S0NvbnRleHRTZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0UmVmIGNvbnRleHQsIFdL U3RyaW5nUmVmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7Ci1XS19FWFBPUlQgdm9pZCBXS0NvbnRl eHRTZXRPdmVycmlkZVdlYkluc3BlY3RvckJhc2VEaXJlY3RvcnkoV0tDb250ZXh0UmVmIGNvbnRl eHQsIFdLU3RyaW5nUmVmIHdlYkluc3BlY3RvckJhc2VEaXJlY3RvcnkpOwotV0tfRVhQT1JUIHZv aWQgV0tDb250ZXh0U2V0T3ZlcnJpZGVXZWJJbnNwZWN0b3JQYWdlUGF0aChXS0NvbnRleHRSZWYg Y29udGV4dCwgV0tTdHJpbmdSZWYgd2ViSW5zcGVjdG9yUGFnZVBhdGgpOwotV0tfRVhQT1JUIHZv aWQgV0tDb250ZXh0U2V0T3ZlcnJpZGVXZWJJbnNwZWN0b3JMb2NhbGl6ZWRTdHJpbmdzUGF0aChX S0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYgd2ViSW5zcGVjdG9yTG9jYWxpemVkU3Ry aW5nc1BhdGgpOwogCiAvLyBGSVhNRTogVGhpcyBpcyBhIHdvcmthcm91bmQgZm9yIHRlc3Rpbmcg cHVycG9zZXMgb25seSBhbmQgc2hvdWxkIGJlIHJlbW92ZWQgb25jZSBhIGJldHRlcgogLy8gc29s dXRpb24gaGFzIGJlZW4gZm91bmQgZm9yIHRlc3RpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKaW5kZXggMzk5MDNiYy4uNTVjMzM4MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNw cApAQCAtNjc4LDYgKzY3OCwxNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRBcHBsaWNhdGlvbkNo cm9tZU1vZGVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZQogICAgIHJldHVy biB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5hcHBsaWNhdGlvbkNocm9tZU1vZGUoKTsKIH0KIAor dm9pZCBXS1ByZWZlcmVuY2VzU2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoV0tQ cmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKQoreworICAgIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPnNldEluc3BlY3RvclVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKGVu YWJsZWQpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRJbnNwZWN0b3JVc2VzV2ViS2l0VXNl ckludGVyZmFjZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVy biB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5pbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFj ZSgpOworfQorCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5k ZXJpbmcoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKQogewog ICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRl cmluZyhlbmFibGVkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXNQcml2YXRlLmgKaW5kZXggMzY5NTBlOC4uN2ZjZDY2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmgKQEAgLTE2Nyw2ICsxNjcsMTAgQEAgV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldE1v Y2tTY3JvbGxiYXJzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2UKIFdLX0VYUE9S VCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCk7CiBXS19FWFBPUlQgYm9v bCBXS1ByZWZlcmVuY2VzR2V0QXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZChXS1ByZWZlcmVu Y2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKIAorLy8gRGVmYXVsdHMgdG8gZmFsc2UuCitXS19FWFBP UlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2Uo V0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKTsKK1dLX0VYUE9S VCBib29sIFdLUHJlZmVyZW5jZXNHZXRJbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFjZShX S1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVm ZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5jcHAKaW5kZXggMjNjYTU2Yi4uNzc2NjFkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtMjU5LDEwICsyNTksOCBAQCB2b2lkIFdlYkNvbnRleHQ6 OmVuc3VyZVdlYlByb2Nlc3MoKQogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVj dG9yeSA9IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKICAgICBwYXJhbWV0ZXJzLmRhdGFi YXNlRGlyZWN0b3J5ID0gZGF0YWJhc2VEaXJlY3RvcnkoKTsKICAgICBwYXJhbWV0ZXJzLmxvY2Fs U3RvcmFnZURpcmVjdG9yeSA9IGxvY2FsU3RvcmFnZURpcmVjdG9yeSgpOwotICAgIHBhcmFtZXRl cnMud2ViSW5zcGVjdG9yTG9jYWxpemVkU3RyaW5nc1BhdGggPSBtX292ZXJyaWRlV2ViSW5zcGVj dG9yTG9jYWxpemVkU3RyaW5nc1BhdGg7CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgcGFyYW1l dGVycy53ZWJJbnNwZWN0b3JCYXNlRGlyZWN0b3J5ID0gbV9vdmVycmlkZVdlYkluc3BlY3RvckJh c2VEaXJlY3Rvcnk7CiAgICAgcGFyYW1ldGVycy5wcmVzZW50ZXJBcHBsaWNhdGlvblBpZCA9IGdl dHBpZCgpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCmluZGV4 IGMzNzg3MjUuLjliZDQ3ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaApA QCAtMTc0LDE0ICsxNzQsNiBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIGljb25EYXRhYmFzZVBhdGgo KSBjb25zdDsKICAgICB2b2lkIHNldExvY2FsU3RvcmFnZURpcmVjdG9yeShjb25zdCBTdHJpbmcm IGRpcikgeyBtX292ZXJyaWRlTG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gZGlyOyB9CiAKLSAgICBT dHJpbmcgb3ZlcnJpZGVXZWJJbnNwZWN0b3JCYXNlRGlyZWN0b3J5KCkgY29uc3QgeyByZXR1cm4g bV9vdmVycmlkZVdlYkluc3BlY3RvckJhc2VEaXJlY3Rvcnk7IH0KLSAgICB2b2lkIHNldE92ZXJy aWRlV2ViSW5zcGVjdG9yQmFzZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIHBhdGgpIHsgbV9vdmVy cmlkZVdlYkluc3BlY3RvckJhc2VEaXJlY3RvcnkgPSBwYXRoOyB9Ci0KLSAgICBTdHJpbmcgb3Zl cnJpZGVXZWJJbnNwZWN0b3JQYWdlUGF0aCgpIGNvbnN0IHsgcmV0dXJuIG1fb3ZlcnJpZGVXZWJJ bnNwZWN0b3JQYWdlUGF0aDsgfQotICAgIHZvaWQgc2V0T3ZlcnJpZGVXZWJJbnNwZWN0b3JQYWdl UGF0aChjb25zdCBTdHJpbmcmIHBhdGgpIHsgbV9vdmVycmlkZVdlYkluc3BlY3RvclBhZ2VQYXRo ID0gcGF0aDsgfQotCi0gICAgdm9pZCBzZXRPdmVycmlkZVdlYkluc3BlY3RvckxvY2FsaXplZFN0 cmluZ3NQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkgeyBtX292ZXJyaWRlV2ViSW5zcGVjdG9yTG9j YWxpemVkU3RyaW5nc1BhdGggPSBwYXRoOyB9Ci0KICAgICB2b2lkIGVuc3VyZVdlYlByb2Nlc3Mo KTsKICAgICB2b2lkIHdhcm1Jbml0aWFsUHJvY2VzcygpOwogCkBAIC0zMTUsOSArMzA3LDYgQEAg cHJpdmF0ZToKICAgICBTdHJpbmcgbV9vdmVycmlkZURhdGFiYXNlRGlyZWN0b3J5OwogICAgIFN0 cmluZyBtX292ZXJyaWRlSWNvbkRhdGFiYXNlUGF0aDsKICAgICBTdHJpbmcgbV9vdmVycmlkZUxv Y2FsU3RvcmFnZURpcmVjdG9yeTsKLSAgICBTdHJpbmcgbV9vdmVycmlkZVdlYkluc3BlY3RvckJh c2VEaXJlY3Rvcnk7Ci0gICAgU3RyaW5nIG1fb3ZlcnJpZGVXZWJJbnNwZWN0b3JQYWdlUGF0aDsK LSAgICBTdHJpbmcgbV9vdmVycmlkZVdlYkluc3BlY3RvckxvY2FsaXplZFN0cmluZ3NQYXRoOwog CiAgICAgYm9vbCBtX3Byb2Nlc3NUZXJtaW5hdGlvbkVuYWJsZWQ7CiAgICAgCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQppbmRl eCAwZGI2NjJjLi4yNTk3ODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KQEAgLTM5LDkgKzM5LDExIEBACiAjaW1wb3J0 IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbC5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRTdHJpbmdzLmg+ Ci0jaW1wb3J0IDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CisjaW1wb3J0IDxXZWJDb3JlL1Nv ZnRMaW5raW5nLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorU09GVF9MSU5L X1BSSVZBVEVfRlJBTUVXT1JLX09QVElPTkFMKFdlYkluc3BlY3RvcikKKwogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC0xMDIsMTEgKzEwNCwy NCBAQCBAZW5kCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgYm9vbCBpbnNwZWN0b3JS ZWFsbHlVc2VzV2ViS2l0VXNlckludGVyZmFjZShXZWJQcmVmZXJlbmNlcyogcHJlZmVyZW5jZXMp Cit7CisgICAgLy8gVGhpcyBtYXRjaGVzIGEgc2ltaWxhciBjaGVjayBpbiBXZWJJbnNwZWN0b3JN YWMubW0uIEtlZXAgdGhlbSBpbiBzeW5jLgorCisgICAgLy8gQ2FsbCB0aGUgc29mdCBsaW5rIGZy YW1ld29yayBmdW5jdGlvbiB0byBkbG9wZW4gaXQsIHRoZW4gW05TQnVuZGxlIGJ1bmRsZVdpdGhJ ZGVudGlmaWVyOl0gd2lsbCB3b3JrLgorICAgIFdlYkluc3BlY3RvckxpYnJhcnkoKTsKKworICAg IGlmICghW1tOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJJbnNw ZWN0b3IiXSBwYXRoRm9yUmVzb3VyY2U6QCJNYWluIiBvZlR5cGU6QCJodG1sIl0pCisgICAgICAg IHJldHVybiB0cnVlOworCisgICAgcmV0dXJuIHByZWZlcmVuY2VzLT5pbnNwZWN0b3JVc2VzV2Vi S2l0VXNlckludGVyZmFjZSgpOworfQorCiB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpjcmVhdGVJ bnNwZWN0b3JXaW5kb3coKQogewogICAgIEFTU0VSVCghbV9pbnNwZWN0b3JXaW5kb3cpOwogCi0g ICAgYm9vbCB1c2VUZXh0dXJlZFdpbmRvdyA9IHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCkt Pm92ZXJyaWRlV2ViSW5zcGVjdG9yUGFnZVBhdGgoKS5pc0VtcHR5KCk7CisgICAgYm9vbCB1c2VU ZXh0dXJlZFdpbmRvdyA9IGluc3BlY3RvclJlYWxseVVzZXNXZWJLaXRVc2VySW50ZXJmYWNlKHBh Z2UoKS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCkpOwogCiAgICAgTlNVSW50ZWdlciBzdHls ZU1hc2sgPSAoTlNUaXRsZWRXaW5kb3dNYXNrIHwgTlNDbG9zYWJsZVdpbmRvd01hc2sgfCBOU01p bmlhdHVyaXphYmxlV2luZG93TWFzayB8IE5TUmVzaXphYmxlV2luZG93TWFzayk7CiAgICAgaWYg KHVzZVRleHR1cmVkV2luZG93KQpAQCAtMzAyLDkgKzMxNywxMSBAQCB2b2lkIFdlYkluc3BlY3Rv clByb3h5OjpwbGF0Zm9ybVNldEF0dGFjaGVkV2luZG93SGVpZ2h0KHVuc2lnbmVkIGhlaWdodCkK IAogU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKCkgY29uc3QKIHsK LSAgICBOU1N0cmluZyAqcGF0aCA9IHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCktPm92ZXJy aWRlV2ViSW5zcGVjdG9yUGFnZVBhdGgoKTsKLSAgICBpZiAoIVtwYXRoIGxlbmd0aF0pCisgICAg TlNTdHJpbmcgKnBhdGg7CisgICAgaWYgKGluc3BlY3RvclJlYWxseVVzZXNXZWJLaXRVc2VySW50 ZXJmYWNlKHBhZ2UoKS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCkpKQogICAgICAgICBwYXRo ID0gW1tOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl0g cGF0aEZvclJlc291cmNlOkAiaW5zcGVjdG9yIiBvZlR5cGU6QCJodG1sIiBpbkRpcmVjdG9yeTpA Imluc3BlY3RvciJdOworICAgIGVsc2UKKyAgICAgICAgcGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxl V2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViSW5zcGVjdG9yIl0gcGF0aEZvclJlc291cmNl OkAiTWFpbiIgb2ZUeXBlOkAiaHRtbCJdOwogCiAgICAgQVNTRVJUKFtwYXRoIGxlbmd0aF0pOwog CkBAIC0zMTMsMTEgKzMzMCwxMSBAQCBTdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3Rv clBhZ2VVUkwoKSBjb25zdAogCiBTdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJh c2VVUkwoKSBjb25zdAogewotICAgIE5TU3RyaW5nICpwYXRoID0gcGFnZSgpLT5wcm9jZXNzKCkt PmNvbnRleHQoKS0+b3ZlcnJpZGVXZWJJbnNwZWN0b3JCYXNlRGlyZWN0b3J5KCk7Ci0gICAgaWYg KCFbcGF0aCBsZW5ndGhdKSB7Ci0gICAgICAgIC8vIFdlYkNvcmUncyBXZWIgSW5zcGVjdG9yIHVz ZXMgbG9jYWxpemVkIHN0cmluZ3MsIHdoaWNoIGFyZSBub3QgY29udGFpbmVkIHdpdGhpbiBpbnNw ZWN0b3IgZGlyZWN0b3J5LgorICAgIE5TU3RyaW5nICpwYXRoOworICAgIGlmIChpbnNwZWN0b3JS ZWFsbHlVc2VzV2ViS2l0VXNlckludGVyZmFjZShwYWdlKCktPnBhZ2VHcm91cCgpLT5wcmVmZXJl bmNlcygpKSkKICAgICAgICAgcGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50aWZpZXI6 QCJjb20uYXBwbGUuV2ViQ29yZSJdIHJlc291cmNlUGF0aF07Ci0gICAgfQorICAgIGVsc2UKKyAg ICAgICAgcGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUu V2ViSW5zcGVjdG9yIl0gcmVzb3VyY2VQYXRoXTsKIAogICAgIEFTU0VSVChbcGF0aCBsZW5ndGhd KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYklu c3BlY3Rvci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rv ci5oCmluZGV4IDFjMzU0ZjcuLjA5MDZlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmgKQEAgLTMwLDggKzMwLDggQEAKIAogI2luY2x1 ZGUgIkFQSU9iamVjdC5oIgogI2luY2x1ZGUgIkNvbm5lY3Rpb24uaCIKLSNpbmNsdWRlIDx3dGYv Rm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi90 ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNjIsNyArNjIsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBzdG9wUGFnZVByb2ZpbGluZygpOwogCiAjaWYgUExBVEZPUk0o TUFDKQotICAgIHN0YXRpYyB2b2lkIHNldExvY2FsaXplZFN0cmluZ3NQYXRoKGNvbnN0IFN0cmlu ZyYpOworICAgIHZvaWQgc2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoYm9vbCk7 CiAjZW5kaWYKIAogcHJpdmF0ZToKQEAgLTEwOCw2ICsxMDgsOSBAQCBwcml2YXRlOgogICAgIFdl YlBhZ2UqIG1fcGFnZTsKICAgICBXZWJQYWdlKiBtX2luc3BlY3RvclBhZ2U7CiAgICAgV2ViSW5z cGVjdG9yRnJvbnRlbmRDbGllbnQqIG1fZnJvbnRlbmRDbGllbnQ7CisjaWYgUExBVEZPUk0oTUFD KQorICAgIFN0cmluZyBtX2xvY2FsaXplZFN0cmluZ3NVUkw7CisjZW5kaWYKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9XZWJJbnNwZWN0b3JNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1hYy5tbQppbmRleCBkNjRiZjljLi41YTZhYzRlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYkluc3Bl Y3Rvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dl Ykluc3BlY3Rvck1hYy5tbQpAQCAtMjYsMjcgKzI2LDM4IEBACiAjaW1wb3J0ICJjb25maWcuaCIK ICNpbXBvcnQgIldlYkluc3BlY3Rvci5oIgogCi0jaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KKyNpbXBvcnQgPFdlYkNvcmUvU29mdExpbmtpbmcuaD4KKworU09GVF9MSU5LX1BSSVZBVEVf RlJBTUVXT1JLX09QVElPTkFMKFdlYkluc3BlY3RvcikKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK LXN0YXRpYyBTdHJpbmcmIGdsb2JhbEluc3BlY3RvckxvY2FsaXplZFN0cmluZ3NVUkwoKQorc3Rh dGljIGJvb2wgaW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoYm9vbCBwcmVm ZXJlbmNlKQogewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBpbnNwZWN0b3JMb2Nh bGl6ZWRTdHJpbmdzVVJMLCAoKSk7Ci0gICAgcmV0dXJuIGluc3BlY3RvckxvY2FsaXplZFN0cmlu Z3NVUkw7CisgICAgLy8gVGhpcyBtYXRjaGVzIGEgc2ltaWxhciBjaGVjayBpbiBXZWJJbnNwZWN0 b3JQcm94eU1hYy5tbS4gS2VlcCB0aGVtIGluIHN5bmMuCisKKyAgICAvLyBDYWxsIHRoZSBzb2Z0 IGxpbmsgZnJhbWV3b3JrIGZ1bmN0aW9uIHRvIGRsb3BlbiBpdCwgdGhlbiBbTlNCdW5kbGUgYnVu ZGxlV2l0aElkZW50aWZpZXI6XSB3aWxsIHdvcmsuCisgICAgV2ViSW5zcGVjdG9yTGlicmFyeSgp OworCisgICAgaWYgKCFbW05TQnVuZGxlIGJ1bmRsZVdpdGhJZGVudGlmaWVyOkAiY29tLmFwcGxl LldlYkluc3BlY3RvciJdIHBhdGhGb3JSZXNvdXJjZTpAIk1haW4iIG9mVHlwZTpAImh0bWwiXSkK KyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gcHJlZmVyZW5jZTsKIH0KIAotdm9p ZCBXZWJJbnNwZWN0b3I6OnNldExvY2FsaXplZFN0cmluZ3NQYXRoKGNvbnN0IFN0cmluZyYgcGF0 aCkKK3ZvaWQgV2ViSW5zcGVjdG9yOjpzZXRJbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFj ZShib29sIGZsYWcpCiB7Ci0gICAgaWYgKCFwYXRoLmlzRW1wdHkoKSkKLSAgICAgICAgZ2xvYmFs SW5zcGVjdG9yTG9jYWxpemVkU3RyaW5nc1VSTCgpID0gW1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6 cGF0aF0gYWJzb2x1dGVTdHJpbmddOworICAgIE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVyID0g aW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoZmxhZykgPyBAImNvbS5hcHBs ZS5XZWJDb3JlIiA6IEAiY29tLmFwcGxlLldlYkluc3BlY3RvciI7CisgICAgTlNTdHJpbmcgKnBh dGggPSBbW05TQnVuZGxlIGJ1bmRsZVdpdGhJZGVudGlmaWVyOmJ1bmRsZUlkZW50aWZpZXJdIHBh dGhGb3JSZXNvdXJjZTpAImxvY2FsaXplZFN0cmluZ3MiIG9mVHlwZTpAImpzIl07CisgICAgaWYg KFtwYXRoIGxlbmd0aF0pCisgICAgICAgIG1fbG9jYWxpemVkU3RyaW5nc1VSTCA9IFtbTlNVUkwg ZmlsZVVSTFdpdGhQYXRoOnBhdGhdIGFic29sdXRlU3RyaW5nXTsKICAgICBlbHNlCi0gICAgICAg IGdsb2JhbEluc3BlY3RvckxvY2FsaXplZFN0cmluZ3NVUkwoKSA9IFN0cmluZygpOworICAgICAg ICBtX2xvY2FsaXplZFN0cmluZ3NVUkwgPSBTdHJpbmcoKTsKIH0KIAogU3RyaW5nIFdlYkluc3Bl Y3Rvcjo6bG9jYWxpemVkU3RyaW5nc1VSTCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGdsb2JhbElu c3BlY3RvckxvY2FsaXplZFN0cmluZ3NVUkwoKTsKKyAgICByZXR1cm4gbV9sb2NhbGl6ZWRTdHJp bmdzVVJMOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbSBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQppbmRleCBkODc2YThkLi5m ZjFiOGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dlYlBhZ2VNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9XZWJQYWdlTWFjLm1tCkBAIC0zNSw3ICszNSw5IEBACiAjaW1wb3J0ICJXZWJFdmVudC5oIgog I2ltcG9ydCAiV2ViRXZlbnRDb252ZXJzaW9uLmgiCiAjaW1wb3J0ICJXZWJGcmFtZS5oIgorI2lt cG9ydCAiV2ViSW5zcGVjdG9yLmgiCiAjaW1wb3J0ICJXZWJQYWdlUHJveHlNZXNzYWdlcy5oIgor I2ltcG9ydCAiV2ViUHJlZmVyZW5jZXNTdG9yZS5oIgogI2ltcG9ydCAiV2ViUHJvY2Vzcy5oIgog I2ltcG9ydCA8V2ViQ29yZS9BWE9iamVjdENhY2hlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZvY3Vz Q29udHJvbGxlci5oPgpAQCAtODMsOCArODUsMTAgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUlu aXRpYWxpemUoKQogICAgIG1fbW9ja0FjY2Vzc2liaWxpdHlFbGVtZW50ID0gbW9ja0FjY2Vzc2li aWxpdHlFbGVtZW50OwogfQogCi12b2lkIFdlYlBhZ2U6OnBsYXRmb3JtUHJlZmVyZW5jZXNEaWRD aGFuZ2UoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYpCit2b2lkIFdlYlBhZ2U6OnBsYXRmb3Jt UHJlZmVyZW5jZXNEaWRDaGFuZ2UoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiB7 CisgICAgaWYgKFdlYkluc3BlY3RvciogaW5zcGVjdG9yID0gdGhpcy0+aW5zcGVjdG9yKCkpCisg ICAgICAgIGluc3BlY3Rvci0+c2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2Uoc3Rv cmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjppbnNwZWN0b3JVc2VzV2Vi S2l0VXNlckludGVyZmFjZUtleSgpKSk7CiB9CiAKIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFN0 cmluZz4gU2VsZWN0b3JOYW1lTWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFj L1dlYlByb2Nlc3NNYWMubW0KaW5kZXggN2QwZDY5Yy4uZmEwMzgwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCkBAIC0yNDksMTAgKzI0OSw4 IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBX ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzCiAgICAgICAgIFtOU1VSTENhY2hlIHNldFNoYXJl ZFVSTENhY2hlOnBhcmVudFByb2Nlc3NVUkxDYWNoZS5nZXQoKV07CiAgICAgfQogCi0gICAgV2Vi SW5zcGVjdG9yOjpzZXRMb2NhbGl6ZWRTdHJpbmdzUGF0aChwYXJhbWV0ZXJzLndlYkluc3BlY3Rv ckxvY2FsaXplZFN0cmluZ3NQYXRoKTsKLQogICAgIG1fY29tcG9zaXRpbmdSZW5kZXJTZXJ2ZXJQ b3J0ID0gcGFyYW1ldGVycy5hY2NlbGVyYXRlZENvbXBvc2l0aW5nUG9ydC5wb3J0KCk7Ci0gICAg CisKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKICAgICBtX25vdGlmaWNhdGlvbk1hbmFnZXIu aW5pdGlhbGl6ZShwYXJhbWV0ZXJzLm5vdGlmaWNhdGlvblBlcm1pc3Npb25zKTsKICNlbmRpZgot LSAKMS43LjcuNSAoQXBwbGUgR2l0LTI2KQoK