127019 2014-01-14 16:35:10 -0800 Crash when multiple WebView instances have different PrivateBrowsing settings 2014-01-15 14:31:29 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 127053 1 ap ap beidson commit-queue mhock ossy sam oldest_to_newest 968092 0 ap 2014-01-14 16:35:10 -0800 In WebKit1, we don't have the new WebKit2 logic that keeps track of preferences, and only deletes private browsing sessions when no pages use private browsing any more. This causes crashes for apps that have views in different modes. <rdar://problem/15484194> 968094 1 221214 ap 2014-01-14 16:39:01 -0800 Created attachment 221214 proposed fix 968187 2 221214 commit-queue 2014-01-14 23:14:30 -0800 Comment on attachment 221214 proposed fix Clearing flags on attachment: 221214 Committed r162054: <http://trac.webkit.org/changeset/162054> 968188 3 commit-queue 2014-01-14 23:14:32 -0800 All reviewed patches have been landed. Closing bug. 968325 4 ossy 2014-01-15 08:19:17 -0800 (In reply to comment #3) > All reviewed patches have been landed. Closing bug. It caused crashes on Apple Mac debug bots. 968365 5 commit-queue 2014-01-15 09:38:17 -0800 Re-opened since this is blocked by bug 127053 968375 6 ap 2014-01-15 09:44:16 -0800 Rolled out in <https://trac.webkit.org/r162075>. 968435 7 221295 ap 2014-01-15 12:50:55 -0800 Created attachment 221295 updated patch I didn't realize that preferences weren't cached in _private->values unless they were changed in the process. So, other processes could change the private browsing preference behind the back of our session tracker, and parallel DumpRenderTrees did. It's a separate bug that DRT writes out persistent preferences. 968452 8 221295 commit-queue 2014-01-15 13:26:15 -0800 Comment on attachment 221295 updated patch Clearing flags on attachment: 221295 Committed r162087: <http://trac.webkit.org/changeset/162087> 968453 9 commit-queue 2014-01-15 13:26:17 -0800 All reviewed patches have been landed. Closing bug. 968472 10 ap 2014-01-15 14:31:29 -0800 Added a null check to fix Safari crashes in <http://trac.webkit.org/r162091>. 221214 2014-01-14 16:39:01 -0800 2014-01-15 12:50:55 -0800 proposed fix PrivateBrowsingWK1.txt text/plain 5686 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjAyNSkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAxLTE0 ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIHdo ZW4gbXVsdGlwbGUgV2ViVmlldyBpbnN0YW5jZXMgaGF2ZSBkaWZmZXJlbnQgUHJpdmF0ZUJyb3dz aW5nIHNldHRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjcwMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbTogKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2Vk Ol0pOiBEb24ndCBkZWxldGUgYSBwcml2YXRlCisgICAgICAgIGJyb3dzaW5nIHNlc3Npb24gc2lt cGx5IGJlY2F1c2Ugb25lIHByZWZlcmVuY2VzIG9iamVjdCBkb2Vzbid0IHVzZSBwcml2YXRlIGJy b3dzaW5nLgorICAgICAgICBUaGVyZSBjb3VsZCBiZSBvdGhlcnMgdGhhdCBkby4KKworICAgICAg ICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW06IFRyYWNrIGhvdyBtYW55IFdlYlByZWZlcmVu Y2VzIG9iamVjdHMgdXNlIHByaXZhdGUKKyAgICAgICAgYnJvd3NpbmcsIGFuZCBvbmx5IGRlbGV0 ZSB0aGUgcHJpdmF0ZSBzZXNzaW9uIHdoZW4gdGhlcmUgYXJlIG5vbmUgYW55IG1vcmUuCisKIDIw MTQtMDEtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgQ2xlYW4gdXAgZXhwb3J0cyBhbmQgaGVhZGVycyBmb3IgaU9TLgpJbmRleDogU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCShyZXZpc2lvbiAxNjE4OTUpCisr KyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCSh3b3JraW5nIGNv cHkpCkBAIC02OCw2ICs2OCw4IEBAIGVudW0geyBXZWJQcmVmZXJlbmNlc1ZlcnNpb24gPSAxIH07 CiBzdGF0aWMgV2ViUHJlZmVyZW5jZXMgKl9zdGFuZGFyZFByZWZlcmVuY2VzOwogc3RhdGljIE5T TXV0YWJsZURpY3Rpb25hcnkgKndlYlByZWZlcmVuY2VzSW5zdGFuY2VzOwogCitzdGF0aWMgdW5z aWduZWQgd2ViUHJlZmVyZW5jZXNJbnN0YW5jZUNvdW50V2l0aFByaXZhdGVCcm93c2luZ0VuYWJs ZWQ7CisKIHN0YXRpYyBib29sIGNvbnRhaW5zKGNvbnN0IGNoYXIqIGNvbnN0IGFycmF5W10sIGlu dCBjb3VudCwgY29uc3QgY2hhciogaXRlbSkKIHsKICAgICBpZiAoIWl0ZW0pCkBAIC0yNjIsNiAr MjY0LDggQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoSWRlbnRpZmllcjooTlNTdAogCiAgICAg W1tzZWxmIGNsYXNzXSBfc2V0SW5zdGFuY2U6c2VsZiBmb3JJZGVudGlmaWVyOl9wcml2YXRlLT5p ZGVudGlmaWVyLmdldCgpXTsKIAorICAgIFtzZWxmIF91cGRhdGVQcml2YXRlQnJvd3NpbmdTdGF0 ZUZyb206Tk8gdG86W3NlbGYgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZF1dOworCiAjaWYgUExBVEZP Uk0oSU9TKQogICAgIGlmIChzZW5kQ2hhbmdlTm90aWZpY2F0aW9uKSB7CiAgICAgICAgIFtzZWxm IF9wb3N0UHJlZmVyZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9uXTsKQEAgLTMxOCw2ICszMjIsNyBA QCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb2RlcjooTlNDb2RlciAqCiAgICAgICAgIHNlbGYg PSBbaW5zdGFuY2UgcmV0YWluXTsKICAgICB9IGVsc2UgewogICAgICAgICBbW3NlbGYgY2xhc3Nd IF9zZXRJbnN0YW5jZTpzZWxmIGZvcklkZW50aWZpZXI6X3ByaXZhdGUtPmlkZW50aWZpZXIuZ2V0 KCldOworICAgICAgICBbc2VsZiBfdXBkYXRlUHJpdmF0ZUJyb3dzaW5nU3RhdGVGcm9tOk5PIHRv OltzZWxmIHByaXZhdGVCcm93c2luZ0VuYWJsZWRdXTsKICAgICB9CiAKICAgICByZXR1cm4gc2Vs ZjsKQEAgLTM1OCw2ICszNjMsNyBAQCArIChXZWJQcmVmZXJlbmNlcyAqKXN0YW5kYXJkUHJlZmVy ZW5jZXMKICAgICAgICAgW19zdGFuZGFyZFByZWZlcmVuY2VzIHNldEF1dG9zYXZlczpZRVNdOwog ICAgIH0KICNlbHNlCisgICAgLy8gRklYTUU6IFRoaXMgY2hlY2sgaXMgbmVjZXNzYXJ5IHRvIGF2 b2lkIHJlY3Vyc2lvbiAoc2VlIDxyZGFyOi8vcHJvYmxlbS85NTY0MzM3PiksIGJ1dCBpdCBhbHNv IG1ha2VzIF9zdGFuZGFyZFByZWZlcmVuY2VzIGNvbnN0cnVjdGlvbiBub3QgdGhyZWFkIHNhZmUu CiAgICAgaWYgKF9zdGFuZGFyZFByZWZlcmVuY2VzKQogICAgICAgICByZXR1cm4gX3N0YW5kYXJk UHJlZmVyZW5jZXM7CiAKQEAgLTU5OCw2ICs2MDQsOCBAQCArICh2b2lkKWluaXRpYWxpemUKIAog LSAodm9pZClkZWFsbG9jCiB7CisgICAgW3NlbGYgX3VwZGF0ZVByaXZhdGVCcm93c2luZ1N0YXRl RnJvbTpbc2VsZiBwcml2YXRlQnJvd3NpbmdFbmFibGVkXSB0bzpOT107CisKICAgICBkZWxldGUg X3ByaXZhdGU7CiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQpAQCAtMTA3MCw5ICsxMDc4LDEwIEBA IC0gKEJPT0wpdGFic1RvTGlua3MKIH0KICNlbmRpZgogCi0tICh2b2lkKXNldFByaXZhdGVCcm93 c2luZ0VuYWJsZWQ6KEJPT0wpZmxhZworLSAodm9pZClzZXRQcml2YXRlQnJvd3NpbmdFbmFibGVk OihCT09MKWVuYWJsZWQKIHsKLSAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5Oldl YktpdFByaXZhdGVCcm93c2luZ0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKKyAgICBbc2VsZiBfdXBk YXRlUHJpdmF0ZUJyb3dzaW5nU3RhdGVGcm9tOltzZWxmIHByaXZhdGVCcm93c2luZ0VuYWJsZWRd IHRvOmVuYWJsZWRdOworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZW5hYmxlZCBmb3JLZXk6V2Vi S2l0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtIChCT09MKXBy aXZhdGVCcm93c2luZ0VuYWJsZWQKQEAgLTEwODAsNiArMTA4OSwyMSBAQCAtIChCT09MKXByaXZh dGVCcm93c2luZ0VuYWJsZWQKICAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJL aXRQcml2YXRlQnJvd3NpbmdFbmFibGVkUHJlZmVyZW5jZUtleV07CiB9CiAKKy0gKHZvaWQpX3Vw ZGF0ZVByaXZhdGVCcm93c2luZ1N0YXRlRnJvbTooQk9PTCl3YXNFbmFibGVkIHRvOihCT09MKWVu YWJsZWQKK3sKKyAgICBpZiAoZW5hYmxlZCA9PSB3YXNFbmFibGVkKQorICAgICAgICByZXR1cm47 CisgICAgaWYgKGVuYWJsZWQgPiB3YXNFbmFibGVkKSB7CisgICAgICAgIFdlYkZyYW1lTmV0d29y a2luZ0NvbnRleHQ6OmVuc3VyZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKKyAgICAgICAgKyt3 ZWJQcmVmZXJlbmNlc0luc3RhbmNlQ291bnRXaXRoUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDsKKyAg ICB9IGVsc2UgeworICAgICAgICBBU1NFUlQod2ViUHJlZmVyZW5jZXNJbnN0YW5jZUNvdW50V2l0 aFByaXZhdGVCcm93c2luZ0VuYWJsZWQpOworICAgICAgICAtLXdlYlByZWZlcmVuY2VzSW5zdGFu Y2VDb3VudFdpdGhQcml2YXRlQnJvd3NpbmdFbmFibGVkOworICAgICAgICBpZiAoIXdlYlByZWZl cmVuY2VzSW5zdGFuY2VDb3VudFdpdGhQcml2YXRlQnJvd3NpbmdFbmFibGVkKQorICAgICAgICAg ICAgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6ZGVzdHJveVByaXZhdGVCcm93c2luZ1Nlc3Np b24oKTsKKyAgICB9Cit9CisKIC0gKHZvaWQpc2V0VXNlc1BhZ2VDYWNoZTooQk9PTCl1c2VzUGFn ZUNhY2hlCiB7CiAgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTp1c2VzUGFnZUNhY2hlIGZvcktleTpX ZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleV07CkBAIC0yMjYzLDExICsyMjg3LDE1IEBA IC0gKHZvaWQpc2V0UGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zOihCT08KICNpZiBQTEFURk9STShJ T1MpCiAtICh2b2lkKV9pbnZhbGlkYXRlQ2FjaGVkUHJlZmVyZW5jZXMKIHsKKyAgICBCT09MIHBy aXZhdGVCcm93c2luZ1dhc0VuYWJsZWQgPSBbc2VsZiBwcml2YXRlQnJvd3NpbmdFbmFibGVkXTsK KwogICAgIGRpc3BhdGNoX2JhcnJpZXJfc3luYyhfcHJpdmF0ZS0+cmVhZFdyaXRlUXVldWUsIF57 CiAgICAgICAgIGlmIChfcHJpdmF0ZS0+dmFsdWVzKQogICAgICAgICAgICAgX3ByaXZhdGUtPnZh bHVlcyA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CiAgICAg fSk7CiAKKyAgICBbc2VsZiBfdXBkYXRlUHJpdmF0ZUJyb3dzaW5nU3RhdGVGcm9tOnByaXZhdGVC cm93c2luZ1dhc0VuYWJsZWQgdG86W3NlbGYgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZF1dOworCiAg ICAgLy8gVGVsbCBhbnkgbGl2ZSBXZWJWaWV3cyB0byByZWZyZXNoIHRoZWlyIHByZWZlcmVuY2Vz CiAgICAgW3NlbGYgX3Bvc3RQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb25dOwogfQpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTYxODk1KQorKysg U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y MzA4LDE2ICsyMzA4LDcgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihXZWJQcmVmZXJl bgogI2lmICFQTEFURk9STShJT1MpCiAgICAgc2V0dGluZ3Muc2V0RXhwZXJpbWVudGFsTm90aWZp Y2F0aW9uc0VuYWJsZWQoW3ByZWZlcmVuY2VzIGV4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFi bGVkXSk7CiAjZW5kaWYKLQotICAgIGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCA9IFtwcmVm ZXJlbmNlcyBwcml2YXRlQnJvd3NpbmdFbmFibGVkXTsKLSNpZiBQTEFURk9STShNQUMpIHx8IFVT RShDRk5FVFdPUkspCi0gICAgaWYgKHByaXZhdGVCcm93c2luZ0VuYWJsZWQpCi0gICAgICAgIFdl YkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmVuc3VyZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsK LSAgICBlbHNlCi0gICAgICAgIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmRlc3Ryb3lQcml2 YXRlQnJvd3NpbmdTZXNzaW9uKCk7Ci0jZW5kaWYKLSAgICBzZXR0aW5ncy5zZXRQcml2YXRlQnJv d3NpbmdFbmFibGVkKHByaXZhdGVCcm93c2luZ0VuYWJsZWQpOwotCisgICAgc2V0dGluZ3Muc2V0 UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChbcHJlZmVyZW5jZXMgcHJpdmF0ZUJyb3dzaW5nRW5hYmxl ZF0pOwogICAgIHNldHRpbmdzLnNldFNhbnNTZXJpZkZvbnRGYW1pbHkoW3ByZWZlcmVuY2VzIHNh bnNTZXJpZkZvbnRGYW1pbHldKTsKICAgICBzZXR0aW5ncy5zZXRTZXJpZkZvbnRGYW1pbHkoW3By ZWZlcmVuY2VzIHNlcmlmRm9udEZhbWlseV0pOwogICAgIHNldHRpbmdzLnNldFN0YW5kYXJkRm9u dEZhbWlseShbcHJlZmVyZW5jZXMgc3RhbmRhcmRGb250RmFtaWx5XSk7Cg== 221295 2014-01-15 12:50:55 -0800 2014-01-15 13:26:15 -0800 updated patch PrivateBrowsingWK1.txt text/plain 6824 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjA4MykKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAxLTE1 ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIHdo ZW4gbXVsdGlwbGUgV2ViVmlldyBpbnN0YW5jZXMgaGF2ZSBkaWZmZXJlbnQgUHJpdmF0ZUJyb3dz aW5nIHNldHRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjcwMTkKKworICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgorCisgICAgICAg ICogV2ViVmlldy9XZWJWaWV3Lm1tOiAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6 IERvbid0IGRlbGV0ZSBhIHByaXZhdGUKKyAgICAgICAgYnJvd3Npbmcgc2Vzc2lvbiBzaW1wbHkg YmVjYXVzZSBvbmUgcHJlZmVyZW5jZXMgb2JqZWN0IGRvZXNuJ3QgdXNlIHByaXZhdGUgYnJvd3Np bmcuCisgICAgICAgIFRoZXJlIGNvdWxkIGJlIG90aGVycyB0aGF0IGRvLgorCisgICAgICAgICog V2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbTogVHJhY2sgaG93IG1hbnkgV2ViUHJlZmVyZW5jZXMg b2JqZWN0cyB1c2UgcHJpdmF0ZQorICAgICAgICBicm93c2luZywgYW5kIG9ubHkgZGVsZXRlIHRo ZSBwcml2YXRlIHNlc3Npb24gd2hlbiB0aGVyZSBhcmUgbm9uZSBhbnkgbW9yZS4KKwogMjAxNC0w MS0xNSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1Nd IE1pc3NpbmcgUmVuZGVyT2JqZWN0OjpzdHlsZSgpIHN5bWJvbCBpbiBXZWJET01PcGVyYXRpb25z Lm1tCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0J KHJldmlzaW9uIDE2MjA4MykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTcwLDYgKzcwLDggQEAgZW51bSB7IFdlYlByZWZl cmVuY2VzVmVyc2lvbiA9IDEgfTsKIHN0YXRpYyBXZWJQcmVmZXJlbmNlcyAqX3N0YW5kYXJkUHJl ZmVyZW5jZXM7CiBzdGF0aWMgTlNNdXRhYmxlRGljdGlvbmFyeSAqd2ViUHJlZmVyZW5jZXNJbnN0 YW5jZXM7CiAKK3N0YXRpYyB1bnNpZ25lZCB3ZWJQcmVmZXJlbmNlc0luc3RhbmNlQ291bnRXaXRo UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDsKKwogc3RhdGljIGJvb2wgY29udGFpbnMoY29uc3QgY2hh ciogY29uc3QgYXJyYXlbXSwgaW50IGNvdW50LCBjb25zdCBjaGFyKiBpdGVtKQogewogICAgIGlm ICghaXRlbSkKQEAgLTE3MCw3ICsxNzIsOCBAQCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXNQcml2YXRl CiB7CiBwdWJsaWM6CiAgICAgV2ViUHJlZmVyZW5jZXNQcml2YXRlKCkKLSAgICA6IGF1dG9zYXZl cyhOTykKKyAgICA6IGluUHJpdmF0ZUJyb3dzaW5nKE5PKQorICAgICwgYXV0b3NhdmVzKE5PKQog ICAgICwgYXV0b21hdGljYWxseURldGVjdHNDYWNoZU1vZGVsKE5PKQogICAgICwgbnVtV2ViVmll d3MoMCkKICNpZiBQTEFURk9STShJT1MpCkBAIC0xODcsNiArMTkwLDcgQEAgcHVibGljOgogI2Vu ZGlmCiAKICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlRGljdGlvbmFyeT4gdmFsdWVzOworICAgIEJP T0wgaW5Qcml2YXRlQnJvd3Npbmc7CiAgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBpZGVudGlmaWVy OwogICAgIEJPT0wgYXV0b3NhdmVzOwogICAgIEJPT0wgYXV0b21hdGljYWxseURldGVjdHNDYWNo ZU1vZGVsOwpAQCAtMjY0LDYgKzI2OCw4IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aElkZW50 aWZpZXI6KE5TU3QKIAogICAgIFtbc2VsZiBjbGFzc10gX3NldEluc3RhbmNlOnNlbGYgZm9ySWRl bnRpZmllcjpfcHJpdmF0ZS0+aWRlbnRpZmllci5nZXQoKV07CiAKKyAgICBbc2VsZiBfdXBkYXRl UHJpdmF0ZUJyb3dzaW5nU3RhdGVUbzpbc2VsZiBwcml2YXRlQnJvd3NpbmdFbmFibGVkXV07CisK ICNpZiBQTEFURk9STShJT1MpCiAgICAgaWYgKHNlbmRDaGFuZ2VOb3RpZmljYXRpb24pIHsKICAg ICAgICAgW3NlbGYgX3Bvc3RQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb25dOwpAQCAtMzIw LDYgKzMyNiw3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvZGVyOihOU0NvZGVyICoKICAg ICAgICAgc2VsZiA9IFtpbnN0YW5jZSByZXRhaW5dOwogICAgIH0gZWxzZSB7CiAgICAgICAgIFtb c2VsZiBjbGFzc10gX3NldEluc3RhbmNlOnNlbGYgZm9ySWRlbnRpZmllcjpfcHJpdmF0ZS0+aWRl bnRpZmllci5nZXQoKV07CisgICAgICAgIFtzZWxmIF91cGRhdGVQcml2YXRlQnJvd3NpbmdTdGF0 ZVRvOltzZWxmIHByaXZhdGVCcm93c2luZ0VuYWJsZWRdXTsKICAgICB9CiAKICAgICByZXR1cm4g c2VsZjsKQEAgLTM2MCw2ICszNjcsNyBAQCArIChXZWJQcmVmZXJlbmNlcyAqKXN0YW5kYXJkUHJl ZmVyZW5jZXMKICAgICAgICAgW19zdGFuZGFyZFByZWZlcmVuY2VzIHNldEF1dG9zYXZlczpZRVNd OwogICAgIH0KICNlbHNlCisgICAgLy8gRklYTUU6IFRoaXMgY2hlY2sgaXMgbmVjZXNzYXJ5IHRv IGF2b2lkIHJlY3Vyc2lvbiAoc2VlIDxyZGFyOi8vcHJvYmxlbS85NTY0MzM3PiksIGJ1dCBpdCBh bHNvIG1ha2VzIF9zdGFuZGFyZFByZWZlcmVuY2VzIGNvbnN0cnVjdGlvbiBub3QgdGhyZWFkIHNh ZmUuCiAgICAgaWYgKF9zdGFuZGFyZFByZWZlcmVuY2VzKQogICAgICAgICByZXR1cm4gX3N0YW5k YXJkUHJlZmVyZW5jZXM7CiAKQEAgLTYwMCw2ICs2MDgsOCBAQCArICh2b2lkKWluaXRpYWxpemUK IAogLSAodm9pZClkZWFsbG9jCiB7CisgICAgW3NlbGYgX3VwZGF0ZVByaXZhdGVCcm93c2luZ1N0 YXRlVG86Tk9dOworCiAgICAgZGVsZXRlIF9wcml2YXRlOwogICAgIFtzdXBlciBkZWFsbG9jXTsK IH0KQEAgLTEwNzIsMTQgKzEwODIsMzMgQEAgLSAoQk9PTCl0YWJzVG9MaW5rcwogfQogI2VuZGlm CiAKLS0gKHZvaWQpc2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDooQk9PTClmbGFnCistICh2b2lk KXNldFByaXZhdGVCcm93c2luZ0VuYWJsZWQ6KEJPT0wpZW5hYmxlZAogewotICAgIFtzZWxmIF9z ZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZFByZWZl cmVuY2VLZXldOworICAgIFtzZWxmIF91cGRhdGVQcml2YXRlQnJvd3NpbmdTdGF0ZVRvOmVuYWJs ZWRdOworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZW5hYmxlZCBmb3JLZXk6V2ViS2l0UHJpdmF0 ZUJyb3dzaW5nRW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCiAtIChCT09MKXByaXZhdGVCcm93 c2luZ0VuYWJsZWQKIHsKLSAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRQ cml2YXRlQnJvd3NpbmdFbmFibGVkUHJlZmVyZW5jZUtleV07CisgICAgLy8gQ2hhbmdlcyB0byBw cml2YXRlIGJyb3dzaW5nIGRlZmF1bHRzIGRvIG5vdCBoYXZlIGVmZmVjdCBvbiBleGlzdGluZyBX ZWJQcmVmZXJlbmNlcywgYW5kIG11c3QgYmUgZG9uZSB0aHJvdWdoIC1zZXRQcml2YXRlQnJvd3Np bmdFbmFibGVkLgorICAgIC8vIFRoaXMgaXMgbmVlZGVkIHRvIGFjY3VyYXRlbHkgdHJhY2sgcHJp dmF0ZSBicm93c2luZyBzZXNzaW9ucyBpbiB0aGUgcHJvY2Vzcy4KKyAgICByZXR1cm4gX3ByaXZh dGUtPmluUHJpdmF0ZUJyb3dzaW5nOworfQorCistICh2b2lkKV91cGRhdGVQcml2YXRlQnJvd3Np bmdTdGF0ZVRvOihCT09MKWVuYWJsZWQKK3sKKyAgICBpZiAoZW5hYmxlZCA9PSBfcHJpdmF0ZS0+ aW5Qcml2YXRlQnJvd3NpbmcpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAoZW5hYmxlZCA+IF9w cml2YXRlLT5pblByaXZhdGVCcm93c2luZykgeworICAgICAgICBXZWJGcmFtZU5ldHdvcmtpbmdD b250ZXh0OjplbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCk7CisgICAgICAgICsrd2ViUHJl ZmVyZW5jZXNJbnN0YW5jZUNvdW50V2l0aFByaXZhdGVCcm93c2luZ0VuYWJsZWQ7CisgICAgfSBl bHNlIHsKKyAgICAgICAgQVNTRVJUKHdlYlByZWZlcmVuY2VzSW5zdGFuY2VDb3VudFdpdGhQcml2 YXRlQnJvd3NpbmdFbmFibGVkKTsKKyAgICAgICAgLS13ZWJQcmVmZXJlbmNlc0luc3RhbmNlQ291 bnRXaXRoUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDsKKyAgICAgICAgaWYgKCF3ZWJQcmVmZXJlbmNl c0luc3RhbmNlQ291bnRXaXRoUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCkKKyAgICAgICAgICAgIFdl YkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmRlc3Ryb3lQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCk7 CisgICAgfQorICAgIF9wcml2YXRlLT5pblByaXZhdGVCcm93c2luZyA9IGVuYWJsZWQ7CiB9CiAK IC0gKHZvaWQpc2V0VXNlc1BhZ2VDYWNoZTooQk9PTCl1c2VzUGFnZUNhY2hlCkBAIC0yMjY1LDEx ICsyMjk0LDE1IEBAIC0gKHZvaWQpc2V0UGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zOihCT08KICNp ZiBQTEFURk9STShJT1MpCiAtICh2b2lkKV9pbnZhbGlkYXRlQ2FjaGVkUHJlZmVyZW5jZXMKIHsK KyAgICBCT09MIHByaXZhdGVCcm93c2luZ1dhc0VuYWJsZWQgPSBbc2VsZiBwcml2YXRlQnJvd3Np bmdFbmFibGVkXTsKKwogICAgIGRpc3BhdGNoX2JhcnJpZXJfc3luYyhfcHJpdmF0ZS0+cmVhZFdy aXRlUXVldWUsIF57CiAgICAgICAgIGlmIChfcHJpdmF0ZS0+dmFsdWVzKQogICAgICAgICAgICAg X3ByaXZhdGUtPnZhbHVlcyA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBp bml0XSk7CiAgICAgfSk7CiAKKyAgICBbc2VsZiBfdXBkYXRlUHJpdmF0ZUJyb3dzaW5nU3RhdGVG cm9tOnByaXZhdGVCcm93c2luZ1dhc0VuYWJsZWQgdG86W3NlbGYgcHJpdmF0ZUJyb3dzaW5nRW5h YmxlZF1dOworCiAgICAgLy8gVGVsbCBhbnkgbGl2ZSBXZWJWaWV3cyB0byByZWZyZXNoIHRoZWly IHByZWZlcmVuY2VzCiAgICAgW3NlbGYgX3Bvc3RQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRp b25dOwogfQpAQCAtMjQzMSw2ICsyNDY0LDcgQEAgLSAodm9pZClzZXRTdG9yYWdlQmxvY2tpbmdQ b2xpY3k6KFdlYlN0bwogewogI2lmIFBMQVRGT1JNKElPUykKICAgICAvLyBXZSBkb24ndCB3YW50 IHRvIHdyaXRlIHRoZSBzZXR0aW5nIG91dCwgc28gd2UganVzdCByZXNldCB0aGUgZGVmYXVsdCBp bnN0ZWFkIG9mIHN0b3JpbmcgdGhlIG5ldyBzZXR0aW5nLgorICAgIC8vIEZJWE1FOiBUaGlzIGNv ZGUgcmVtb3ZlcyBhbnkgZGVmYXVsdHMgcHJldmlvdXNseSByZWdpc3RlcmVkIGJ5IGNsaWVudCBw cm9jZXNzLCB3aGljaCBpcyBub3QgYXBwcm9wcmlhdGUgZm9yIHRoaXMgbWV0aG9kIHRvIGRvLgog ICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmpl Y3Q6W05TTnVtYmVyIG51bWJlcldpdGhJbnQ6c3RvcmFnZUJsb2NraW5nUG9saWN5XSBmb3JLZXk6 V2ViS2l0U3RvcmFnZUJsb2NraW5nUG9saWN5S2V5XTsKICAgICBbW05TVXNlckRlZmF1bHRzIHN0 YW5kYXJkVXNlckRlZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOmRpY3RdOwogI2Vsc2UKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDE2MjA4MykKKysrIFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjMx NiwxNiArMjMxNiw3IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZDooV2ViUHJlZmVyZW4K ICNpZiAhUExBVEZPUk0oSU9TKQogICAgIHNldHRpbmdzLnNldEV4cGVyaW1lbnRhbE5vdGlmaWNh dGlvbnNFbmFibGVkKFtwcmVmZXJlbmNlcyBleHBlcmltZW50YWxOb3RpZmljYXRpb25zRW5hYmxl ZF0pOwogI2VuZGlmCi0KLSAgICBib29sIHByaXZhdGVCcm93c2luZ0VuYWJsZWQgPSBbcHJlZmVy ZW5jZXMgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZF07Ci0jaWYgUExBVEZPUk0oTUFDKSB8fCBVU0Uo Q0ZORVRXT1JLKQotICAgIGlmIChwcml2YXRlQnJvd3NpbmdFbmFibGVkKQotICAgICAgICBXZWJG cmFtZU5ldHdvcmtpbmdDb250ZXh0OjplbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCk7Ci0g ICAgZWxzZQotICAgICAgICBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0OjpkZXN0cm95UHJpdmF0 ZUJyb3dzaW5nU2Vzc2lvbigpOwotI2VuZGlmCi0gICAgc2V0dGluZ3Muc2V0UHJpdmF0ZUJyb3dz aW5nRW5hYmxlZChwcml2YXRlQnJvd3NpbmdFbmFibGVkKTsKLQorICAgIHNldHRpbmdzLnNldFBy aXZhdGVCcm93c2luZ0VuYWJsZWQoW3ByZWZlcmVuY2VzIHByaXZhdGVCcm93c2luZ0VuYWJsZWRd KTsKICAgICBzZXR0aW5ncy5zZXRTYW5zU2VyaWZGb250RmFtaWx5KFtwcmVmZXJlbmNlcyBzYW5z U2VyaWZGb250RmFtaWx5XSk7CiAgICAgc2V0dGluZ3Muc2V0U2VyaWZGb250RmFtaWx5KFtwcmVm ZXJlbmNlcyBzZXJpZkZvbnRGYW1pbHldKTsKICAgICBzZXR0aW5ncy5zZXRTdGFuZGFyZEZvbnRG YW1pbHkoW3ByZWZlcmVuY2VzIHN0YW5kYXJkRm9udEZhbWlseV0pOwo=