195222 2019-03-01 12:46:56 -0800 Drop legacy userAgentForURL injected bundle SPI 2019-03-04 12:36:40 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue darin ggaren webkit-bug-importer oldest_to_newest 1511545 0 cdumez 2019-03-01 12:46:56 -0800 Deprecate userAgentForURL injected bundle SPI. There are no longer any clients, using WebsitePolicies.customUserAgent is the way to go nowadays. 1511547 1 cdumez 2019-03-01 12:47:37 -0800 <rdar://problem/46734147> 1511550 2 363361 cdumez 2019-03-01 12:48:29 -0800 Created attachment 363361 Patch 1511779 3 363361 darin 2019-03-01 22:25:52 -0800 Comment on attachment 363361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363361&action=review > Source/WebKit/ChangeLog:3 > + Deprecate userAgentForURL injected bundle SPI This does more than just deprecate it. It also removes support for it, in other words makes it not be called any more. That’s not what "deprecate" means. So this is more like "remove support for" rather than "deprecate". > Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:67 > +- (NSString *)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame userAgentForURL:(NSURL *)url WK_API_DEPRECATED("Use _WKWebsitePolicies.customUserAgent instead", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); Why are we leaving this in the header at all? This is not API, so what benefit is there for this being here and marked deprecated rather than removed? These deprecation macros have helpful behavior for methods that might be called. I’m not sure they do any good for optional methods in a protocol that are are meant to be implemented. I suggest just deleting this line unless I am missing something. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:3169 > +String WebPage::userAgent(WebFrame*, const URL& webcoreURL) const Should we change this to not even take a WebFrame pointer and update callers to no longer pass it? 1512261 4 363533 cdumez 2019-03-04 11:52:29 -0800 Created attachment 363533 Patch 1512272 5 363536 cdumez 2019-03-04 11:58:38 -0800 Created attachment 363536 Patch 1512313 6 363536 commit-queue 2019-03-04 12:36:38 -0800 Comment on attachment 363536 Patch Clearing flags on attachment: 363536 Committed r242375: <https://trac.webkit.org/changeset/242375> 1512314 7 commit-queue 2019-03-04 12:36:40 -0800 All reviewed patches have been landed. Closing bug. 363361 2019-03-01 12:48:29 -0800 2019-03-04 11:52:28 -0800 Patch bug-195222-20190301124825.patch text/plain 11616 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmZmFhNDkxNGE3N2IzYjhj OWE2NmE4ZWZjMDMyZWViZmRlMzg3NmMuLjczYTQzYmU0NzhkYmM1YjRjZTA3OGVmMTcwMzE0MWM2 OWYzOTEzYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMDEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZXByZWNhdGUgdXNlckFnZW50Rm9y VVJMIGluamVjdGVkIGJ1bmRsZSBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NTIyMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDY3MzQxNDc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVwcmVj YXRlIHVzZXJBZ2VudEZvclVSTCBpbmplY3RlZCBidW5kbGUgU1BJLiBUaGVyZSBhcmUgbm8gbG9u Z2VyIGFueSBjbGllbnRzLCB1c2luZworICAgICAgICBXZWJzaXRlUG9saWNpZXMuY3VzdG9tVXNl ckFnZW50IGlzIHRoZSB3YXkgdG8gZ28gbm93YWRheXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaDoK KyAgICAgICAgKEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBhZ2VMb2FkZXJDbGllbnQ6OndpbGxEZXN0 cm95RnJhbWUpOgorICAgICAgICAoQVBJOjpJbmplY3RlZEJ1bmRsZTo6UGFnZUxvYWRlckNsaWVu dDo6dXNlckFnZW50Rm9yVVJMIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZUxvYWRlckNsaWVudC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW06CisgICAg ICAgIChzZXRVcFBhZ2VMb2FkZXJDbGllbnQpOgorICAgICAgICAodXNlckFnZW50Rm9yVVJMKTog RGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlUGFnZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxl UGFnZUxvYWRlckNsaWVudDo6dXNlckFnZW50Rm9yVVJMIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNs aWVudC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6dXNlckFnZW50IGNvbnN0KToKKwogMjAxOS0wMi0yOCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEhUVFBTVXBncmFkZUxpc3Qu ZGIgZGF0YWJhc2Ugc2hvdWxkIGJlIG9wZW5lZCBpbiByZWFkb25seSBtb2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVk QnVuZGxlUGFnZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAppbmRleCA0 MTllYjdiNTQ5ZWZhOGU3YmE1NjhiNTMzMWQyOTE2ZjY0Y2MwNWFkLi5lMmJmODk4MTBjNDdhMjBk OTIyMWI4OWI3MWNlOTVhYjM5NGQ1MDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQVBJ SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKQEAgLTk1LDcgKzk1LDYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBmZWF0dXJlc1VzZWRJblBhZ2UoV2ViS2l0OjpXZWJQYWdlJiwg Y29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYpIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHdpbGxE ZXN0cm95RnJhbWUoV2ViS2l0OjpXZWJQYWdlJiwgV2ViS2l0OjpXZWJGcmFtZSYpIHsgfQotICAg IHZpcnR1YWwgV1RGOjpTdHJpbmcgdXNlckFnZW50Rm9yVVJMKFdlYktpdDo6V2ViRnJhbWUmLCBj b25zdCBXVEY6OlVSTCYpIGNvbnN0IHsgcmV0dXJuIFdURjo6U3RyaW5nKCk7IH0KIAogICAgIHZp cnR1YWwgT3B0aW9uU2V0PFdlYkNvcmU6OkxheW91dE1pbGVzdG9uZT4gbGF5b3V0TWlsZXN0b25l cygpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTG9h ZERlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZS5oCmluZGV4IGJmYmM0ZmI5ZmJm MGMxZTI4MWRlMGIwNTZkZDM4OWNiZGNmZGE5ODEuLmEyZTZkNGYzYzcwNDYyZGQxNWM1ZTI0N2Vk N2NhMzdhYWVkOTc3MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTG9hZERlbGVnYXRlLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dl YlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUuaApAQCAtNjQsNiArNjQsNiBAQAogLSAodm9pZCl3 ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVn SW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1lOihXS1dlYlByb2Nl c3NQbHVnSW5GcmFtZSAqKWZyYW1lIGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZToodWludDY0X3Qp cmVzb3VyY2U7CiAtICh2b2lkKXdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xs ZXI6KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqKWNvbnRyb2xs ZXIgZnJhbWU6KFdLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lICopZnJhbWUgZGlkRmFpbExvYWRGb3JS ZXNvdXJjZToodWludDY0X3QpcmVzb3VyY2UgZXJyb3I6KE5TRXJyb3IgKillcnJvcjsKIAotLSAo TlNTdHJpbmcgKil3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1l OihXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIHVzZXJBZ2VudEZvclVSTDooTlNVUkwg Kil1cmw7CistIChOU1N0cmluZyAqKXdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRy b2xsZXI6KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqKWNvbnRy b2xsZXIgZnJhbWU6KFdLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lICopZnJhbWUgdXNlckFnZW50Rm9y VVJMOihOU1VSTCAqKXVybCBXS19BUElfREVQUkVDQVRFRCgiVXNlIF9XS1dlYnNpdGVQb2xpY2ll cy5jdXN0b21Vc2VyQWdlbnQgaW5zdGVhZCIsIG1hY29zeChXS19NQUNfVEJBLCBXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEsIFdLX0lPU19UQkEpKTsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZUxv YWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCmluZGV4IDczNzQ2OWNjNWMyMjQyYzMwNDc1 NjAxZTBjZjY1OWI0M2UxNzAyN2IuLmEwZjY4MDVmNmU5NGRlNjBlNmEzMGViMjI0ODFiMGI1YmQ1 ZTVhMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvYy9XS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgK QEAgLTYyLDcgKzYyLDYgQEAgdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkTGF5b3V0Q2Fs bGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0xheW91dE1pbGUKIHR5cGVkZWYgdm9pZCAo KldLQnVuZGxlUGFnZUZlYXR1cmVzVXNlZEluUGFnZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYg cGFnZSwgV0tBcnJheVJlZiBmZWF0dXJlU3RyaW5ncywgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7 CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxsTG9hZFVSTFJlcXVlc3RDYWxsYmFjayko V0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS1R5cGVSZWYg dXNlckRhdGEsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tCdW5k bGVQYWdlV2lsbExvYWREYXRhUmVxdWVzdENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwg V0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLRGF0YVJlZiBkYXRhLCBXS1N0cmluZ1JlZiBNSU1F VHlwZSwgV0tTdHJpbmdSZWYgZW5jb2RpbmdOYW1lLCBXS1VSTFJlZiB1bnJlYWNoYWJsZVVSTCwg V0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKLXR5cGVkZWYgV0tT dHJpbmdSZWYgKCpXS0J1bmRsZVBhZ2VVc2VyQWdlbnRGb3JVUkxDYWxsYmFjaykoV0tCdW5kbGVG cmFtZVJlZiBmcmFtZSwgV0tVUkxSZWYgdXJsLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5 cGVkZWYgV0tMYXlvdXRNaWxlc3RvbmVzICgqV0tCdW5kbGVQYWdlTGF5b3V0TWlsZXN0b25lc0Nh bGxiYWNrKShjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogdHlwZWRlZiBzdHJ1Y3QgV0tCdW5k bGVQYWdlTG9hZGVyQ2xpZW50QmFzZSB7CkBAIC00NjMsNyArNDYyLDcgQEAgdHlwZWRlZiBzdHJ1 Y3QgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjggewogICAgIHZvaWQgKiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxE ZXN0cm95RnJhbWVfdW5hdmFpbGFibGU7CiAgICAgCiAgICAgLy8gVmVyc2lvbiA4Ci0gICAgV0tC dW5kbGVQYWdlVXNlckFnZW50Rm9yVVJMQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdXNlckFnZW50Rm9yVVJMOworICAgIHZvaWQqICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJBZ2Vu dEZvclVSTF91bmF2YWlsYWJsZTsKIH0gV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50Vjg7CiAKIHR5 cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudFY5IHsKQEAgLTUyMSw3ICs1MjAs NyBAQCB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnRWOSB7CiAgICAgdm9p ZCAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgd2lsbERlc3Ryb3lGcmFtZV91bmF2YWlsYWJsZTsKIAogICAgIC8vIFZlcnNp b24gOAotICAgIFdLQnVuZGxlUGFnZVVzZXJBZ2VudEZvclVSTENhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTDsKKyAgICB2b2lkKiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1c2VyQWdlbnRGb3JVUkxfdW5hdmFpbGFibGU7CiAKICAgICAvLyBWZXJzaW9uIDkKICAg ICBXS0J1bmRsZVBhZ2VXaWxsSW5qZWN0VXNlclNjcmlwdEZvckZyYW1lQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICB3aWxsSW5qZWN0VXNlclNjcmlwdEZvckZyYW1lOwpAQCAtNTgyLDcg KzU4MSw3IEBAIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudFYxMCB7CiAg ICAgdm9pZCAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgd2lsbERlc3Ryb3lGcmFtZV91bmF2YWlsYWJsZTsKIAogICAgIC8v IFZlcnNpb24gOAotICAgIFdLQnVuZGxlUGFnZVVzZXJBZ2VudEZvclVSTENhbGxiYWNrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTDsKKyAgICB2b2lk KiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1c2VyQWdlbnRGb3JVUkxfdW5hdmFpbGFibGU7CiAKICAgICAvLyBWZXJzaW9u IDkKICAgICBXS0J1bmRsZVBhZ2VXaWxsSW5qZWN0VXNlclNjcmlwdEZvckZyYW1lQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICAgICB3aWxsSW5qZWN0VXNlclNjcmlwdEZvckZyYW1lOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMv V0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCmluZGV4IDZiZWE1MWFlY2NkMTg2MzZkMTI4YmE4 MjU1OWUzNmQ1MjU5NGRjN2YuLmUxZjQ0ODE1ZWZiNmQ1YmQ0OGIxN2ZjNjJjNzY2YTM4YjQ1ZTQ1 MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlBy b2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0KQEAgLTIyMiwyMyArMjIyLDYg QEAgc3RhdGljIHZvaWQgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYKICAgICAgICAgW2xvYWREZWxlZ2F0ZSB3ZWJQcm9j ZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOnBsdWdpbkNvbnRleHRDb250cm9sbGVy IGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lOndyYXBwZXIoKldlYktpdDo6dG9JbXBsKGZy YW1lKSldOwogfQogCi1zdGF0aWMgV0tTdHJpbmdSZWYgdXNlckFnZW50Rm9yVVJMKFdLQnVuZGxl RnJhbWVSZWYgZnJhbWUsIFdLVVJMUmVmIHVybCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsK LSAgICBhdXRvIHBsdWdpbkNvbnRleHRDb250cm9sbGVyID0gKF9fYnJpZGdlIFdLV2ViUHJvY2Vz c1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87Ci0gICAgYXV0byBs b2FkRGVsZWdhdGUgPSBwbHVnaW5Db250ZXh0Q29udHJvbGxlci0+X2xvYWREZWxlZ2F0ZS5nZXQo KTsKLSAgICAKLSAgICBpZiAoW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6ZnJhbWU6dXNlckFn ZW50Rm9yVVJMOildKSB7Ci0gICAgICAgIFdLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lICpuZXdGcmFt ZSA9IHdyYXBwZXIoKldlYktpdDo6dG9JbXBsKGZyYW1lKSk7Ci0gICAgICAgIE5TU3RyaW5nICpz dHJpbmcgPSBbbG9hZERlbGVnYXRlIHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRy b2xsZXI6cGx1Z2luQ29udGV4dENvbnRyb2xsZXIgZnJhbWU6bmV3RnJhbWUgdXNlckFnZW50Rm9y VVJMOndyYXBwZXIoKldlYktpdDo6dG9JbXBsKHVybCkpXTsKLSAgICAgICAgaWYgKCFzdHJpbmcp Ci0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgICAgICByZXR1cm4gV0tTdHJpbmdD cmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXN0cmluZyk7Ci0gICAgfQot ICAgIAotICAgIHJldHVybiBudWxscHRyOwotfQotCiBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VMb2Fk ZXJDbGllbnQoV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICpjb250 ZXh0Q29udHJvbGxlciwgV2ViS2l0OjpXZWJQYWdlJiBwYWdlKQogewogICAgIFdLQnVuZGxlUGFn ZUxvYWRlckNsaWVudFYxMCBjbGllbnQ7CkBAIC0yNTgsNyArMjQxLDYgQEAgc3RhdGljIHZvaWQg c2V0VXBQYWdlTG9hZGVyQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlciAqY28KICAgICBjbGllbnQuZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5ID0gZGlk UmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5OwogICAgIGNsaWVudC5kaWRIYW5kbGVPbmxvYWRFdmVu dHNGb3JGcmFtZSA9IGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lOwogICAgIGNsaWVudC5k aWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSA9IGRpZEZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dEZvckZyYW1lOwotICAgIGNsaWVudC51c2VyQWdlbnRGb3JVUkwgPSB1c2Vy QWdlbnRGb3JVUkw7CiAKICAgICBjbGllbnQuZGlkTGF5b3V0Rm9yRnJhbWUgPSBkaWRMYXlvdXRG b3JGcmFtZTsKICAgICBjbGllbnQuZGlkTGF5b3V0ID0gZGlkUmVhY2hMYXlvdXRNaWxlc3RvbmU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5q ZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwCmluZGV4 IDZiMGM2YzZlNTM1ZjRkOGRlNmJiMTIzYjNkODUwMGQ3ODE3OTVkZGMuLjUxMGQyZGE3OThjZGEy NTA5OTNhYjUwZGQzNjk3ZGVhNWRhZTNhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwCkBAIC0zNTMsMTYgKzM1Myw2IEBAIHZvaWQgSW5qZWN0 ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpmZWF0dXJlc1VzZWRJblBhZ2UoV2ViUGFnZSYgcGFn ZSwgY29uc3QgVmVjCiAgICAgcmV0dXJuIG1fY2xpZW50LmZlYXR1cmVzVXNlZEluUGFnZSh0b0FQ SSgmcGFnZSksIHRvQVBJKEFQSTo6QXJyYXk6OmNyZWF0ZVN0cmluZ0FycmF5KGZlYXR1cmVzKS5w dHIoKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9CiAKLVN0cmluZyBJbmplY3RlZEJ1 bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OnVzZXJBZ2VudEZvclVSTChXZWJGcmFtZSYgZnJhbWUsIGNv bnN0IFVSTCYgdXJsKSBjb25zdAotewotICAgIGlmICghbV9jbGllbnQudXNlckFnZW50Rm9yVVJM KQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAgV0tTdHJpbmdSZWYgdXNlckFnZW50ID0g bV9jbGllbnQudXNlckFnZW50Rm9yVVJMKHRvQVBJKCZmcmFtZSksIHRvQVBJKEFQSTo6VVJMOjpj cmVhdGUodXJsKS5wdHIoKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7Ci0gICAgaWYgKCF1 c2VyQWdlbnQpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAgICByZXR1cm4gdG9JbXBsKHVz ZXJBZ2VudCktPnN0cmluZygpOwotfQotCiBPcHRpb25TZXQ8V2ViQ29yZTo6TGF5b3V0TWlsZXN0 b25lPiBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmxheW91dE1pbGVzdG9uZXMoKSBj b25zdAogewogICAgIGlmIChtX2NsaWVudC5sYXlvdXRNaWxlc3RvbmVzKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQ YWdlTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKaW5kZXggMzhlNWI0MGE5OTZkZmZl YWYxOTQ5MmY0MGFkYTRkYzNjZTFlMzhhNC4uNzdjZThkZjQ2NTE4NjViODVmMGJmYzYzNzNlODUx YTE0YjliYzViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGll bnQuaApAQCAtODUsOCArODUsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZlYXR1cmVzVXNlZElu UGFnZShXZWJQYWdlJiwgY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYpIG92ZXJyaWRlOwogCi0g ICAgV1RGOjpTdHJpbmcgdXNlckFnZW50Rm9yVVJMKFdlYkZyYW1lJiwgY29uc3QgVVJMJikgY29u c3Qgb3ZlcnJpZGU7Ci0KICAgICBPcHRpb25TZXQ8V2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lPiBs YXlvdXRNaWxlc3RvbmVzKCkgY29uc3Qgb3ZlcnJpZGU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGI0YzU4NWM2NzUyZTA2M2ZmY2U2 NWQzMWM4ZmI1NThlOTE2NGUzNWYuLjUwMmY5NmE2OGZhZDMxM2M2MTZjMDY4YzRhMGU1ZGYxNTYz MmJlYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC0zMTY2LDE0ICszMTY2LDggQEAgU3RyaW5nIFdlYlBhZ2U6OnVzZXJBZ2VudChjb25zdCBV UkwmIHdlYkNvcmVVUkwpIGNvbnN0CiAgICAgcmV0dXJuIHVzZXJBZ2VudChudWxscHRyLCB3ZWJD b3JlVVJMKTsKIH0KIAotU3RyaW5nIFdlYlBhZ2U6OnVzZXJBZ2VudChXZWJGcmFtZSogZnJhbWUs IGNvbnN0IFVSTCYgd2ViY29yZVVSTCkgY29uc3QKK1N0cmluZyBXZWJQYWdlOjp1c2VyQWdlbnQo V2ViRnJhbWUqLCBjb25zdCBVUkwmIHdlYmNvcmVVUkwpIGNvbnN0CiB7Ci0gICAgaWYgKGZyYW1l KSB7Ci0gICAgICAgIFN0cmluZyB1c2VyQWdlbnQgPSBtX2xvYWRlckNsaWVudC0+dXNlckFnZW50 Rm9yVVJMKCpmcmFtZSwgd2ViY29yZVVSTCk7Ci0gICAgICAgIGlmICghdXNlckFnZW50LmlzRW1w dHkoKSkKLSAgICAgICAgICAgIHJldHVybiB1c2VyQWdlbnQ7Ci0gICAgfQotCiAgICAgU3RyaW5n IHVzZXJBZ2VudCA9IHBsYXRmb3JtVXNlckFnZW50KHdlYmNvcmVVUkwpOwogICAgIGlmICghdXNl ckFnZW50LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHVzZXJBZ2VudDsK 363533 2019-03-04 11:52:29 -0800 2019-03-04 11:58:37 -0800 Patch bug-195222-20190304115229.patch text/plain 12832 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA2MDcwYjI2YWEyMjU3Zjgy OWIyYjc4MTAyZTFlYWI1ODM1MGNlNjAuLmI3MjBhN2M3NjMzOWJlMDg2ZWY4ZDFkNmJjMTM2YTMw MjE1ZjJiNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMDQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEcm9wIGxlZ2FjeSB1c2VyQWdlbnRG b3JVUkwgaW5qZWN0ZWQgYnVuZGxlIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MjIyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjczNDE0 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBEcm9wIGxl Z2FjeSB1c2VyQWdlbnRGb3JVUkwgaW5qZWN0ZWQgYnVuZGxlIFNQSS4gVGhlcmUgYXJlIG5vIGxv bmdlciBhbnkgY2xpZW50cywgYW5kIHVzaW5nCisgICAgICAgIFdlYnNpdGVQb2xpY2llcy5jdXN0 b21Vc2VyQWdlbnQgaXMgdGhlIHdheSB0byBnbyBub3dhZGF5cy4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVu dC5oOgorICAgICAgICAoQVBJOjpJbmplY3RlZEJ1bmRsZTo6UGFnZUxvYWRlckNsaWVudDo6d2ls bERlc3Ryb3lGcmFtZSk6CisgICAgICAgIChBUEk6OkluamVjdGVkQnVuZGxlOjpQYWdlTG9hZGVy Q2xpZW50Ojp1c2VyQWdlbnRGb3JVUkwgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxl Z2F0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5k bGVQYWdlTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbToK KyAgICAgICAgKHNldFVwUGFnZUxvYWRlckNsaWVudCk6CisgICAgICAgICh1c2VyQWdlbnRGb3JV UkwpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0 ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRC dW5kbGVQYWdlTG9hZGVyQ2xpZW50Ojp1c2VyQWdlbnRGb3JVUkwgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1c2VyQWdlbnQgY29uc3QpOgorCiAyMDE5LTAzLTA0 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb Q29vcmRpbmF0ZWRHcmFwaGljc10gVGhlIGNvbXBvc2l0aW5nIGxvb3AgaXMgc3RpbGwgcnVubmlu ZyBldmVuIGFmdGVyIGV4aXRpbmcgQUMgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQVBJ SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKaW5kZXggNDE5ZWI3YjU0OWVmYThlN2Jh NTY4YjUzMzFkMjkxNmY2NGNjMDVhZC4uZTJiZjg5ODEwYzQ3YTIwZDkyMjFiODliNzFjZTk1YWIz OTRkNTA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVkQnVuZGxlUGFn ZUxvYWRlckNsaWVudC5oCkBAIC05NSw3ICs5NSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgZmVhdHVyZXNVc2VkSW5QYWdlKFdlYktpdDo6V2ViUGFnZSYsIGNvbnN0IFZlY3RvcjxXVEY6 OlN0cmluZz4mKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB3aWxsRGVzdHJveUZyYW1lKFdlYktp dDo6V2ViUGFnZSYsIFdlYktpdDo6V2ViRnJhbWUmKSB7IH0KLSAgICB2aXJ0dWFsIFdURjo6U3Ry aW5nIHVzZXJBZ2VudEZvclVSTChXZWJLaXQ6OldlYkZyYW1lJiwgY29uc3QgV1RGOjpVUkwmKSBj b25zdCB7IHJldHVybiBXVEY6OlN0cmluZygpOyB9CiAKICAgICB2aXJ0dWFsIE9wdGlvblNldDxX ZWJDb3JlOjpMYXlvdXRNaWxlc3RvbmU+IGxheW91dE1pbGVzdG9uZXMoKSBjb25zdCB7IHJldHVy biB7IH07IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZS5oIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nl c3NQbHVnSW5Mb2FkRGVsZWdhdGUuaAppbmRleCBiZmJjNGZiOWZiZjBjMWUyODFkZTBiMDU2ZGQz ODljYmRjZmRhOTgxLi4xZjM4ZDIyNzQ5MzE0MDhkZjBiNGQ1NjFiM2NjNGEwYzY5MWMxYjJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0Nv Y29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTG9h ZERlbGVnYXRlLmgKQEAgLTY0LDYgKzY0LDQgQEAKIC0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJy b3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRD b250cm9sbGVyICopY29udHJvbGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUgKilm cmFtZSBkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2U6KHVpbnQ2NF90KXJlc291cmNlOwogLSAodm9p ZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQ bHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1lOihXS1dlYlBy b2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIGRpZEZhaWxMb2FkRm9yUmVzb3VyY2U6KHVpbnQ2NF90 KXJlc291cmNlIGVycm9yOihOU0Vycm9yICopZXJyb3I7CiAKLS0gKE5TU3RyaW5nICopd2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyICopY29udHJvbGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1 Z0luRnJhbWUgKilmcmFtZSB1c2VyQWdlbnRGb3JVUkw6KE5TVVJMICopdXJsOwotCiBAZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv V0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKaW5kZXggNzM3NDY5 Y2M1YzIyNDJjMzA0NzU2MDFlMGNmNjU5YjQzZTE3MDI3Yi4uYTBmNjgwNWY2ZTk0ZGU2MGU2YTMw ZWIyMjQ4MWIwYjViZDVlNWEyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VM b2FkZXJDbGllbnQuaApAQCAtNjIsNyArNjIsNiBAQCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBh Z2VEaWRMYXlvdXRDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLTGF5b3V0TWlsZQog dHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRmVhdHVyZXNVc2VkSW5QYWdlQ2FsbGJhY2spKFdL QnVuZGxlUGFnZVJlZiBwYWdlLCBXS0FycmF5UmVmIGZlYXR1cmVTdHJpbmdzLCBjb25zdCB2b2lk ICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZVdpbGxMb2FkVVJMUmVx dWVzdENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVl c3QsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVm IHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxsTG9hZERhdGFSZXF1ZXN0Q2FsbGJhY2spKFdLQnVuZGxl UGFnZVJlZiBwYWdlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tEYXRhUmVmIGRhdGEsIFdL U3RyaW5nUmVmIE1JTUVUeXBlLCBXS1N0cmluZ1JlZiBlbmNvZGluZ05hbWUsIFdLVVJMUmVmIHVu cmVhY2hhYmxlVVJMLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OwotdHlwZWRlZiBXS1N0cmluZ1JlZiAoKldLQnVuZGxlUGFnZVVzZXJBZ2VudEZvclVSTENhbGxi YWNrKShXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS1VSTFJlZiB1cmwsIGNvbnN0IHZvaWQgKmNs aWVudEluZm8pOwogdHlwZWRlZiBXS0xheW91dE1pbGVzdG9uZXMgKCpXS0J1bmRsZVBhZ2VMYXlv dXRNaWxlc3RvbmVzQ2FsbGJhY2spKGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiB0eXBlZGVm IHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnRCYXNlIHsKQEAgLTQ2Myw3ICs0NjIsNyBA QCB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnRWOCB7CiAgICAgdm9pZCAq ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgd2lsbERlc3Ryb3lGcmFtZV91bmF2YWlsYWJsZTsKICAgICAKICAgICAvLyBWZXJz aW9uIDgKLSAgICBXS0J1bmRsZVBhZ2VVc2VyQWdlbnRGb3JVUkxDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1c2VyQWdlbnRGb3JVUkw7CisgICAgdm9pZCogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdXNlckFnZW50Rm9yVVJMX3VuYXZhaWxhYmxlOwogfSBXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnRWODsKIAogdHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjkgewpA QCAtNTIxLDcgKzUyMCw3IEBAIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVu dFY5IHsKICAgICB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsRGVzdHJveUZyYW1lX3VuYXZhaWxhYmxlOwog CiAgICAgLy8gVmVyc2lvbiA4Ci0gICAgV0tCdW5kbGVQYWdlVXNlckFnZW50Rm9yVVJMQ2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlckFnZW50Rm9yVVJMOwor ICAgIHZvaWQqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTF91bmF2YWlsYWJsZTsKIAogICAgIC8v IFZlcnNpb24gOQogICAgIFdLQnVuZGxlUGFnZVdpbGxJbmplY3RVc2VyU2NyaXB0Rm9yRnJhbWVD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxJbmplY3RVc2VyU2NyaXB0Rm9yRnJh bWU7CkBAIC01ODIsNyArNTgxLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlTG9hZGVy Q2xpZW50VjEwIHsKICAgICB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsRGVzdHJveUZyYW1lX3VuYXZhaWxh YmxlOwogCiAgICAgLy8gVmVyc2lvbiA4Ci0gICAgV0tCdW5kbGVQYWdlVXNlckFnZW50Rm9yVVJM Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlckFnZW50Rm9y VVJMOworICAgIHZvaWQqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTF91bmF2YWlsYWJsZTsKIAog ICAgIC8vIFZlcnNpb24gOQogICAgIFdLQnVuZGxlUGFnZVdpbGxJbmplY3RVc2VyU2NyaXB0Rm9y RnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxJbmplY3RVc2VyU2NyaXB0 Rm9yRnJhbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0KaW5kZXggOWM3MDhjMWIy MTA0MDFiZjliODJiNzBiMjI5YzNhODYyZjlkMDEyZS4uMmFkYjMxNWI5NjVmZjNmYmQyMWM1ZGZj MTIwMzEyOTZmM2U4ODU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250 cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbQpAQCAt MjIwLDIzICsyMjAsNiBAQCBzdGF0aWMgdm9pZCBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFt ZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZgogICAgICAgICBbbG9hZERl bGVnYXRlIHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6cGx1Z2luQ29u dGV4dENvbnRyb2xsZXIgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU6d3JhcHBlcigqV2Vi S2l0Ojp0b0ltcGwoZnJhbWUpKV07CiB9CiAKLXN0YXRpYyBXS1N0cmluZ1JlZiB1c2VyQWdlbnRG b3JVUkwoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tVUkxSZWYgdXJsLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQotewotICAgIGF1dG8gcGx1Z2luQ29udGV4dENvbnRyb2xsZXIgPSAoX19icmlk Z2UgV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5m bzsKLSAgICBhdXRvIGxvYWREZWxlZ2F0ZSA9IHBsdWdpbkNvbnRleHRDb250cm9sbGVyLT5fbG9h ZERlbGVnYXRlLmdldCgpOwotICAgIAotICAgIGlmIChbbG9hZERlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Iod2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxl cjpmcmFtZTp1c2VyQWdlbnRGb3JVUkw6KV0pIHsKLSAgICAgICAgV0tXZWJQcm9jZXNzUGx1Z0lu RnJhbWUgKm5ld0ZyYW1lID0gd3JhcHBlcigqV2ViS2l0Ojp0b0ltcGwoZnJhbWUpKTsKLSAgICAg ICAgTlNTdHJpbmcgKnN0cmluZyA9IFtsb2FkRGVsZWdhdGUgd2ViUHJvY2Vzc1BsdWdJbkJyb3dz ZXJDb250ZXh0Q29udHJvbGxlcjpwbHVnaW5Db250ZXh0Q29udHJvbGxlciBmcmFtZTpuZXdGcmFt ZSB1c2VyQWdlbnRGb3JVUkw6d3JhcHBlcigqV2ViS2l0Ojp0b0ltcGwodXJsKSldOwotICAgICAg ICBpZiAoIXN0cmluZykKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgICAgIHJl dHVybiBXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpc3Ry aW5nKTsKLSAgICB9Ci0gICAgCi0gICAgcmV0dXJuIG51bGxwdHI7Ci19Ci0KIHN0YXRpYyB2b2lk IHNldFVwUGFnZUxvYWRlckNsaWVudChXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENv bnRyb2xsZXIgKmNvbnRleHRDb250cm9sbGVyLCBXZWJLaXQ6OldlYlBhZ2UmIHBhZ2UpCiB7CiAg ICAgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjEwIGNsaWVudDsKQEAgLTI1Niw3ICsyMzksNiBA QCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VMb2FkZXJDbGllbnQoV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyICpjbwogICAgIGNsaWVudC5kaWRSZW1vdmVGcmFtZUZyb21I aWVyYXJjaHkgPSBkaWRSZW1vdmVGcmFtZUZyb21IaWVyYXJjaHk7CiAgICAgY2xpZW50LmRpZEhh bmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lID0gZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU7 CiAgICAgY2xpZW50LmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lID0gZGlk Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWU7Ci0gICAgY2xpZW50LnVzZXJBZ2Vu dEZvclVSTCA9IHVzZXJBZ2VudEZvclVSTDsKIAogICAgIGNsaWVudC5kaWRMYXlvdXRGb3JGcmFt ZSA9IGRpZExheW91dEZvckZyYW1lOwogICAgIGNsaWVudC5kaWRMYXlvdXQgPSBkaWRSZWFjaExh eW91dE1pbGVzdG9uZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNs aWVudC5jcHAKaW5kZXggNmIwYzZjNmU1MzVmNGQ4ZGU2YmIxMjNiM2Q4NTAwZDc4MTc5NWRkYy4u NTEwZDJkYTc5OGNkYTI1MDk5M2FiNTBkZDM2OTdkZWE1ZGFlM2FkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxv YWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAKQEAgLTM1MywxNiArMzUzLDYg QEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmZlYXR1cmVzVXNlZEluUGFn ZShXZWJQYWdlJiBwYWdlLCBjb25zdCBWZWMKICAgICByZXR1cm4gbV9jbGllbnQuZmVhdHVyZXNV c2VkSW5QYWdlKHRvQVBJKCZwYWdlKSwgdG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlU3RyaW5nQXJy YXkoZmVhdHVyZXMpLnB0cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIH0KIAotU3Ry aW5nIEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6dXNlckFnZW50Rm9yVVJMKFdlYkZy YW1lJiBmcmFtZSwgY29uc3QgVVJMJiB1cmwpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX2NsaWVudC51 c2VyQWdlbnRGb3JVUkwpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAgICBXS1N0cmluZ1Jl ZiB1c2VyQWdlbnQgPSBtX2NsaWVudC51c2VyQWdlbnRGb3JVUkwodG9BUEkoJmZyYW1lKSwgdG9B UEkoQVBJOjpVUkw6OmNyZWF0ZSh1cmwpLnB0cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZv KTsKLSAgICBpZiAoIXVzZXJBZ2VudCkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIHJl dHVybiB0b0ltcGwodXNlckFnZW50KS0+c3RyaW5nKCk7Ci19Ci0KIE9wdGlvblNldDxXZWJDb3Jl OjpMYXlvdXRNaWxlc3RvbmU+IEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6bGF5b3V0 TWlsZXN0b25lcygpIGNvbnN0CiB7CiAgICAgaWYgKG1fY2xpZW50LmxheW91dE1pbGVzdG9uZXMp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAppbmRleCAz OGU1YjQwYTk5NmRmZmVhZjE5NDkyZjQwYWRhNGRjM2NlMWUzOGE0Li43N2NlOGRmNDY1MTg2NWI4 NWYwYmZjNjM3M2U4NTFhMTRiOWJjNWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl UGFnZUxvYWRlckNsaWVudC5oCkBAIC04NSw4ICs4NSw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg ZmVhdHVyZXNVc2VkSW5QYWdlKFdlYlBhZ2UmLCBjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+Jikg b3ZlcnJpZGU7CiAKLSAgICBXVEY6OlN0cmluZyB1c2VyQWdlbnRGb3JVUkwoV2ViRnJhbWUmLCBj b25zdCBVUkwmKSBjb25zdCBvdmVycmlkZTsKLQogICAgIE9wdGlvblNldDxXZWJDb3JlOjpMYXlv dXRNaWxlc3RvbmU+IGxheW91dE1pbGVzdG9uZXMoKSBjb25zdCBvdmVycmlkZTsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDNkZTE5YjFlMmJhMTAxMjA2YTk0Njdh NWNjYTAwMzg3MGNhNWQ3OTcuLjZlNmVjMTk0MWY5Y2NlMTM4MDZmOGFhMTNlN2U2MDFkNjA3YjBk ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTM3MCwxMSArMTM3MCwx MSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXRUaXRsZShjb25zdCBTdHJpbmdXaXRo RGlyZWN0aW9uJiB0aXRsZSwgY29uc3QgVVJMJgogCiBTdHJpbmcgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OnVzZXJBZ2VudChjb25zdCBVUkwmIHVybCkKIHsKLSAgICBXZWJQYWdlKiB3ZWJQYWdlID0g bV9mcmFtZS0+cGFnZSgpOworICAgIGF1dG8qIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAg ICAgaWYgKCF3ZWJQYWdlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICByZXR1cm4g d2ViUGFnZS0+dXNlckFnZW50KG1fZnJhbWUsIHVybCk7CisgICAgcmV0dXJuIHdlYlBhZ2UtPnVz ZXJBZ2VudCh1cmwpOwogfQogCiBTdHJpbmcgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om92ZXJyaWRl Q29udGVudFNlY3VyaXR5UG9saWN5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggODk2ODc2MGY5ZTRlNjZmYTFmNGQ1OTE2NmE3MmU3 MDkxMjg0OWUwZS4uYTY5OGQ3NWIxZjk2ODhkOGNiMTBkNDI4MjliMzNiNGExZjczNDEyZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTMxNjQs MjMgKzMxNjQsMTIgQEAgdm9pZCBXZWJQYWdlOjpzaG93KCkKIAogU3RyaW5nIFdlYlBhZ2U6OnVz ZXJBZ2VudChjb25zdCBVUkwmIHdlYkNvcmVVUkwpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHVzZXJB Z2VudChudWxscHRyLCB3ZWJDb3JlVVJMKTsKLX0KLQotU3RyaW5nIFdlYlBhZ2U6OnVzZXJBZ2Vu dChXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgd2ViY29yZVVSTCkgY29uc3QKLXsKLSAgICBp ZiAoZnJhbWUpIHsKLSAgICAgICAgU3RyaW5nIHVzZXJBZ2VudCA9IG1fbG9hZGVyQ2xpZW50LT51 c2VyQWdlbnRGb3JVUkwoKmZyYW1lLCB3ZWJjb3JlVVJMKTsKLSAgICAgICAgaWYgKCF1c2VyQWdl bnQuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIHVzZXJBZ2VudDsKLSAgICB9Ci0KICAg ICBTdHJpbmcgdXNlckFnZW50ID0gcGxhdGZvcm1Vc2VyQWdlbnQod2ViY29yZVVSTCk7CiAgICAg aWYgKCF1c2VyQWdlbnQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdXNlckFnZW50OwogICAg IHJldHVybiBtX3VzZXJBZ2VudDsKIH0KLSAgICAKKwogdm9pZCBXZWJQYWdlOjpzZXRVc2VyQWdl bnQoY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpCiB7CiAgICAgaWYgKG1fdXNlckFnZW50ID09IHVz ZXJBZ2VudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRl eCBkMjFlYWZiYzUyMzUyYzI1NzI3OWY4ZjMyZWE2NTYzOTA4ZWI2YTkyLi4yNmQ3YTk5YzQ3ZTYw MDA5MTE5ZWYxODA1NzVjMmI5MDExYTBmZmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0zNDcsNyArMzQ3LDYgQEAgcHVibGljOgogICAgIHZvaWQg ZGlkRmluaXNoTG9hZChXZWJGcmFtZSopOwogICAgIHZvaWQgc2hvdygpOwogICAgIFN0cmluZyB1 c2VyQWdlbnQoY29uc3QgVVJMJikgY29uc3Q7Ci0gICAgU3RyaW5nIHVzZXJBZ2VudChXZWJGcmFt ZSosIGNvbnN0IFVSTCYpIGNvbnN0OwogICAgIFN0cmluZyBwbGF0Zm9ybVVzZXJBZ2VudChjb25z dCBVUkwmKSBjb25zdDsKICAgICBXZWJDb3JlOjpLZXlib2FyZFVJTW9kZSBrZXlib2FyZFVJTW9k ZSgpOwogCg== 363536 2019-03-04 11:58:38 -0800 2019-03-04 12:36:38 -0800 Patch bug-195222-20190304115838.patch text/plain 12887 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA2MDcwYjI2YWEyMjU3Zjgy OWIyYjc4MTAyZTFlYWI1ODM1MGNlNjAuLmI3MjBhN2M3NjMzOWJlMDg2ZWY4ZDFkNmJjMTM2YTMw MjE1ZjJiNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDMtMDQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEcm9wIGxlZ2FjeSB1c2VyQWdlbnRG b3JVUkwgaW5qZWN0ZWQgYnVuZGxlIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MjIyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjczNDE0 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBEcm9wIGxl Z2FjeSB1c2VyQWdlbnRGb3JVUkwgaW5qZWN0ZWQgYnVuZGxlIFNQSS4gVGhlcmUgYXJlIG5vIGxv bmdlciBhbnkgY2xpZW50cywgYW5kIHVzaW5nCisgICAgICAgIFdlYnNpdGVQb2xpY2llcy5jdXN0 b21Vc2VyQWdlbnQgaXMgdGhlIHdheSB0byBnbyBub3dhZGF5cy4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVu dC5oOgorICAgICAgICAoQVBJOjpJbmplY3RlZEJ1bmRsZTo6UGFnZUxvYWRlckNsaWVudDo6d2ls bERlc3Ryb3lGcmFtZSk6CisgICAgICAgIChBUEk6OkluamVjdGVkQnVuZGxlOjpQYWdlTG9hZGVy Q2xpZW50Ojp1c2VyQWdlbnRGb3JVUkwgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxl Z2F0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5k bGVQYWdlTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbToK KyAgICAgICAgKHNldFVwUGFnZUxvYWRlckNsaWVudCk6CisgICAgICAgICh1c2VyQWdlbnRGb3JV UkwpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0 ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRC dW5kbGVQYWdlTG9hZGVyQ2xpZW50Ojp1c2VyQWdlbnRGb3JVUkwgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9h ZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1c2VyQWdlbnQgY29uc3QpOgorCiAyMDE5LTAzLTA0 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb Q29vcmRpbmF0ZWRHcmFwaGljc10gVGhlIGNvbXBvc2l0aW5nIGxvb3AgaXMgc3RpbGwgcnVubmlu ZyBldmVuIGFmdGVyIGV4aXRpbmcgQUMgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQVBJ SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKaW5kZXggNDE5ZWI3YjU0OWVmYThlN2Jh NTY4YjUzMzFkMjkxNmY2NGNjMDVhZC4uZTJiZjg5ODEwYzQ3YTIwZDkyMjFiODliNzFjZTk1YWIz OTRkNTA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVjdGVkQnVuZGxlUGFn ZUxvYWRlckNsaWVudC5oCkBAIC05NSw3ICs5NSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgZmVhdHVyZXNVc2VkSW5QYWdlKFdlYktpdDo6V2ViUGFnZSYsIGNvbnN0IFZlY3RvcjxXVEY6 OlN0cmluZz4mKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB3aWxsRGVzdHJveUZyYW1lKFdlYktp dDo6V2ViUGFnZSYsIFdlYktpdDo6V2ViRnJhbWUmKSB7IH0KLSAgICB2aXJ0dWFsIFdURjo6U3Ry aW5nIHVzZXJBZ2VudEZvclVSTChXZWJLaXQ6OldlYkZyYW1lJiwgY29uc3QgV1RGOjpVUkwmKSBj b25zdCB7IHJldHVybiBXVEY6OlN0cmluZygpOyB9CiAKICAgICB2aXJ0dWFsIE9wdGlvblNldDxX ZWJDb3JlOjpMYXlvdXRNaWxlc3RvbmU+IGxheW91dE1pbGVzdG9uZXMoKSBjb25zdCB7IHJldHVy biB7IH07IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZS5oIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nl c3NQbHVnSW5Mb2FkRGVsZWdhdGUuaAppbmRleCBiZmJjNGZiOWZiZjBjMWUyODFkZTBiMDU2ZGQz ODljYmRjZmRhOTgxLi4xZjM4ZDIyNzQ5MzE0MDhkZjBiNGQ1NjFiM2NjNGEwYzY5MWMxYjJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0Nv Y29hL1dLV2ViUHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTG9h ZERlbGVnYXRlLmgKQEAgLTY0LDYgKzY0LDQgQEAKIC0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJy b3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRD b250cm9sbGVyICopY29udHJvbGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUgKilm cmFtZSBkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2U6KHVpbnQ2NF90KXJlc291cmNlOwogLSAodm9p ZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQ bHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1lOihXS1dlYlBy b2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIGRpZEZhaWxMb2FkRm9yUmVzb3VyY2U6KHVpbnQ2NF90 KXJlc291cmNlIGVycm9yOihOU0Vycm9yICopZXJyb3I7CiAKLS0gKE5TU3RyaW5nICopd2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyICopY29udHJvbGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1 Z0luRnJhbWUgKilmcmFtZSB1c2VyQWdlbnRGb3JVUkw6KE5TVVJMICopdXJsOwotCiBAZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv V0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKaW5kZXggNzM3NDY5 Y2M1YzIyNDJjMzA0NzU2MDFlMGNmNjU5YjQzZTE3MDI3Yi4uYTBmNjgwNWY2ZTk0ZGU2MGU2YTMw ZWIyMjQ4MWIwYjViZDVlNWEyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VM b2FkZXJDbGllbnQuaApAQCAtNjIsNyArNjIsNiBAQCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBh Z2VEaWRMYXlvdXRDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLTGF5b3V0TWlsZQog dHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRmVhdHVyZXNVc2VkSW5QYWdlQ2FsbGJhY2spKFdL QnVuZGxlUGFnZVJlZiBwYWdlLCBXS0FycmF5UmVmIGZlYXR1cmVTdHJpbmdzLCBjb25zdCB2b2lk ICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZVdpbGxMb2FkVVJMUmVx dWVzdENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVl c3QsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVm IHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxsTG9hZERhdGFSZXF1ZXN0Q2FsbGJhY2spKFdLQnVuZGxl UGFnZVJlZiBwYWdlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tEYXRhUmVmIGRhdGEsIFdL U3RyaW5nUmVmIE1JTUVUeXBlLCBXS1N0cmluZ1JlZiBlbmNvZGluZ05hbWUsIFdLVVJMUmVmIHVu cmVhY2hhYmxlVVJMLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OwotdHlwZWRlZiBXS1N0cmluZ1JlZiAoKldLQnVuZGxlUGFnZVVzZXJBZ2VudEZvclVSTENhbGxi YWNrKShXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS1VSTFJlZiB1cmwsIGNvbnN0IHZvaWQgKmNs aWVudEluZm8pOwogdHlwZWRlZiBXS0xheW91dE1pbGVzdG9uZXMgKCpXS0J1bmRsZVBhZ2VMYXlv dXRNaWxlc3RvbmVzQ2FsbGJhY2spKGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiB0eXBlZGVm IHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnRCYXNlIHsKQEAgLTQ2Myw3ICs0NjIsNyBA QCB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnRWOCB7CiAgICAgdm9pZCAq ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgd2lsbERlc3Ryb3lGcmFtZV91bmF2YWlsYWJsZTsKICAgICAKICAgICAvLyBWZXJz aW9uIDgKLSAgICBXS0J1bmRsZVBhZ2VVc2VyQWdlbnRGb3JVUkxDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1c2VyQWdlbnRGb3JVUkw7CisgICAgdm9pZCogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdXNlckFnZW50Rm9yVVJMX3VuYXZhaWxhYmxlOwogfSBXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnRWODsKIAogdHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjkgewpA QCAtNTIxLDcgKzUyMCw3IEBAIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVu dFY5IHsKICAgICB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsRGVzdHJveUZyYW1lX3VuYXZhaWxhYmxlOwog CiAgICAgLy8gVmVyc2lvbiA4Ci0gICAgV0tCdW5kbGVQYWdlVXNlckFnZW50Rm9yVVJMQ2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlckFnZW50Rm9yVVJMOwor ICAgIHZvaWQqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTF91bmF2YWlsYWJsZTsKIAogICAgIC8v IFZlcnNpb24gOQogICAgIFdLQnVuZGxlUGFnZVdpbGxJbmplY3RVc2VyU2NyaXB0Rm9yRnJhbWVD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxJbmplY3RVc2VyU2NyaXB0Rm9yRnJh bWU7CkBAIC01ODIsNyArNTgxLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlTG9hZGVy Q2xpZW50VjEwIHsKICAgICB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsRGVzdHJveUZyYW1lX3VuYXZhaWxh YmxlOwogCiAgICAgLy8gVmVyc2lvbiA4Ci0gICAgV0tCdW5kbGVQYWdlVXNlckFnZW50Rm9yVVJM Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlckFnZW50Rm9y VVJMOworICAgIHZvaWQqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJBZ2VudEZvclVSTF91bmF2YWlsYWJsZTsKIAog ICAgIC8vIFZlcnNpb24gOQogICAgIFdLQnVuZGxlUGFnZVdpbGxJbmplY3RVc2VyU2NyaXB0Rm9y RnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxJbmplY3RVc2VyU2NyaXB0 Rm9yRnJhbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0KaW5kZXggOWM3MDhjMWIy MTA0MDFiZjliODJiNzBiMjI5YzNhODYyZjlkMDEyZS4uMmFkYjMxNWI5NjVmZjNmYmQyMWM1ZGZj MTIwMzEyOTZmM2U4ODU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250 cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbQpAQCAt MjIwLDIzICsyMjAsNiBAQCBzdGF0aWMgdm9pZCBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFt ZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZgogICAgICAgICBbbG9hZERl bGVnYXRlIHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6cGx1Z2luQ29u dGV4dENvbnRyb2xsZXIgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU6d3JhcHBlcigqV2Vi S2l0Ojp0b0ltcGwoZnJhbWUpKV07CiB9CiAKLXN0YXRpYyBXS1N0cmluZ1JlZiB1c2VyQWdlbnRG b3JVUkwoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tVUkxSZWYgdXJsLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQotewotICAgIGF1dG8gcGx1Z2luQ29udGV4dENvbnRyb2xsZXIgPSAoX19icmlk Z2UgV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY2xpZW50SW5m bzsKLSAgICBhdXRvIGxvYWREZWxlZ2F0ZSA9IHBsdWdpbkNvbnRleHRDb250cm9sbGVyLT5fbG9h ZERlbGVnYXRlLmdldCgpOwotICAgIAotICAgIGlmIChbbG9hZERlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Iod2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxl cjpmcmFtZTp1c2VyQWdlbnRGb3JVUkw6KV0pIHsKLSAgICAgICAgV0tXZWJQcm9jZXNzUGx1Z0lu RnJhbWUgKm5ld0ZyYW1lID0gd3JhcHBlcigqV2ViS2l0Ojp0b0ltcGwoZnJhbWUpKTsKLSAgICAg ICAgTlNTdHJpbmcgKnN0cmluZyA9IFtsb2FkRGVsZWdhdGUgd2ViUHJvY2Vzc1BsdWdJbkJyb3dz ZXJDb250ZXh0Q29udHJvbGxlcjpwbHVnaW5Db250ZXh0Q29udHJvbGxlciBmcmFtZTpuZXdGcmFt ZSB1c2VyQWdlbnRGb3JVUkw6d3JhcHBlcigqV2ViS2l0Ojp0b0ltcGwodXJsKSldOwotICAgICAg ICBpZiAoIXN0cmluZykKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgICAgIHJl dHVybiBXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpc3Ry aW5nKTsKLSAgICB9Ci0gICAgCi0gICAgcmV0dXJuIG51bGxwdHI7Ci19Ci0KIHN0YXRpYyB2b2lk IHNldFVwUGFnZUxvYWRlckNsaWVudChXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENv bnRyb2xsZXIgKmNvbnRleHRDb250cm9sbGVyLCBXZWJLaXQ6OldlYlBhZ2UmIHBhZ2UpCiB7CiAg ICAgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjEwIGNsaWVudDsKQEAgLTI1Niw3ICsyMzksNiBA QCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VMb2FkZXJDbGllbnQoV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyICpjbwogICAgIGNsaWVudC5kaWRSZW1vdmVGcmFtZUZyb21I aWVyYXJjaHkgPSBkaWRSZW1vdmVGcmFtZUZyb21IaWVyYXJjaHk7CiAgICAgY2xpZW50LmRpZEhh bmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lID0gZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU7 CiAgICAgY2xpZW50LmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lID0gZGlk Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWU7Ci0gICAgY2xpZW50LnVzZXJBZ2Vu dEZvclVSTCA9IHVzZXJBZ2VudEZvclVSTDsKIAogICAgIGNsaWVudC5kaWRMYXlvdXRGb3JGcmFt ZSA9IGRpZExheW91dEZvckZyYW1lOwogICAgIGNsaWVudC5kaWRMYXlvdXQgPSBkaWRSZWFjaExh eW91dE1pbGVzdG9uZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNs aWVudC5jcHAKaW5kZXggNmIwYzZjNmU1MzVmNGQ4ZGU2YmIxMjNiM2Q4NTAwZDc4MTc5NWRkYy4u NTEwZDJkYTc5OGNkYTI1MDk5M2FiNTBkZDM2OTdkZWE1ZGFlM2FkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxv YWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAKQEAgLTM1MywxNiArMzUzLDYg QEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmZlYXR1cmVzVXNlZEluUGFn ZShXZWJQYWdlJiBwYWdlLCBjb25zdCBWZWMKICAgICByZXR1cm4gbV9jbGllbnQuZmVhdHVyZXNV c2VkSW5QYWdlKHRvQVBJKCZwYWdlKSwgdG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlU3RyaW5nQXJy YXkoZmVhdHVyZXMpLnB0cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKIH0KIAotU3Ry aW5nIEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6dXNlckFnZW50Rm9yVVJMKFdlYkZy YW1lJiBmcmFtZSwgY29uc3QgVVJMJiB1cmwpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX2NsaWVudC51 c2VyQWdlbnRGb3JVUkwpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAgICBXS1N0cmluZ1Jl ZiB1c2VyQWdlbnQgPSBtX2NsaWVudC51c2VyQWdlbnRGb3JVUkwodG9BUEkoJmZyYW1lKSwgdG9B UEkoQVBJOjpVUkw6OmNyZWF0ZSh1cmwpLnB0cigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZv KTsKLSAgICBpZiAoIXVzZXJBZ2VudCkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIHJl dHVybiB0b0ltcGwodXNlckFnZW50KS0+c3RyaW5nKCk7Ci19Ci0KIE9wdGlvblNldDxXZWJDb3Jl OjpMYXlvdXRNaWxlc3RvbmU+IEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6bGF5b3V0 TWlsZXN0b25lcygpIGNvbnN0CiB7CiAgICAgaWYgKG1fY2xpZW50LmxheW91dE1pbGVzdG9uZXMp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAppbmRleCAz OGU1YjQwYTk5NmRmZmVhZjE5NDkyZjQwYWRhNGRjM2NlMWUzOGE0Li43N2NlOGRmNDY1MTg2NWI4 NWYwYmZjNjM3M2U4NTFhMTRiOWJjNWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl UGFnZUxvYWRlckNsaWVudC5oCkBAIC04NSw4ICs4NSw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg ZmVhdHVyZXNVc2VkSW5QYWdlKFdlYlBhZ2UmLCBjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+Jikg b3ZlcnJpZGU7CiAKLSAgICBXVEY6OlN0cmluZyB1c2VyQWdlbnRGb3JVUkwoV2ViRnJhbWUmLCBj b25zdCBVUkwmKSBjb25zdCBvdmVycmlkZTsKLQogICAgIE9wdGlvblNldDxXZWJDb3JlOjpMYXlv dXRNaWxlc3RvbmU+IGxheW91dE1pbGVzdG9uZXMoKSBjb25zdCBvdmVycmlkZTsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDNkZTE5YjFlMmJhMTAxMjA2YTk0Njdh NWNjYTAwMzg3MGNhNWQ3OTcuLjZlNmVjMTk0MWY5Y2NlMTM4MDZmOGFhMTNlN2U2MDFkNjA3YjBk ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTM3MCwxMSArMTM3MCwx MSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXRUaXRsZShjb25zdCBTdHJpbmdXaXRo RGlyZWN0aW9uJiB0aXRsZSwgY29uc3QgVVJMJgogCiBTdHJpbmcgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OnVzZXJBZ2VudChjb25zdCBVUkwmIHVybCkKIHsKLSAgICBXZWJQYWdlKiB3ZWJQYWdlID0g bV9mcmFtZS0+cGFnZSgpOworICAgIGF1dG8qIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAg ICAgaWYgKCF3ZWJQYWdlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICByZXR1cm4g d2ViUGFnZS0+dXNlckFnZW50KG1fZnJhbWUsIHVybCk7CisgICAgcmV0dXJuIHdlYlBhZ2UtPnVz ZXJBZ2VudCh1cmwpOwogfQogCiBTdHJpbmcgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om92ZXJyaWRl Q29udGVudFNlY3VyaXR5UG9saWN5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggODk2ODc2MGY5ZTRlNjZmYTFmNGQ1OTE2NmE3MmU3 MDkxMjg0OWUwZS4uOTZmYzJkZjQ4YzhiMmU4N2ZhNGI1M2UxMWQ5MGYyN2FmMDdhMTFhNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTMxNjQs MjMgKzMxNjQsMTIgQEAgdm9pZCBXZWJQYWdlOjpzaG93KCkKIAogU3RyaW5nIFdlYlBhZ2U6OnVz ZXJBZ2VudChjb25zdCBVUkwmIHdlYkNvcmVVUkwpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHVzZXJB Z2VudChudWxscHRyLCB3ZWJDb3JlVVJMKTsKLX0KLQotU3RyaW5nIFdlYlBhZ2U6OnVzZXJBZ2Vu dChXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgd2ViY29yZVVSTCkgY29uc3QKLXsKLSAgICBp ZiAoZnJhbWUpIHsKLSAgICAgICAgU3RyaW5nIHVzZXJBZ2VudCA9IG1fbG9hZGVyQ2xpZW50LT51 c2VyQWdlbnRGb3JVUkwoKmZyYW1lLCB3ZWJjb3JlVVJMKTsKLSAgICAgICAgaWYgKCF1c2VyQWdl bnQuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIHVzZXJBZ2VudDsKLSAgICB9Ci0KLSAg ICBTdHJpbmcgdXNlckFnZW50ID0gcGxhdGZvcm1Vc2VyQWdlbnQod2ViY29yZVVSTCk7CisgICAg U3RyaW5nIHVzZXJBZ2VudCA9IHBsYXRmb3JtVXNlckFnZW50KHdlYkNvcmVVUkwpOwogICAgIGlm ICghdXNlckFnZW50LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHVzZXJBZ2VudDsKICAgICBy ZXR1cm4gbV91c2VyQWdlbnQ7CiB9Ci0gICAgCisKIHZvaWQgV2ViUGFnZTo6c2V0VXNlckFnZW50 KGNvbnN0IFN0cmluZyYgdXNlckFnZW50KQogewogICAgIGlmIChtX3VzZXJBZ2VudCA9PSB1c2Vy QWdlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXgg ZDIxZWFmYmM1MjM1MmMyNTcyNzlmOGYzMmVhNjU2MzkwOGViNmE5Mi4uMjZkN2E5OWM0N2U2MDAw OTExOWVmMTgwNTc1YzJiOTAxMWEwZmZlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaApAQCAtMzQ3LDcgKzM0Nyw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRp ZEZpbmlzaExvYWQoV2ViRnJhbWUqKTsKICAgICB2b2lkIHNob3coKTsKICAgICBTdHJpbmcgdXNl ckFnZW50KGNvbnN0IFVSTCYpIGNvbnN0OwotICAgIFN0cmluZyB1c2VyQWdlbnQoV2ViRnJhbWUq LCBjb25zdCBVUkwmKSBjb25zdDsKICAgICBTdHJpbmcgcGxhdGZvcm1Vc2VyQWdlbnQoY29uc3Qg VVJMJikgY29uc3Q7CiAgICAgV2ViQ29yZTo6S2V5Ym9hcmRVSU1vZGUga2V5Ym9hcmRVSU1vZGUo KTsKIAo=