131406 2014-04-08 16:13:52 -0700 Web Inspector: Prevent deadlocks receiving WIRPermissionDenied message 2014-04-08 17:12:42 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck mrowe timothy webkit-bug-importer oldest_to_newest 998863 0 joepeck 2014-04-08 16:13:52 -0700 When processing the WIRPermissionDenied message we have to avoid grabs of the mutex in RemoteInspector and RemoteInspectorXPCConnection. Address both of these by creating a stop/close path that takes locks, and a path that does not take locks. 998864 1 webkit-bug-importer 2014-04-08 16:14:07 -0700 <rdar://problem/16559247> 998871 2 228907 joepeck 2014-04-08 16:22:41 -0700 Created attachment 228907 [PATCH] Proposed Fix Tested with a daemon that always responded with WIRPermissionDenied, and this fixes the issue. 998880 3 228907 timothy 2014-04-08 16:37:09 -0700 Comment on attachment 228907 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=228907&action=review > Source/JavaScriptCore/inspector/remote/RemoteInspector.h:68 > + enum StopSource { StopSourceAPI, StopSourceXPCMessage }; IIRC, we don't typically repeat the enum name. So: enum StopSource { API, XPCMessage }; But I could be wrong. 998884 4 joepeck 2014-04-08 16:39:06 -0700 (In reply to comment #3) > (From update of attachment 228907 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228907&action=review > > > Source/JavaScriptCore/inspector/remote/RemoteInspector.h:68 > > + enum StopSource { StopSourceAPI, StopSourceXPCMessage }; > > IIRC, we don't typically repeat the enum name. So: > > enum StopSource { API, XPCMessage }; > > But I could be wrong. Seems fine. I'll make that change. 998886 5 joepeck 2014-04-08 16:41:49 -0700 Even better: enum class StopSource { API, XPCMessage }; And call sites use: StopSource::API, StopSource::XPCMessage 998888 6 228914 joepeck 2014-04-08 16:43:25 -0700 Created attachment 228914 [PATCH] For Landing 998890 7 commit-queue 2014-04-08 16:46:03 -0700 Attachment 228914 did not pass style-queue: ERROR: Source/JavaScriptCore/inspector/remote/RemoteInspector.h:68: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 998897 8 228914 commit-queue 2014-04-08 17:12:37 -0700 Comment on attachment 228914 [PATCH] For Landing Clearing flags on attachment: 228914 Committed r166982: <http://trac.webkit.org/changeset/166982> 998898 9 commit-queue 2014-04-08 17:12:42 -0700 All reviewed patches have been landed. Closing bug. 228907 2014-04-08 16:22:41 -0700 2014-04-08 16:43:25 -0700 [PATCH] Proposed Fix mutex-handling.patch text/plain 4789 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDRmYjZmZTUuLmQzZjZmYTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA0LTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldmVu dCBkZWFkbG9ja3MgcmVjZWl2aW5nIFdJUlBlcm1pc3Npb25EZW5pZWQgbWVzc2FnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDA2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3Rvci5oOgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3Rl SW5zcGVjdG9yLm1tOgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnN0b3Ap OgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnN0b3BJbnRlcm5hbCk6Cisg ICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlvblJlY2VpdmVk TWVzc2FnZSk6CisgICAgICAgIFByb3ZpZGUgYSB3YXkgdG8gc3RvcCBleHRlcm5hbGx5IGFuZCBh IHBhdGggdG8gc3RvcCB3aGVuIGluCisgICAgICAgIHRoZSBtaWRkbGUgb2YgaGFuZGxpbmcgYSBt ZXNzYWdlIGFscmVhZHkgd2l0aCB0aGUgbG9ja2VkIG11dGV4LgorCisgICAgICAgICogaW5zcGVj dG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmg6CisgICAgICAgICogaW5z cGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tOgorICAgICAgICAo SW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZSk6CisgICAgICAg IChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmNsb3NlRnJvbU1lc3Nh Z2UpOgorICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGNsb3NlIGV4dGVybmFsbHkgYW5kIGEgcGF0 aCB0byBjbG9zZSB3aGVuIGluCisgICAgICAgIHRoZSBtaWRkbGUgb2YgaGFuZGxpbmcgYSBtZXNz YWdlIGFscmVhZHkgd2l0aCBhIG11dGV4LgorCisyMDE0LTA0LTA4ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkcmVzcyBz dGFsZSBGSVhNRXMgY29uY2VybmluZyBjb25zb2xlIGluIEpTQ29udGV4dCBpbnNwZWN0aW9uCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzOTgKIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3Rl SW5zcGVjdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1v dGVJbnNwZWN0b3IuaAppbmRleCA1YTg0ZDhlLi4yZTY4MmM2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaApA QCAtNjUsNiArNjUsOSBAQCBwcml2YXRlOgogCiAgICAgdW5zaWduZWQgbmV4dEF2YWlsYWJsZUlk ZW50aWZpZXIoKTsKIAorICAgIGVudW0gU3RvcFNvdXJjZSB7IFN0b3BTb3VyY2VBUEksIFN0b3BT b3VyY2VYUENNZXNzYWdlIH07CisgICAgdm9pZCBzdG9wSW50ZXJuYWwoU3RvcFNvdXJjZSk7CisK ICAgICB2b2lkIHNldHVwWFBDQ29ubmVjdGlvbklmTmVlZGVkKCk7CiAKICAgICBOU0RpY3Rpb25h cnkgKmxpc3RpbmdGb3JEZWJ1Z2dhYmxlKGNvbnN0IFJlbW90ZUluc3BlY3RvckRlYnVnZ2FibGVJ bmZvJikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW0KaW5kZXggMjU4YWU3ZS4uZWVhZTA4OSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5z cGVjdG9yLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1Jl bW90ZUluc3BlY3Rvci5tbQpAQCAtMTk2LDYgKzE5NiwxMSBAQCB2b2lkIFJlbW90ZUluc3BlY3Rv cjo6c3RvcCgpCiB7CiAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRl eCk7CiAKKyAgICBzdG9wSW50ZXJuYWwoU3RvcFNvdXJjZUFQSSk7Cit9CisKK3ZvaWQgUmVtb3Rl SW5zcGVjdG9yOjpzdG9wSW50ZXJuYWwoU3RvcFNvdXJjZSBzb3VyY2UpCit7CiAgICAgaWYgKCFt X2VuYWJsZWQpCiAgICAgICAgIHJldHVybjsKIApAQCAtMjEwLDcgKzIxNSwxNSBAQCB2b2lkIFJl bW90ZUluc3BlY3Rvcjo6c3RvcCgpCiAgICAgdXBkYXRlSGFzQWN0aXZlRGVidWdTZXNzaW9uKCk7 CiAKICAgICBpZiAobV94cGNDb25uZWN0aW9uKSB7Ci0gICAgICAgIG1feHBjQ29ubmVjdGlvbi0+ Y2xvc2UoKTsKKyAgICAgICAgc3dpdGNoIChzb3VyY2UpIHsKKyAgICAgICAgY2FzZSBTdG9wU291 cmNlQVBJOgorICAgICAgICAgICAgbV94cGNDb25uZWN0aW9uLT5jbG9zZSgpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgU3RvcFNvdXJjZVhQQ01lc3NhZ2U6CisgICAgICAgICAg ICBtX3hwY0Nvbm5lY3Rpb24tPmNsb3NlRnJvbU1lc3NhZ2UoKTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisKICAgICAgICAgbV94cGNDb25uZWN0aW9uID0gbnVsbHB0cjsKICAgICB9 CiAKQEAgLTIzOSwxMyArMjUyLDEzIEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpzZXR1cFhQQ0Nv bm5lY3Rpb25JZk5lZWRlZCgpCiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0aW9u UmVjZWl2ZWRNZXNzYWdlKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qLCBOU1N0cmluZyAq bWVzc2FnZU5hbWUsIE5TRGljdGlvbmFyeSAqdXNlckluZm8pCiB7CisgICAgc3RkOjpsb2NrX2d1 YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7CisKICAgICBpZiAoW21lc3NhZ2VOYW1lIGlz RXF1YWxUb1N0cmluZzpXSVJQZXJtaXNzaW9uRGVuaWVkXSkgewotICAgICAgICBzdG9wKCk7Cisg ICAgICAgIHN0b3BJbnRlcm5hbChTdG9wU291cmNlWFBDTWVzc2FnZSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayhtX211dGV4 KTsKLQogICAgIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUlNvY2tldERhdGFN ZXNzYWdlXSkKICAgICAgICAgcmVjZWl2ZWREYXRhTWVzc2FnZSh1c2VySW5mbyk7CiAgICAgZWxz ZSBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJTb2NrZXRTZXR1cE1lc3NhZ2Vd KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oCmluZGV4IGJjYzBjZDku LmYxZmU4MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmgKQEAg LTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflJlbW90ZUluc3BlY3RvclhQQ0Nv bm5lY3Rpb24oKTsKIAogICAgIHZvaWQgY2xvc2UoKTsKKyAgICB2b2lkIGNsb3NlRnJvbU1lc3Nh Z2UoKTsKICAgICB2b2lkIHNlbmRNZXNzYWdlKE5TU3RyaW5nICptZXNzYWdlTmFtZSwgTlNEaWN0 aW9uYXJ5ICp1c2VySW5mbyk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1t IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbi5tbQppbmRleCAzZDI5ZjgzLi5hZjFjY2M1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25u ZWN0aW9uLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1Jl bW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KQEAgLTc2LDcgKzc2LDExIEBAIFJlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb246On5SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uKCkKIHZv aWQgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6Y2xvc2UoKQogewogICAgIHN0ZDo6bG9j a19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fbXV0ZXgpOworICAgIGNsb3NlRnJvbU1lc3NhZ2Uo KTsKK30KIAordm9pZCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZUZyb21NZXNz YWdlKCkKK3sKICAgICBtX2Nsb3NlZCA9IHRydWU7CiAgICAgbV9jbGllbnQgPSBudWxscHRyOwog Cg== 228914 2014-04-08 16:43:25 -0700 2014-04-08 17:12:37 -0700 [PATCH] For Landing mutex-handling-2.patch text/plain 4784 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDRmYjZmZTUuLjgxMjlhYjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA0LTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldmVu dCBkZWFkbG9ja3MgcmVjZWl2aW5nIFdJUlBlcm1pc3Npb25EZW5pZWQgbWVzc2FnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDA2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgICogaW5zcGVjdG9yL3Jl bW90ZS9SZW1vdGVJbnNwZWN0b3IuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL1JlbW90 ZUluc3BlY3Rvci5tbToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yOjpzdG9w KToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yOjpzdG9wSW50ZXJuYWwpOgor ICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25SZWNlaXZl ZE1lc3NhZ2UpOgorICAgICAgICBQcm92aWRlIGEgd2F5IHRvIHN0b3AgZXh0ZXJuYWxseSBhbmQg YSBwYXRoIHRvIHN0b3Agd2hlbiBpbgorICAgICAgICB0aGUgbWlkZGxlIG9mIGhhbmRsaW5nIGEg bWVzc2FnZSBhbHJlYWR5IHdpdGggdGhlIGxvY2tlZCBtdXRleC4KKworICAgICAgICAqIGluc3Bl Y3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oOgorICAgICAgICAqIGlu c3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbToKKyAgICAgICAg KEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6Y2xvc2UpOgorICAgICAg ICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZUZyb21NZXNz YWdlKToKKyAgICAgICAgUHJvdmlkZSBhIHdheSB0byBjbG9zZSBleHRlcm5hbGx5IGFuZCBhIHBh dGggdG8gY2xvc2Ugd2hlbiBpbgorICAgICAgICB0aGUgbWlkZGxlIG9mIGhhbmRsaW5nIGEgbWVz c2FnZSBhbHJlYWR5IHdpdGggYSBtdXRleC4KKworMjAxNC0wNC0wOCAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZHJlc3Mg c3RhbGUgRklYTUVzIGNvbmNlcm5pbmcgY29uc29sZSBpbiBKU0NvbnRleHQgaW5zcGVjdGlvbgog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMzk4CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90 ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yLmgKaW5kZXggNWE4NGQ4ZS4uYTU3OTU3ZiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgK QEAgLTY1LDYgKzY1LDkgQEAgcHJpdmF0ZToKIAogICAgIHVuc2lnbmVkIG5leHRBdmFpbGFibGVJ ZGVudGlmaWVyKCk7CiAKKyAgICBlbnVtIGNsYXNzIFN0b3BTb3VyY2UgeyBBUEksIFhQQ01lc3Nh Z2UgfTsKKyAgICB2b2lkIHN0b3BJbnRlcm5hbChTdG9wU291cmNlKTsKKwogICAgIHZvaWQgc2V0 dXBYUENDb25uZWN0aW9uSWZOZWVkZWQoKTsKIAogICAgIE5TRGljdGlvbmFyeSAqbGlzdGluZ0Zv ckRlYnVnZ2FibGUoY29uc3QgUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZUluZm8mKSBjb25zdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90 ZUluc3BlY3Rvci5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1Jl bW90ZUluc3BlY3Rvci5tbQppbmRleCAyNThhZTdlLi5jMmE2YTJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW0KKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y Lm1tCkBAIC0xOTYsNiArMTk2LDExIEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpzdG9wKCkKIHsK ICAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayhtX211dGV4KTsKIAorICAgIHN0 b3BJbnRlcm5hbChTdG9wU291cmNlOjpBUEkpOworfQorCit2b2lkIFJlbW90ZUluc3BlY3Rvcjo6 c3RvcEludGVybmFsKFN0b3BTb3VyY2Ugc291cmNlKQorewogICAgIGlmICghbV9lbmFibGVkKQog ICAgICAgICByZXR1cm47CiAKQEAgLTIxMCw3ICsyMTUsMTUgQEAgdm9pZCBSZW1vdGVJbnNwZWN0 b3I6OnN0b3AoKQogICAgIHVwZGF0ZUhhc0FjdGl2ZURlYnVnU2Vzc2lvbigpOwogCiAgICAgaWYg KG1feHBjQ29ubmVjdGlvbikgewotICAgICAgICBtX3hwY0Nvbm5lY3Rpb24tPmNsb3NlKCk7Cisg ICAgICAgIHN3aXRjaCAoc291cmNlKSB7CisgICAgICAgIGNhc2UgU3RvcFNvdXJjZTo6QVBJOgor ICAgICAgICAgICAgbV94cGNDb25uZWN0aW9uLT5jbG9zZSgpOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgU3RvcFNvdXJjZTo6WFBDTWVzc2FnZToKKyAgICAgICAgICAgIG1feHBj Q29ubmVjdGlvbi0+Y2xvc2VGcm9tTWVzc2FnZSgpOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIH0KKwogICAgICAgICBtX3hwY0Nvbm5lY3Rpb24gPSBudWxscHRyOwogICAgIH0KIApAQCAt MjM5LDEzICsyNTIsMTMgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnNldHVwWFBDQ29ubmVjdGlv bklmTmVlZGVkKCkKIAogdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25SZWNlaXZl ZE1lc3NhZ2UoUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbiosIE5TU3RyaW5nICptZXNzYWdl TmFtZSwgTlNEaWN0aW9uYXJ5ICp1c2VySW5mbykKIHsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3Rk OjptdXRleD4gbG9jayhtX211dGV4KTsKKwogICAgIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRv U3RyaW5nOldJUlBlcm1pc3Npb25EZW5pZWRdKSB7Ci0gICAgICAgIHN0b3AoKTsKKyAgICAgICAg c3RvcEludGVybmFsKFN0b3BTb3VyY2U6OlhQQ01lc3NhZ2UpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7Ci0K ICAgICBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJTb2NrZXREYXRhTWVzc2Fn ZV0pCiAgICAgICAgIHJlY2VpdmVkRGF0YU1lc3NhZ2UodXNlckluZm8pOwogICAgIGVsc2UgaWYg KFttZXNzYWdlTmFtZSBpc0VxdWFsVG9TdHJpbmc6V0lSU29ja2V0U2V0dXBNZXNzYWdlXSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb24uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24uaAppbmRleCBiY2MwY2Q5Li5mMWZl ODE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oCkBAIC01Miw2 ICs1Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0 aW9uKCk7CiAKICAgICB2b2lkIGNsb3NlKCk7CisgICAgdm9pZCBjbG9zZUZyb21NZXNzYWdlKCk7 CiAgICAgdm9pZCBzZW5kTWVzc2FnZShOU1N0cmluZyAqbWVzc2FnZU5hbWUsIE5TRGljdGlvbmFy eSAqdXNlckluZm8pOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbSBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nv bm5lY3Rpb24ubW0KaW5kZXggM2QyOWY4My4uYWYxY2NjNSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlv bi5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJ bnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCkBAIC03Niw3ICs3NiwxMSBAQCBSZW1vdGVJbnNwZWN0 b3JYUENDb25uZWN0aW9uOjp+UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbigpCiB2b2lkIFJl bW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmNsb3NlKCkKIHsKICAgICBzdGQ6OmxvY2tfZ3Vh cmQ8c3RkOjptdXRleD4gbG9jayhtX211dGV4KTsKKyAgICBjbG9zZUZyb21NZXNzYWdlKCk7Cit9 CiAKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6Y2xvc2VGcm9tTWVzc2FnZSgp Cit7CiAgICAgbV9jbG9zZWQgPSB0cnVlOwogICAgIG1fY2xpZW50ID0gbnVsbHB0cjsKIAo=