132409 2014-04-30 16:49:54 -0700 Web Inspector: Allow Remote Inspector to entitlement check UIProcess through WebProcess 2014-05-09 18:45:02 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck sam timothy webkit-bug-importer oldest_to_newest 1005578 0 joepeck 2014-04-30 16:49:54 -0700 When we have a proxy application like WebProcess holding WebViews for a UIProcess we only want to show the views if the UIProcess has the proper entitlements. Provide a path to pass the UIProcess audit_token (and pid) information on to webinspectord. Part of: <rdar://problem/16180430> 1005608 1 230547 joepeck 2014-04-30 17:32:07 -0700 Created attachment 230547 [PATCH] Proposed Fix 1005609 2 commit-queue 2014-04-30 17:35:00 -0700 Attachment 230547 did not pass style-queue: ERROR: Source/JavaScriptCore/inspector/remote/RemoteInspector.mm:544: Missing space before { [whitespace/braces] [5] ERROR: Source/JavaScriptCore/inspector/remote/RemoteInspector.h:64: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/JavaScriptCore/inspector/remote/RemoteInspector.h:67: The parameter name "pid" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 3 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1008176 3 joepeck 2014-05-09 18:45:02 -0700 <http://trac.webkit.org/changeset/168565> 230547 2014-04-30 17:32:07 -0700 2014-05-06 16:58:21 -0700 [PATCH] Proposed Fix patch-1.patch text/plain 22634 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDljYTgxODUuLmU4NGI3N2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE0LTA0LTMwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cg UmVtb3RlIEluc3BlY3RvciB0byBlbnRpdGxlbWVudCBjaGVjayBVSVByb2Nlc3MgdGhyb3VnaCBX ZWJQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzI0MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQcm94eSBhcHBsaWNhdGlvbnMgYXJlIGFwcGxpY2F0aW9ucyB3aGljaCBob2xkIFdlYlZpZXdz IGZvciBvdGhlcgorICAgICAgICBhcHBsaWNhdGlvbnMuIFRoZSBXZWJQcm9jZXNzIChXZWIgQ29u dGVudCBTZXJ2aWNlKSBpcyBhIHByb3h5IGFwcGxpY2F0aW9uLgorICAgICAgICBGb3IgbGVnYWN5 IHJlYXNvbnMgd2Ugd2VyZSBzdXBwb3J0aW5nIGEgc2NlbmFyaW8gd2hlcmUgcHJveHkgYXBwbGlj YXRpb25zCisgICAgICAgIGNvdWxkIHBvdGVudGlhbGx5IGhvc3QgV2ViVmlld3MgZm9yIG1vcmUg dGhlbiBvbmUgb3RoZXIgYXBwbGljYXRpb24uIFRoYXQKKyAgICAgICAgd2FzIG5ldmVyIHRoZSBj YXNlIGZvciBXZWJQcm9jZXNzIGFuZCBpdCBpcyBub3cgYSBzY2VuYXJpbyB3ZSBkb24ndCBuZWVk CisgICAgICAgIHRvIHdvcnJ5IGFib3V0IHN1cHBvcnRpbmcuCisKKyAgICAgICAgV2l0aCB0aGlz IGNoYW5nZSwgYSBwcm94eSBhcHBsaWNhdGlvbiBtb3JlIG5hdHVyYWxseSBvbmx5IGhvbGRzIFdl YlZpZXdzCisgICAgICAgIGZvciBhIHNpbmdsZSBwYXJlbnQgLyBob3N0IGFwcGxpY2F0aW9uLiBU aGUgcHJveHkgcHJvY2VzcyBjYW4gc2V0IHRoZQorICAgICAgICBwYXJlbnQgcGlkIC8gYXVkaXRf dG9rZW4gZGF0YSBvbiB0aGUgUmVtb3RlSW5zcGVjdG9yIHNpbmdsZXRvbiwgYW5kCisgICAgICAg IHRoYXQgZGF0YSB3aWxsIGJlIHNlbnQgb24gdG8gd2ViaW5zcGVjdG9yZCBsYXRlciBvbiB0byBi ZSB2YWxpZGF0ZWQuCisgICAgICAgIEluIHRoZSBXZWJQcm9jZXNzPC0+VUlQcm9jZXNzIHJlbGF0 aW9uc2hpcCB0aGF0IGluZm9ybWF0aW9uIGlzIGtub3duCisgICAgICAgIGFuZCBzZXQgaW1tZWRp YXRlbHkuIEluIHRoZSBMZWdhY3kgaU9TIGNhc2UgdGhhdCBpbmZvcm1hdGlvbiBpcyBzZXQKKyAg ICAgICAgc29vbiBhZnRlciwgYnV0IG5vdCBpbW1lZGlhdGVseSBrbm93biBhdCB0aGUgcG9pbnQg dGhlIFdlYlZpZXcgaXMgY3JlYXRlZC4KKworICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBzaW1w bGlmeSB0aGUgUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZSBpbnRlcmZhY2UuCisgICAgICAgIFdl IG5vIGxvbmdlciBuZWVkIGEgcGlkIHBlci1EZWJ1Z2dhYmxlLgorCisgICAgICAgICogaW5zcGVj dG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3Rvci5tbToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9y OjpSZW1vdGVJbnNwZWN0b3IpOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6 OnNldFBhcmVudFByb2Nlc3NJbmZvcm1hdGlvbik6CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90 ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlvblJlY2VpdmVkTWVzc2FnZSk6CisgICAgICAgIChJbnNw ZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6bGlzdGluZ0ZvckRlYnVnZ2FibGUpOgorICAgICAgICAo SW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkUHJveHlBcHBsaWNhdGlvblNldHVw TWVzc2FnZSk6CisgICAgICAgIEhhbmRsZSBuZXcgcHJveHkgYXBwbGljYXRpb24gc2V0dXAgbWVz c2FnZSwgYW5kIHByb3ZpZGUgYW4gQVBJCisgICAgICAgIGZvciBhIHByb3h5IGFwcGxpY2F0aW9u IHRvIHNldCB0aGUgcGFyZW50IHByb2Nlc3MgaW5mb3JtYXRpb24uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oOgorICAgICAgICBOZXcgc2V0 dXAgYW5kIHJlc3BvbnNlIG1lc3NhZ2UgZm9yIHByb3h5IGFwcGxpY2F0aW9ucyB0byBwYXNzCisg ICAgICAgIHRoZWlyIHBhcmVudCAvIGhvc3QgYXBwbGljYXRpb24gaW5mb3JtYXRpb24gdG8gd2Vi aW5zcGVjdG9yZC4KKworICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y RGVidWdnYWJsZS5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3RvckRlYnVn Z2FibGU6OmluZm8pOgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y RGVidWdnYWJsZS5oOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JEZWJ1Z2dh YmxlSW5mbzo6UmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZUluZm8pOgorICAgICAgICAoSW5zcGVj dG9yOjpSZW1vdGVJbnNwZWN0b3JEZWJ1Z2dhYmxlSW5mbzo6aGFzUGFyZW50UHJvY2Vzcyk6IERl bGV0ZWQuCisgICAgICAgIHBpZCBwZXIgZGVidWdnYWJsZSBpcyBubyBsb25nZXIgbmVlZGVkLgor CiAyMDE0LTA0LTI5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAg RG9uJ3QgaG9sZCBvbiB0byBwYXJhbWV0ZXJCaW5kaW5nTm9kZXMgZm9yZXZlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuaAppbmRleCBhNTc5NTdmLi4zOTc1YmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaApAQCAtMzEsMTMg KzMxLDE0IEBACiAjaW1wb3J0ICJSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmgiCiAjaW1w b3J0IDx3dGYvRm9yd2FyZC5oPgogI2ltcG9ydCA8d3RmL0hhc2hNYXAuaD4KLSNpbXBvcnQgPHd0 Zi9Gb3J3YXJkLmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIE9CSkNfQ0xBU1MgTlNE aWN0aW9uYXJ5OwogT0JKQ19DTEFTUyBOU1N0cmluZzsKIAogbmFtZXNwYWNlIEluc3BlY3RvciB7 CiAKK2NsYXNzIFJlbW90ZUluc3BlY3RvckNsaWVudDsKIGNsYXNzIFJlbW90ZUluc3BlY3RvckRl YnVnZ2FibGU7CiBjbGFzcyBSZW1vdGVJbnNwZWN0b3JEZWJ1Z2dhYmxlQ29ubmVjdGlvbjsKIHN0 cnVjdCBSZW1vdGVJbnNwZWN0b3JEZWJ1Z2dhYmxlSW5mbzsKQEAgLTYwLDYgKzYxLDEyIEBAIHB1 YmxpYzoKICAgICB2b2lkIHN0YXJ0KCk7CiAgICAgdm9pZCBzdG9wKCk7CiAKKyAgICBib29sIGhh c1BhcmVudFByb2Nlc3NJbmZvcm1hdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50UHJvY2Vz c0lkZW50aWZpZXIgIT0gMDsgfQorICAgIHBpZF90IHBhcmVudFByb2Nlc3NJZGVudGlmaWVyKCkg Y29uc3QgeyByZXR1cm4gbV9wYXJlbnRQcm9jZXNzSWRlbnRpZmllcjsgfQorICAgIFJldGFpblB0 cjxDRkRhdGFSZWY+IHBhcmVudFByb2Nlc3NBdWRpdERhdGEoKSBjb25zdCB7IHJldHVybiBtX3Bh cmVudFByb2Nlc3NBdWRpdERhdGE7IH0KKyAgICB2b2lkIHNldFBhcmVudFByb2Nlc3NJbmZvcm1h dGlvbihwaWRfdCBwaWQsIFJldGFpblB0cjxDRkRhdGFSZWY+IGF1ZGl0RGF0YSk7CisgICAgdm9p ZCBzZXRQYXJlbnRQcm9jZXNzSW5mb21hdGlvbklzRGVsYXllZCgpOworCiBwcml2YXRlOgogICAg IFJlbW90ZUluc3BlY3RvcigpOwogCkBAIC04NSw2ICs5Miw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCByZWNlaXZlZERpZENsb3NlTWVzc2FnZShOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKTsKICAgICB2 b2lkIHJlY2VpdmVkR2V0TGlzdGluZ01lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2VySW5mbyk7CiAg ICAgdm9pZCByZWNlaXZlZEluZGljYXRlTWVzc2FnZShOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKTsK KyAgICB2b2lkIHJlY2VpdmVkUHJveHlBcHBsaWNhdGlvblNldHVwTWVzc2FnZShOU0RpY3Rpb25h cnkgKnVzZXJJbmZvKTsKICAgICB2b2lkIHJlY2VpdmVkQ29ubmVjdGlvbkRpZWRNZXNzYWdlKE5T RGljdGlvbmFyeSAqdXNlckluZm8pOwogCiAgICAgc3RhdGljIGJvb2wgc3RhcnRFbmFibGVkOwpA QCAtOTgsMTIgKzEwNiwxNyBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8dW5zaWduZWQsIHN0ZDo6 cGFpcjxSZW1vdGVJbnNwZWN0b3JEZWJ1Z2dhYmxlKiwgUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJs ZUluZm8+PiBtX2RlYnVnZ2FibGVNYXA7CiAgICAgSGFzaE1hcDx1bnNpZ25lZCwgUmVmUHRyPFJl bW90ZUluc3BlY3RvckRlYnVnZ2FibGVDb25uZWN0aW9uPj4gbV9jb25uZWN0aW9uTWFwOwogICAg IFJlZlB0cjxSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uPiBtX3hwY0Nvbm5lY3Rpb247CisK ICAgICBkaXNwYXRjaF9xdWV1ZV90IG1feHBjUXVldWU7CiAgICAgdW5zaWduZWQgbV9uZXh0QXZh aWxhYmxlSWRlbnRpZmllcjsKICAgICBpbnQgbV9ub3RpZnlUb2tlbjsKICAgICBib29sIG1fZW5h YmxlZDsKICAgICBib29sIG1faGFzQWN0aXZlRGVidWdTZXNzaW9uOwogICAgIGJvb2wgbV9wdXNo U2NoZWR1bGVkOworCisgICAgcGlkX3QgbV9wYXJlbnRQcm9jZXNzSWRlbnRpZmllcjsKKyAgICBS ZXRhaW5QdHI8Q0ZEYXRhUmVmPiBtX3BhcmVudFByb2Nlc3NBdWRpdERhdGE7CisgICAgYm9vbCBt X3Nob3VsZFNlbmRQYXJlbnRQcm9jZXNzSW5mb3JtYXRpb247CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBJbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cmVtb3RlL1JlbW90ZUluc3BlY3Rvci5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5tbQppbmRleCBjMmE2YTJmLi4zZGUxYzQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNw ZWN0b3IubW0KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yLm1tCkBAIC04Nyw2ICs4Nyw4IEBAIFJlbW90ZUluc3BlY3Rvcjo6UmVtb3Rl SW5zcGVjdG9yKCkKICAgICAsIG1fZW5hYmxlZChmYWxzZSkKICAgICAsIG1faGFzQWN0aXZlRGVi dWdTZXNzaW9uKGZhbHNlKQogICAgICwgbV9wdXNoU2NoZWR1bGVkKGZhbHNlKQorICAgICwgbV9w YXJlbnRQcm9jZXNzSWRlbnRpZmllcigwKQorICAgICwgbV9zaG91bGRTZW5kUGFyZW50UHJvY2Vz c0luZm9ybWF0aW9uKGZhbHNlKQogewogfQogCkBAIC0yNDgsNiArMjUwLDIyIEBAIHZvaWQgUmVt b3RlSW5zcGVjdG9yOjpzZXR1cFhQQ0Nvbm5lY3Rpb25JZk5lZWRlZCgpCiAgICAgcHVzaExpc3Rp bmdTb29uKCk7CiB9CiAKKyNwcmFnbWEgbWFyayAtIFByb3h5IEFwcGxpY2F0aW9uIEluZm9ybWF0 aW9uCisKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjpzZXRQYXJlbnRQcm9jZXNzSW5mb3JtYXRpb24o cGlkX3QgcGlkLCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBhdWRpdERhdGEpCit7CisgICAgc3RkOjps b2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7CisKKyAgICBpZiAobV9wYXJlbnRQ cm9jZXNzSWRlbnRpZmllciB8fCBtX3BhcmVudFByb2Nlc3NBdWRpdERhdGEpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fcGFyZW50UHJvY2Vzc0lkZW50aWZpZXIgPSBwaWQ7CisgICAgbV9wYXJl bnRQcm9jZXNzQXVkaXREYXRhID0gYXVkaXREYXRhOworCisgICAgaWYgKG1fc2hvdWxkU2VuZFBh cmVudFByb2Nlc3NJbmZvcm1hdGlvbikKKyAgICAgICAgcmVjZWl2ZWRQcm94eUFwcGxpY2F0aW9u U2V0dXBNZXNzYWdlKG5pbCk7Cit9CisKICNwcmFnbWEgbWFyayAtIFJlbW90ZUluc3BlY3RvclhQ Q0Nvbm5lY3Rpb246OkNsaWVudAogCiB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlv blJlY2VpdmVkTWVzc2FnZShSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uKiwgTlNTdHJpbmcg Km1lc3NhZ2VOYW1lLCBOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKQpAQCAtMjY5LDYgKzI4Nyw4IEBA IHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0aW9uUmVjZWl2ZWRNZXNzYWdlKFJlbW90 ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qCiAgICAgICAgIHJlY2VpdmVkR2V0TGlzdGluZ01lc3Nh Z2UodXNlckluZm8pOwogICAgIGVsc2UgaWYgKFttZXNzYWdlTmFtZSBpc0VxdWFsVG9TdHJpbmc6 V0lSSW5kaWNhdGVNZXNzYWdlXSkKICAgICAgICAgcmVjZWl2ZWRJbmRpY2F0ZU1lc3NhZ2UodXNl ckluZm8pOworICAgIGVsc2UgaWYgKFttZXNzYWdlTmFtZSBpc0VxdWFsVG9TdHJpbmc6V0lSUHJv eHlBcHBsaWNhdGlvblNldHVwTWVzc2FnZV0pCisgICAgICAgIHJlY2VpdmVkUHJveHlBcHBsaWNh dGlvblNldHVwTWVzc2FnZSh1c2VySW5mbyk7CiAgICAgZWxzZSBpZiAoW21lc3NhZ2VOYW1lIGlz RXF1YWxUb1N0cmluZzpXSVJDb25uZWN0aW9uRGllZE1lc3NhZ2VdKQogICAgICAgICByZWNlaXZl ZENvbm5lY3Rpb25EaWVkTWVzc2FnZSh1c2VySW5mbyk7CiAgICAgZWxzZQpAQCAtMzM0LDExICsz NTQsNiBAQCBOU0RpY3Rpb25hcnkgKlJlbW90ZUluc3BlY3Rvcjo6bGlzdGluZ0ZvckRlYnVnZ2Fi bGUoY29uc3QgUmVtb3RlSW5zcGVjdG9yRGVidWdnYQogICAgIGlmIChkZWJ1Z2dhYmxlSW5mby5o YXNMb2NhbERlYnVnZ2VyKQogICAgICAgICBbZGVidWdnYWJsZURldGFpbHMgc2V0T2JqZWN0OkBZ RVMgZm9yS2V5OldJUkhhc0xvY2FsRGVidWdnZXJLZXldOwogCi0gICAgaWYgKGRlYnVnZ2FibGVJ bmZvLmhhc1BhcmVudFByb2Nlc3MoKSkgewotICAgICAgICBOU1N0cmluZyAqcGFyZW50QXBwbGlj YXRpb25JZGVudGlmaWVyID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJQSUQ6JWx1Iiwg KHVuc2lnbmVkIGxvbmcpZGVidWdnYWJsZUluZm8ucGFyZW50UHJvY2Vzc0lkZW50aWZpZXJdOwot ICAgICAgICBbZGVidWdnYWJsZURldGFpbHMgc2V0T2JqZWN0OnBhcmVudEFwcGxpY2F0aW9uSWRl bnRpZmllciBmb3JLZXk6V0lSSG9zdEFwcGxpY2F0aW9uSWRlbnRpZmllcktleV07Ci0gICAgfQot CiAgICAgcmV0dXJuIGRlYnVnZ2FibGVEZXRhaWxzOwogfQogCkBAIC01MDYsNiArNTIxLDMyIEBA IHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpyZWNlaXZlZEluZGljYXRlTWVzc2FnZShOU0RpY3Rpb25h cnkgKnVzZXJJbmZvKQogICAgIH0pOwogfQogCit2b2lkIFJlbW90ZUluc3BlY3Rvcjo6cmVjZWl2 ZWRQcm94eUFwcGxpY2F0aW9uU2V0dXBNZXNzYWdlKE5TRGljdGlvbmFyeSAqKQoreworICAgIEFT U0VSVChtX3hwY0Nvbm5lY3Rpb24pOworICAgIGlmICghbV94cGNDb25uZWN0aW9uKQorICAgICAg ICByZXR1cm47CisKKyAgICBpZiAoIW1fcGFyZW50UHJvY2Vzc0lkZW50aWZpZXIgfHwgIW1fcGFy ZW50UHJvY2Vzc0F1ZGl0RGF0YSkgeworICAgICAgICAvLyBXZSBhcmUgYSBwcm94eSBhcHBsaWNh dGlvbiB3aXRob3V0IHBhcmVudCBwcm9jZXNzIGluZm9ybWF0aW9uLgorICAgICAgICAvLyBXYWl0 IGEgYml0IGZvciB0aGUgaW5mb3JtYXRpb24sIGJ1dCBnaXZlIHVwIGFmdGVyIGEgc2Vjb25kLgor ICAgICAgICBtX3Nob3VsZFNlbmRQYXJlbnRQcm9jZXNzSW5mb3JtYXRpb24gPSB0cnVlOworICAg ICAgICBkaXNwYXRjaF9hZnRlcihkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJTUVfTk9XLCAxICog TlNFQ19QRVJfU0VDKSwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9Q UklPUklUWV9ERUZBVUxULCAwKSwgXnsKKyAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6 Om11dGV4PiBsb2NrKG1fbXV0ZXgpOworICAgICAgICAgICAgaWYgKG1fc2hvdWxkU2VuZFBhcmVu dFByb2Nlc3NJbmZvcm1hdGlvbikKKyAgICAgICAgICAgICAgICBzdG9wSW50ZXJuYWwoU3RvcFNv dXJjZTo6WFBDTWVzc2FnZSk7CisgICAgICAgIH0pOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgbV9zaG91bGRTZW5kUGFyZW50UHJvY2Vzc0luZm9ybWF0aW9uID0gZmFsc2U7CisKKyAg ICBtX3hwY0Nvbm5lY3Rpb24tPnNlbmRNZXNzYWdlKFdJUlByb3h5QXBwbGljYXRpb25TZXR1cFJl c3BvbnNlTWVzc2FnZSwgQHsKKyAgICAgICAgV0lSUHJveHlBcHBsaWNhdGlvblBhcmVudFBJREtl eTogQChtX3BhcmVudFByb2Nlc3NJZGVudGlmaWVyKSwKKyAgICAgICAgV0lSUHJveHlBcHBsaWNh dGlvblBhcmVudEF1ZGl0RGF0YUtleTogKE5TRGF0YSAqKW1fcGFyZW50UHJvY2Vzc0F1ZGl0RGF0 YS5nZXQoKSwKKyAgICB9KTsKK30KKwogdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkQ29u bmVjdGlvbkRpZWRNZXNzYWdlKE5TRGljdGlvbmFyeSAqdXNlckluZm8pCiB7CiAgICAgTlNTdHJp bmcgKmNvbm5lY3Rpb25JZGVudGlmaWVyID0gW3VzZXJJbmZvIG9iamVjdEZvcktleTpXSVJDb25u ZWN0aW9uSWRlbnRpZmllcktleV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFudHMuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oCmlu ZGV4IDRmNGJjMzIuLjY0N2IyMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5o CkBAIC04MSw1ICs4MSw5IEBACiAvLyBUaGVzZSBkZWZpbml0aW9ucyBhcmUgc2hhcmVkIGJldHdl ZW4gd2ViaW5zcGVjdG9yZCBhbmQgV2ViS2l0LgogCiAjZGVmaW5lIFdJUlBlcm1pc3Npb25EZW5p ZWQgICAgICAgICAgICAgICAgICAgICBAIldJUlBlcm1pc3Npb25EZW5pZWQiCisjZGVmaW5lIFdJ UlByb3h5QXBwbGljYXRpb25QYXJlbnRQSURLZXkgICAgICAgICBAIldJUlByb3h5QXBwbGljYXRp b25QYXJlbnRQSUQiCisjZGVmaW5lIFdJUlByb3h5QXBwbGljYXRpb25QYXJlbnRBdWRpdERhdGFL ZXkgICBAIldJUlByb3h5QXBwbGljYXRpb25QYXJlbnRBdWRpdERhdGEiCisjZGVmaW5lIFdJUlBy b3h5QXBwbGljYXRpb25TZXR1cE1lc3NhZ2UgICAgICAgICBAIldJUlByb3h5QXBwbGljYXRpb25T ZXR1cE1lc3NhZ2UiCisjZGVmaW5lIFdJUlByb3h5QXBwbGljYXRpb25TZXR1cFJlc3BvbnNlTWVz c2FnZSBAIldJUlByb3h5QXBwbGljYXRpb25TZXR1cFJlc3BvbnNlTWVzc2FnZSIKIAogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1v dGVJbnNwZWN0b3JEZWJ1Z2dhYmxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckRlYnVnZ2FibGUuY3BwCmluZGV4IDE1MzBiODQuLmZk ZjFkOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3RvckRlYnVnZ2FibGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckRlYnVnZ2FibGUuY3BwCkBAIC03Myw3 ICs3Myw2IEBAIFJlbW90ZUluc3BlY3RvckRlYnVnZ2FibGVJbmZvIFJlbW90ZUluc3BlY3RvckRl YnVnZ2FibGU6OmluZm8oKSBjb25zdAogICAgIGluZm8udXJsID0gdXJsKCk7CiAgICAgaW5mby5o YXNMb2NhbERlYnVnZ2VyID0gaGFzTG9jYWxEZWJ1Z2dlcigpOwogICAgIGluZm8ucmVtb3RlRGVi dWdnaW5nQWxsb3dlZCA9IHJlbW90ZURlYnVnZ2luZ0FsbG93ZWQoKTsKLSAgICBpbmZvLnBhcmVu dFByb2Nlc3NJZGVudGlmaWVyID0gcGFyZW50UHJvY2Vzc0lkZW50aWZpZXIoKTsKICAgICByZXR1 cm4gaW5mbzsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZS5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZS5oCmluZGV4IGVj NGRlNTEuLjkwMjc0YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckRlYnVnZ2FibGUuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JEZWJ1Z2dhYmxlLmgKQEAg LTU2LDcgKzU2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIG5hbWUoKSBjb25zdCB7 IHJldHVybiBTdHJpbmcoKTsgfSAvLyBKYXZhU2NyaXB0IGFuZCBXZWIKICAgICB2aXJ0dWFsIFN0 cmluZyB1cmwoKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfSAvLyBXZWIKICAgICB2aXJ0dWFs IGJvb2wgaGFzTG9jYWxEZWJ1Z2dlcigpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIHBpZF90IHBh cmVudFByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gMDsgfQogCiAgICAgdmlydHVh bCB2b2lkIGNvbm5lY3QoSW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsKikgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBkaXNjb25uZWN0KCkgPSAwOwpAQCAtNzQsMTkgKzczLDE1IEBAIHN0cnVjdCBSZW1v dGVJbnNwZWN0b3JEZWJ1Z2dhYmxlSW5mbyB7CiAgICAgICAgICwgdHlwZShSZW1vdGVJbnNwZWN0 b3JEZWJ1Z2dhYmxlOjpKYXZhU2NyaXB0KQogICAgICAgICAsIGhhc0xvY2FsRGVidWdnZXIoZmFs c2UpCiAgICAgICAgICwgcmVtb3RlRGVidWdnaW5nQWxsb3dlZChmYWxzZSkKLSAgICAgICAgLCBw YXJlbnRQcm9jZXNzSWRlbnRpZmllcigwKQogICAgIHsKICAgICB9CiAKLSAgICBib29sIGhhc1Bh cmVudFByb2Nlc3MoKSBjb25zdCB7IHJldHVybiAhIXBhcmVudFByb2Nlc3NJZGVudGlmaWVyOyB9 Ci0KICAgICB1bnNpZ25lZCBpZGVudGlmaWVyOwogICAgIFJlbW90ZUluc3BlY3RvckRlYnVnZ2Fi bGU6OkRlYnVnZ2FibGVUeXBlIHR5cGU7CiAgICAgU3RyaW5nIG5hbWU7CiAgICAgU3RyaW5nIHVy bDsKICAgICBib29sIGhhc0xvY2FsRGVidWdnZXI7CiAgICAgYm9vbCByZW1vdGVEZWJ1Z2dpbmdB bGxvd2VkOwotICAgIHBpZF90IHBhcmVudFByb2Nlc3NJZGVudGlmaWVyOwogfTsKIAogfSAvLyBu YW1lc3BhY2UgSW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZiYjU3Yi4uZTExNmVkMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA0LTMwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgUmVtb3RlIElu c3BlY3RvciB0byBlbnRpdGxlbWVudCBjaGVjayBVSVByb2Nlc3MgdGhyb3VnaCBXZWJQcm9jZXNz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI0MDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVu dDo6cGFyZW50UHJvY2Vzc0lkZW50aWZpZXIpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvUGFn ZURlYnVnZ2FibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZURlYnVnZ2FibGU6OnBhcmVu dFByb2Nlc3NJZGVudGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL1BhZ2VEZWJ1Z2dh YmxlLmg6CisgICAgICAgIHBpZCBwZXIgZGVidWdnYWJsZSBpcyBubyBsb25nZXIgbmVlZGVkLgor CiAyMDE0LTA0LTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIzNjMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDbGllbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDbGllbnQuaAppbmRleCBhZDUyMzVmLi5mYWFj MmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNsaWVudC5oCkBAIC00 OSwxMCArNDksNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJyaW5nRnJvbnRlbmRUb0Zy b250KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZXNpemVNYWluRnJhbWUoRnJhbWUqKSB7 IH0KIAotI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQotICAgIHZpcnR1YWwgcGlkX3QgcGFy ZW50UHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0jZW5kaWYKLQogICAg IHZpcnR1YWwgdm9pZCBoaWdobGlnaHQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGhpZGVIaWdo bGlnaHQoKSA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZURlYnVn Z2FibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlRGVidWdnYWJsZS5jcHAKaW5kZXgg OTg2MzIzZC4uM2NmY2E2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlRGVi dWdnYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlRGVidWdnYWJsZS5jcHAK QEAgLTI5LDcgKzI5LDYgQEAKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKIAogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCi0jaW5jbHVkZSAiSW5zcGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZvcndhcmRpbmcuaCIK ICNpbmNsdWRlICJNYWluRnJhbWUuaCIKQEAgLTcxLDE0ICs3MCw2IEBAIGJvb2wgUGFnZURlYnVn Z2FibGU6Omhhc0xvY2FsRGVidWdnZXIoKSBjb25zdAogICAgIHJldHVybiBtX3BhZ2UuaW5zcGVj dG9yQ29udHJvbGxlcigpLmhhc0xvY2FsRnJvbnRlbmQoKTsKIH0KIAotcGlkX3QgUGFnZURlYnVn Z2FibGU6OnBhcmVudFByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3QKLXsKLSAgICBpZiAoSW5zcGVj dG9yQ2xpZW50KiBpbnNwZWN0b3JDbGllbnQgPSBtX3BhZ2UuaW5zcGVjdG9yQ29udHJvbGxlcigp Lmluc3BlY3RvckNsaWVudCgpKQotICAgICAgICByZXR1cm4gaW5zcGVjdG9yQ2xpZW50LT5wYXJl bnRQcm9jZXNzSWRlbnRpZmllcigpOwotCi0gICAgcmV0dXJuIDA7Ci19Ci0KIHZvaWQgUGFnZURl YnVnZ2FibGU6OmNvbm5lY3QoSW5zcGVjdG9yOjpJbnNwZWN0b3JGcm9udGVuZENoYW5uZWwqIGNo YW5uZWwpCiB7CiAjaWYgUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlRGVidWdnYWJsZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlRGVidWdnYWJs ZS5oCmluZGV4IGJjMWZmNjQuLjMwZTY3MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZURlYnVnZ2FibGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VEZWJ1Z2dh YmxlLmgKQEAgLTQ2LDcgKzQ2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIG5hbWUo KSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFN0cmluZyB1cmwoKSBjb25zdCBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIGJvb2wgaGFzTG9jYWxEZWJ1Z2dlcigpIGNvbnN0IG92ZXJyaWRlOwot ICAgIHZpcnR1YWwgcGlkX3QgcGFyZW50UHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdCBvdmVycmlk ZTsKIAogICAgIHZpcnR1YWwgdm9pZCBjb25uZWN0KEluc3BlY3Rvcjo6SW5zcGVjdG9yRnJvbnRl bmRDaGFubmVsKikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpc2Nvbm5lY3QoKSBvdmVy cmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA4NjljNzJmLi44ZjgxNDBkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTQtMDQtMzAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBbGxvdyBSZW1vdGUgSW5z cGVjdG9yIHRvIGVudGl0bGVtZW50IGNoZWNrIFVJUHJvY2VzcyB0aHJvdWdoIFdlYlByb2Nlc3MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjQwOQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbXBsaWZ5 IHRoZSBsZWdhY3kgaU9TIFVJV2ViVmlld0NvbnRyb2xsZXIgY2FzZSBieSBwYXNzaW5nIG9uCisg ICAgICAgIHRoZSBob3N0IHByb2Nlc3MgcGlkIGFuZCBhdWRpdF90b2tlbi4KKworICAgICAgICAq IFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfc2V0SG9zdEFwcGxpY2F0 aW9uUHJvY2Vzc0lkZW50aWZpZXI6YXVkaXRUb2tlbjpdKToKKyAgICAgICAgKC1bV2ViVmlldyBz ZXRIb3N0QXBwbGljYXRpb25CdW5kbGVJZDpuYW1lOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtX ZWJWaWV3IGhvc3RBcHBsaWNhdGlvbkJ1bmRsZUlkXSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dl YlZpZXcgaG9zdEFwcGxpY2F0aW9uTmFtZV0pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlZpZXcv V2ViVmlld0RhdGEuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXdEYXRhLm1tOgorICAgICAg ICAoLVtXZWJWaWV3UHJpdmF0ZSBkZWFsbG9jXSk6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3 UHJpdmF0ZS5oOgorCiAyMDE0LTA0LTI5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW2lPU10gLVtXZWJIVE1MVmlldyBzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1Rl eHQ6XSByZXR1cm5zIGJsYW5rIGltYWdlIG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tCmluZGV4IDk2ODdjNGIuLjNlZjc0ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0KQEAgLTE5MjMsMjkgKzE5MjMsMTAgQEAgLSAodm9pZClzZXRTaG93aW5nSW5zcGVj dG9ySW5kaWNhdGlvbjooQk9PTClzaG93aW5nCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi0tICh2 b2lkKXNldEhvc3RBcHBsaWNhdGlvbkJ1bmRsZUlkOihOU1N0cmluZyAqKWJ1bmRsZUlkIG5hbWU6 KE5TU3RyaW5nICopbmFtZQorLSAodm9pZClfc2V0SG9zdEFwcGxpY2F0aW9uUHJvY2Vzc0lkZW50 aWZpZXI6KHBpZF90KXBpZCBhdWRpdFRva2VuOihhdWRpdF90b2tlbl90KWF1ZGl0VG9rZW4KIHsK LSAgICBpZiAoIVtfcHJpdmF0ZS0+aG9zdEFwcGxpY2F0aW9uQnVuZGxlSWQgaXNFcXVhbFRvU3Ry aW5nOmJ1bmRsZUlkXSkgewotICAgICAgICBbX3ByaXZhdGUtPmhvc3RBcHBsaWNhdGlvbkJ1bmRs ZUlkIHJlbGVhc2VdOwotICAgICAgICBfcHJpdmF0ZS0+aG9zdEFwcGxpY2F0aW9uQnVuZGxlSWQg PSBbYnVuZGxlSWQgY29weV07Ci0gICAgfQotCi0gICAgaWYgKCFbX3ByaXZhdGUtPmhvc3RBcHBs aWNhdGlvbk5hbWUgaXNFcXVhbFRvU3RyaW5nOm5hbWVdKSB7Ci0gICAgICAgIFtfcHJpdmF0ZS0+ aG9zdEFwcGxpY2F0aW9uTmFtZSByZWxlYXNlXTsKLSAgICAgICAgX3ByaXZhdGUtPmhvc3RBcHBs aWNhdGlvbk5hbWUgPSBbbmFtZSBjb3B5XTsKLSAgICB9Ci0KLSAgICAvLyBGSVhNRTogVGhpcyBo YXMgbm90IHlldCBiZWVuIHBvcnRlZCB0byBJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3RvclNlcnZl ci4KLX0KLQotLSAoTlNTdHJpbmcgKilob3N0QXBwbGljYXRpb25CdW5kbGVJZAotewotICAgIHJl dHVybiBfcHJpdmF0ZS0+aG9zdEFwcGxpY2F0aW9uQnVuZGxlSWQ7Ci19Ci0KLS0gKE5TU3RyaW5n ICopaG9zdEFwcGxpY2F0aW9uTmFtZQotewotICAgIHJldHVybiBfcHJpdmF0ZS0+aG9zdEFwcGxp Y2F0aW9uTmFtZTsKKyAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBhdWRpdERhdGEgPSBhZG9wdENG KENGRGF0YUNyZWF0ZShudWxscHRyLCAoY29uc3QgVUludDgqKSZhdWRpdFRva2VuLCBzaXplb2Yo YXVkaXRUb2tlbikpKTsKKyAgICBSZW1vdGVJbnNwZWN0b3I6OnNoYXJlZCgpLnNldFBhcmVudFBy b2Nlc3NJbmZvcm1hdGlvbihwaWQsIGF1ZGl0RGF0YSk7CiB9CiAjZW5kaWYgLy8gUExBVEZPUk0o SU9TKQogI2VuZGlmIC8vIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0YS5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3RGF0YS5oCmluZGV4IGVlZjcxNzguLmQ1OGRkODMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXdEYXRhLmgKQEAgLTI1Niw4ICsyNTYsNiBAQCBwcml2YXRl OgogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogI2lmIFBMQVRGT1JNKElPUykKICAgICBX ZWJJbmRpY2F0ZUxheWVyICppbmRpY2F0ZUxheWVyOwotICAgIE5TU3RyaW5nICpob3N0QXBwbGlj YXRpb25CdW5kbGVJZDsKLSAgICBOU1N0cmluZyAqaG9zdEFwcGxpY2F0aW9uTmFtZTsKICNlbmRp ZgogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll d0RhdGEubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdEYXRhLm1tCmluZGV4 IDMzODI4NDUuLmUwNjM2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlld0RhdGEubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0 YS5tbQpAQCAtMTUzLDggKzE1Myw2IEBAIC0gKHZvaWQpZGVhbGxvYwogI2lmIEVOQUJMRShSRU1P VEVfSU5TUEVDVE9SKQogI2lmIFBMQVRGT1JNKElPUykKICAgICBbaW5kaWNhdGVMYXllciByZWxl YXNlXTsKLSAgICBbaG9zdEFwcGxpY2F0aW9uQnVuZGxlSWQgcmVsZWFzZV07Ci0gICAgW2hvc3RB cHBsaWNhdGlvbk5hbWUgcmVsZWFzZV07CiAjZW5kaWYKICNlbmRpZgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKaW5kZXggOTllZWU4OS4uYTc1NTEzMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaApAQCAtMzI2LDI3ICsz MjYsNyBAQCB0eXBlZGVmIGVudW0gewogLSAodm9pZClzZXRTaG93aW5nSW5zcGVjdG9ySW5kaWNh dGlvbjooQk9PTCllbmFibGVkOwogCiAjaWYgVEFSR0VUX09TX0lQSE9ORQotLyohCi0gICAgQG1l dGhvZCBzZXRIb3N0QXBwbGljYXRpb25CdW5kbGVJZDpuYW1lCi0gICAgQHBhcmFtIGJ1bmRsZUlk IFRoZSBhcHBsaWNhdGlvbiB0aGF0IHRoaXMgV2ViVmlldyB3YXMgY3JlYXRlZCBmb3IuCi0gICAg QHBhcmFtIG5hbWUgVGhhdCBhcHBsaWNhdGlvbidzIGxvY2FsaXplZCBkaXNwbGF5IG5hbWUuCi0g ICAgQGFic3RyYWN0IFdoZW4gYSBXZWJWaWV3IGlzIGNyZWF0ZWQgb3V0IG9mIHByb2Nlc3MgZm9y IGFuIGFwcGxpY2F0aW9uLAotICAgIHlvdSBjYW4gY2xhcmlmeSB0byBhIFJlbW90ZSBEZWJ1Z2dl ciB3aGljaCBhcHBsaWNhdGlvbiB0aGlzIFdlYlZpZXcKLSAgICBpcyBpbnRlbmRlZCB0byBiZWxv bmcgdG87IHRoZSBhcHBsaWNhdGlvbiB3aGljaCBob3N0cyB0aGUgV2ViVmlldy4KLSovCi0tICh2 b2lkKXNldEhvc3RBcHBsaWNhdGlvbkJ1bmRsZUlkOihOU1N0cmluZyAqKWJ1bmRsZUlkIG5hbWU6 KE5TU3RyaW5nICopbmFtZTsKLQotLyohCi0gICAgQG1ldGhvZCBob3N0QXBwbGljYXRpb25CdW5k bGVJZAotICAgIEByZXN1bHQgUmV0dXJucyB0aGUgaG9zdCBhcHBsaWNhdGlvbiBidW5kbGUgaWQu Ci0qLwotLSAoTlNTdHJpbmcgKilob3N0QXBwbGljYXRpb25CdW5kbGVJZDsKLQotLyohCi0gICAg QG1ldGhvZCBob3N0QXBwbGljYXRpb25OYW1lCi0gICAgQHJlc3VsdCBSZXR1cm5zIHRoZSBob3N0 IGFwcGxpY2F0aW9uIG5hbWUuCi0qLwotLSAoTlNTdHJpbmcgKilob3N0QXBwbGljYXRpb25OYW1l OworLSAodm9pZClfc2V0SG9zdEFwcGxpY2F0aW9uUHJvY2Vzc0lkZW50aWZpZXI6KHBpZF90KXBp ZCBhdWRpdFRva2VuOihhdWRpdF90b2tlbl90KWF1ZGl0VG9rZW47CiAjZW5kaWYKIAogI2VuZGlm IC8vIEVOQUJMRV9SRU1PVEVfSU5TUEVDVE9SCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTBkMTQ5NS4uMDA4ZTIy OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA0LTMwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cg UmVtb3RlIEluc3BlY3RvciB0byBlbnRpdGxlbWVudCBjaGVjayBVSVByb2Nlc3MgdGhyb3VnaCBX ZWJQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzI0MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JDbGllbnQ6OnBhcmVudFByb2Nlc3NJZGVudGlm aWVyKTogRGVsZXRlZC4KKyAgICAgICAgcGlkIHBlciBkZWJ1Z2dhYmxlIGlzIG5vIGxvbmdlciBu ZWVkZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIEltbWVk aWF0ZWx5IHBhc3MgdGhlIHBhcmVudCBwcm9jZXNzIHBpZCBhbmQgYXVkaXRfdG9rZW4gb24KKyAg ICAgICAgdG8gdGhlIFJlbW90ZUluc3BlY3RvciBzaW5nbGV0b24gd2hlbiB0aGUgcHJvY2VzcyBp cyBjcmVhdGVkCisgICAgICAgIHNvIHRoYXQgaXQgY2FuIGJlIHNlbnQgdG8gd2ViaW5zcGVjdG9y ZC4KKworMjAxNC0wNC0zMCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgor CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVuc3VyZSBVSVByb2Nlc3MgY2hlY2tzIGluIHRvIHdl Ymluc3BlY3RvcmQgYWZ0ZXIgc3Bhd25pbmcgYSBXZWJQcm9jZXNzCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIzODkKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0 b3JDbGllbnQuY3BwCmluZGV4IDBkY2IxYzQuLmVhZTA0MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3Rv ckNsaWVudC5jcHAKQEAgLTMzLDEwICszMyw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9JbnNwZWN0 b3JDb250cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAKLSNpZiBFTkFCTEUo UkVNT1RFX0lOU1BFQ1RPUikKLSNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCi0jZW5kaWYKLQogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNzEsMTMgKzY3 LDYgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmRpZFJlc2l6ZU1haW5GcmFtZShGcmFtZSop CiAgICAgICAgIG1fcGFnZS0+aW5zcGVjdG9yKCktPnVwZGF0ZURvY2tpbmdBdmFpbGFiaWxpdHko KTsKIH0KIAotI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQotcGlkX3QgV2ViSW5zcGVjdG9y Q2xpZW50OjpwYXJlbnRQcm9jZXNzSWRlbnRpZmllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFdl YlByb2Nlc3M6OnNoYXJlZCgpLnByZXNlbnRlckFwcGxpY2F0aW9uUGlkKCk7Ci19Ci0jZW5kaWYK LQogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodCgpCiB7CiAgICAgaWYgKCFtX2hp Z2hsaWdodE92ZXJsYXkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCmluZGV4IGQ3YTI1MTIu LmY2OTdmNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaApAQCAtNTgsMTAgKzU4LDYgQEAg cHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgYnJpbmdGcm9udGVuZFRvRnJvbnQoKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVzaXplTWFpbkZyYW1lKFdlYkNvcmU6OkZyYW1lKikg b3ZlcnJpZGU7CiAKLSNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKLSAgICB2aXJ0dWFsIHBp ZF90IHBhcmVudFByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Qgb3ZlcnJpZGU7Ci0jZW5kaWYKLQog ICAgIHZpcnR1YWwgdm9pZCBoaWdobGlnaHQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQg aGlkZUhpZ2hsaWdodCgpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLmNwcAppbmRleCBlMjZlZjE1Li4zZThmZGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTEyMyw2ICsxMjMsMTAgQEAKICNpbmNsdWRlICJXZWJS ZXNvdXJjZUxvYWRTY2hlZHVsZXIuaCIKICNlbmRpZgogCisjaWYgRU5BQkxFKFJFTU9URV9JTlNQ RUNUT1IpCisjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvUmVtb3RlSW5zcGVjdG9yLmg+CisjZW5k aWYKKwogI2lmIFVTRShTT1VQKSAmJiAhRU5BQkxFKENVU1RPTV9QUk9UT0NPTFMpCiAjaW5jbHVk ZSAiV2ViU291cFJlcXVlc3RNYW5hZ2VyLmgiCiAjZW5kaWYKQEAgLTM1OSw2ICszNjMsMTQgQEAg dm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWUKICAgICAgICAgbV9wbHVnSW5BdXRvU3RhcnRPcmlnaW5z LmFkZChwYXJhbWV0ZXJzLnBsdWdJbkF1dG9TdGFydE9yaWdpbnNbaV0pOwogCiAgICAgc2V0TWVt b3J5Q2FjaGVEaXNhYmxlZChwYXJhbWV0ZXJzLm1lbW9yeUNhY2hlRGlzYWJsZWQpOworCisjaWYg RU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCisgICAgYXVkaXRfdG9rZW5fdCBhdWRpdFRva2VuOwor ICAgIGlmIChwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5nZXRBdWRpdFRva2VuKGF1ZGl0VG9r ZW4pKSB7CisgICAgICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGF1ZGl0RGF0YSA9IGFkb3B0Q0Yo Q0ZEYXRhQ3JlYXRlKG51bGxwdHIsIChjb25zdCBVSW50OCopJmF1ZGl0VG9rZW4sIHNpemVvZihh dWRpdFRva2VuKSkpOworICAgICAgICBJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6c2hhcmVk KCkuc2V0UGFyZW50UHJvY2Vzc0luZm9ybWF0aW9uKHByZXNlbnRlckFwcGxpY2F0aW9uUGlkKCks IGF1ZGl0RGF0YSk7CisgICAgfQorI2VuZGlmCiB9CiAKICNpZiBFTkFCTEUoTkVUV09SS19QUk9D RVNTKQo=