209911 2020-04-02 09:11:37 -0700 [macOS] Remove redundant call to check in with Launch Services 2020-04-02 11:26:33 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham darin webkit-bug-importer oldest_to_newest 1636909 0 pvollan 2020-04-02 09:11:37 -0700 There is no need to explicitly check in with Launch Services or call RegisterApplication in the WebContent process, since this is handled when calling [NSApplication _accessibilityInitialize]. 1636910 1 webkit-bug-importer 2020-04-02 09:11:56 -0700 <rdar://problem/61210496> 1636912 2 395271 pvollan 2020-04-02 09:18:43 -0700 Created attachment 395271 Patch 1636913 3 395271 darin 2020-04-02 09:24:46 -0700 Comment on attachment 395271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395271&action=review r=me assuming it builds and passes tests > Source/WebCore/PAL/pal/spi/cocoa/CoreServicesSPI.h:28 > +extern "C" void _CSCheckFixDisable(); I would have expected this earlier in the file: #if USE(APPLE_INTERNAL_SDK) #include <CarbonCore/RuntimePriv.h> #endif Unless there is some reason we can’t or shouldn’t do that? > Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h:108 > +typedef bool (^LSServerConnectionAllowedBlock) (CFDictionaryRef optionsRef); > +extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block); > +extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo); Similarly, kind of expected, within the #if USE(APPLE_INTERNAL_SDK) section: #import <LaunchServices/LSApplicationServicesPriv.h> > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:542 > + // _CSCheckFixDisable() needs to be called before checking in with Launch Services. This comment leaves out critical context. It’s not obvious how this is the right place to do this. How is this place "before checking in with Launch Services"? The comment should say. 1636935 4 395278 pvollan 2020-04-02 10:27:51 -0700 Created attachment 395278 Patch 1636936 5 pvollan 2020-04-02 10:28:57 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 395271 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=395271&action=review > > r=me assuming it builds and passes tests > > > Source/WebCore/PAL/pal/spi/cocoa/CoreServicesSPI.h:28 > > +extern "C" void _CSCheckFixDisable(); > > I would have expected this earlier in the file: > > #if USE(APPLE_INTERNAL_SDK) > > #include <CarbonCore/RuntimePriv.h> > > #endif > > Unless there is some reason we can’t or shouldn’t do that? > Fixed. > > Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h:108 > > +typedef bool (^LSServerConnectionAllowedBlock) (CFDictionaryRef optionsRef); > > +extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block); > > +extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo); > > Similarly, kind of expected, within the #if USE(APPLE_INTERNAL_SDK) section: > > #import <LaunchServices/LSApplicationServicesPriv.h> > Added. > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:542 > > + // _CSCheckFixDisable() needs to be called before checking in with Launch Services. > > This comment leaves out critical context. It’s not obvious how this is the > right place to do this. How is this place "before checking in with Launch > Services"? The comment should say. Fixed. Thanks for reviewing! 1636960 6 ews-feeder 2020-04-02 11:26:32 -0700 Committed r259396: <https://trac.webkit.org/changeset/259396> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395278. 395271 2020-04-02 09:18:43 -0700 2020-04-02 09:24:46 -0700 Patch bug-209911-20200402091842.patch text/plain 10257 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjU5Mzg1KQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0 LTAyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIFJlbW92ZSByZWR1bmRhbnQgY2FsbCB0byBjaGVjayBpbiB3aXRoIExhdW5jaCBTZXJ2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5OTEx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBk ZWNsYXJhdGlvbnMgdG8gU1BJIGhlYWRlciBmaWxlcy4KKworICAgICAgICAqIFBBTC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHBhbC9zcGkvY29jb2EvQ29yZVNlcnZpY2Vz U1BJLmg6IEFkZGVkLgorICAgICAgICAqIHBhbC9zcGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEku aDoKKwogMjAyMC0wNC0wMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgRml4IHRoZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9Q QUwueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvUEFMLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDI1OTM4NSkKKysr IFNvdXJjZS9XZWJDb3JlL1BBTC9QQUwueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2lu ZyBjb3B5KQpAQCAtMzQ1LDYgKzM0NSw3IEBACiAJCUEzQzY2Q0RBMUY0NjJENkEwMDlFNkVFOSAv KiBTZXNzaW9uSUQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2Vz c2lvbklELmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTNDNjZDREIxRjQ2MkQ2 QTAwOUU2RUU5IC8qIFNlc3Npb25JRC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBTZXNzaW9uSUQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzAzNzQ5NDEyNDEy N0NDQjAwRDlBMzZFIC8qIEFjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IEFjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJ CUMxMzhFQTFBMjQzNjQ0NzIwMDY1NkRGMSAvKiBDb3JlU2VydmljZXNTUEkuaCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gQ29yZVNlcnZpY2VzU1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMx NUNCQjMyMjNGMzRBMTIwMDMwMENDNyAvKiBOU1VzZXJEZWZhdWx0c1NQSS5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBOU1VzZXJEZWZhdWx0c1NQSS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlD MjE0N0E0QTFFRkQwQUE2MDAwNTZGQTUgLyogQ29weVBBTEhlYWRlcnMueGNjb25maWcgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSB0ZXh0LnhjY29uZmlnOyBwYXRoID0gQ29weVBBTEhlYWRlcnMueGNjb25maWc7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNEQUNCMzVFMjM4NzNFNDgwMDE4RDdDRSAvKiBNZWRp YVRvb2xib3hTb2Z0TGluay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBNZWRpYVRvb2xib3hTb2Z0 TGluay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00MjcsNiArNDI4LDcgQEAK IAkJCQkwQzJEQTEyMjFGM0JFQjQ5MDBEQkMzMTcgLyogQVZLaXRTUEkuaCAqLywKIAkJCQkwQzJE QTEyMzFGM0JFQjQ5MDBEQkMzMTcgLyogQ0ZOU1VSTENvbm5lY3Rpb25TUEkuaCAqLywKIAkJCQk3 QTM2RDBGODIyM0FEOUFCMDBCMDUyMkUgLyogQ29tbW9uQ3J5cHRvU1BJLmggKi8sCisJCQkJQzEz OEVBMUEyNDM2NDQ3MjAwNjU2REYxIC8qIENvcmVTZXJ2aWNlc1NQSS5oICovLAogCQkJCTBDMkRB MTI0MUYzQkVCNDkwMERCQzMxNyAvKiBDb3JlVGV4dFNQSS5oICovLAogCQkJCTBDMkRBMTI1MUYz QkVCNDkwMERCQzMxNyAvKiBEYXRhRGV0ZWN0b3JzQ29yZVNQSS5oICovLAogCQkJCTFEMTJDQzRB MjQxMUJDQUUwMEZEQTBBMyAvKiBGZWF0dXJlRmxhZ3NTUEkuaCAqLywKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQSS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQSS5oCShub25l eGlzdGVudCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNl c1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjggQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJV VE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJh Z21hIG9uY2UKKworZXh0ZXJuICJDIiB2b2lkIF9DU0NoZWNrRml4RGlzYWJsZSgpOwpJbmRleDog U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNl c1NQSS5oCShyZXZpc2lvbiAyNTkzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9j b2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsNiArMTAzLDEw IEBAIENGVHlwZVJlZiBfTFNDb3B5QXBwbGljYXRpb25JbmZvcm1hdGlvbkkKIAogT1NTdGF0dXMg X1JlZ2lzdGVyQXBwbGljYXRpb24oQ0ZEaWN0aW9uYXJ5UmVmLCBQcm9jZXNzU2VyaWFsTnVtYmVy Kik7CiAKK3R5cGVkZWYgYm9vbCAoXkxTU2VydmVyQ29ubmVjdGlvbkFsbG93ZWRCbG9jaykgKENG RGljdGlvbmFyeVJlZiBvcHRpb25zUmVmKTsKK2V4dGVybiAiQyIgdm9pZCBfTFNTZXRBcHBsaWNh dGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cyh1aW50NjRfdCBmbGFncywg TFNTZXJ2ZXJDb25uZWN0aW9uQWxsb3dlZEJsb2NrIGJsb2NrKTsKK2V4dGVybiAiQyIgQ0ZEaWN0 aW9uYXJ5UmVmIF9MU0FwcGxpY2F0aW9uQ2hlY2tJbihMU1Nlc3Npb25JRCBzZXNzaW9uSUQsIENG RGljdGlvbmFyeVJlZiBhcHBsaWNhdGlvbkluZm8pOworCiBXVEZfRVhURVJOX0NfRU5ECiAKICNl bmRpZiAvLyBQTEFURk9STShNQUMpCkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjU5Mzg1KQorKysg U291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAor MjAyMC0wNC0wMiAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW21hY09TXSBSZW1vdmUgcmVkdW5kYW50IGNhbGwgdG8gY2hlY2sgaW4gd2l0aCBMYXVuY2gg U2VydmljZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwOTkxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZXJlIGlzIG5vIG5lZWQgdG8gZXhwbGljaXRseSBjaGVjayBpbiB3aXRoIExhdW5jaCBTZXJ2 aWNlcyBvciBjYWxsIFJlZ2lzdGVyQXBwbGljYXRpb24gaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2Vz cywKKyAgICAgICAgc2luY2UgdGhpcyBpcyBoYW5kbGVkIHdoZW4gY2FsbGluZyBbTlNBcHBsaWNh dGlvbiBfYWNjZXNzaWJpbGl0eUluaXRpYWxpemVdLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg c2luY2UgdGhpcyBvbmx5IHJlbW92ZXMgYSByZWR1bmRhbnQgY2FsbCwgYW5kIHNob3VsZCBiZSBj b3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogU2hhcmVkL21hYy9BdXhpbGlh cnlQcm9jZXNzTWFjLm1tOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv Y29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVX ZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6dXBkYXRlUHJvY2Vzc05h bWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVQcm9j ZXNzKToKKwogMjAyMC0wNC0wMiAgeW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgRGVidWcgY3Jhc2g6IEFTU0VSVElPTiBGQUlMRUQ6IG1fb25nb2luZ0ZldGNoZXMu Y29udGFpbnModGFzay5mZXRjaElkZW50aWZpZXIoKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hh cmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQcm9jZXNzTWFjLm1tCShyZXZpc2lvbiAyNTkzODUpCisr KyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQXV4aWxpYXJ5UHJvY2Vzc01hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQAogI2ltcG9ydCA8bWFjaC9tYWNoLmg+CiAjaW1wb3J0 IDxtYWNoL3Rhc2suaD4KICNpbXBvcnQgPHBhbC9jcnlwdG8vQ3J5cHRvRGlnZXN0Lmg+CisjaW1w b3J0IDxwYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9j b2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oPgogI2ltcG9ydCA8cHdkLmg+CiAjaW1wb3J0IDxzdGRs aWIuaD4KQEAgLTcyLDEzICs3Myw2IEBAIGVudW0gTFNTZXNzaW9uSUQgewogfTsKICNlbmRpZgog Ci10eXBlZGVmIGJvb2wgKF5MU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2spICggQ0ZEaWN0 aW9uYXJ5UmVmIG9wdGlvbnNSZWYgKTsKLWV4dGVybiAiQyIgdm9pZCBfTFNTZXRBcHBsaWNhdGlv bkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cyh1aW50NjRfdCBmbGFncywgTFNT ZXJ2ZXJDb25uZWN0aW9uQWxsb3dlZEJsb2NrIGJsb2NrKTsKLWV4dGVybiAiQyIgQ0ZEaWN0aW9u YXJ5UmVmIF9MU0FwcGxpY2F0aW9uQ2hlY2tJbihMU1Nlc3Npb25JRCBzZXNzaW9uSUQsIENGRGlj dGlvbmFyeVJlZiBhcHBsaWNhdGlvbkluZm8pOwotI2lmIEhBVkUoQ1NDSEVDS0ZJWERJU0FCTEUp Ci1leHRlcm4gIkMiIHZvaWQgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7Ci0jZW5kaWYKLQogbmFtZXNw YWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApJbmRleDogU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lv biAyNTkzODUpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv Y29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2ICs3Nyw3IEBACiAjaW1wb3J0IDxwYWwvc3Bp L2NmL0NGTmV0d29ya1NQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jZi9DRlV0aWxpdGllc1NQSS5o PgogI2ltcG9ydCA8cGFsL3NwaS9jZy9Db3JlR3JhcGhpY3NTUEkuaD4KKyNpbXBvcnQgPHBhbC9z cGkvY29jb2EvQ29yZVNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5j aFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TQWNjZXNzaWJpbGl0eVNQ SS5oPgogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9RdWFydHpDb3JlU1BJLmg+CkBAIC0yMzAsNiAr MjMxLDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogI2lmIFBM QVRGT1JNKE1BQykgJiYgRU5BQkxFKFdFQlBST0NFU1NfTlNSVU5MT09QKQogICAgIC8vIE5lZWQg dG8gaW5pdGlhbGl6ZSBhY2Nlc3NpYmlsaXR5IGZvciBWb2ljZU92ZXIgdG8gd29yayB3aGVuIHRo ZSBXZWJDb250ZW50IHByb2Nlc3MgaXMgdXNpbmcgTlNSdW5Mb29wLgogICAgIC8vIEN1cnJlbnRs eSwgaXQgaXMgYWxzbyBuZWVkZWQgdG8gYWxsb2NhdGUgYW5kIGluaXRpYWxpemUgYW4gTlNBcHBs aWNhdGlvbiBvYmplY3QuCisgICAgLy8gVGhpcyBtZXRob2QgY2FsbCB3aWxsIGFsc28gY2FsbCBS ZWdpc3RlckFwcGxpY2F0aW9uLCBzbyB0aGVyZSBpcyBubyBuZWVkIGZvciB1cyB0byBjYWxsIHRo aXMgb3IKKyAgICAvLyBjaGVjayBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcwogICAgIFtOU0FwcGxp Y2F0aW9uIF9hY2Nlc3NpYmlsaXR5SW5pdGlhbGl6ZV07CiAjZW5kaWYKIApAQCAtMjc0LDcgKzI3 Nyw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICAgICAg U2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuZHluYW1pY01h Y2hFeHRlbnNpb25IYW5kbGVzW2ldKTsKICNlbmRpZgogICAgIAotI2lmIFBMQVRGT1JNKENPQ09B KQogICAgIGlmIChwYXJhbWV0ZXJzLm5lSGVscGVyRXh0ZW5zaW9uSGFuZGxlKQogICAgICAgICBT YW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkoKnBhcmFtZXRlcnMubmVIZWxwZXJF eHRlbnNpb25IYW5kbGUpOwogICAgIGlmIChwYXJhbWV0ZXJzLm5lU2Vzc2lvbk1hbmFnZXJFeHRl bnNpb25IYW5kbGUpCkBAIC0yODUsMTggKzI4NywxNSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByCiAKICAgICBpZiAocGFyYW1ldGVycy5taW1lVHlwZXNNYXApCiAg ICAgICAgIG92ZXJyaWRkZW5NaW1lVHlwZXNNYXAoKSA9IFdURk1vdmUocGFyYW1ldGVycy5taW1l VHlwZXNNYXApOwotI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFJlbmRl clRoZW1lSU9TOjpzZXRDU1NWYWx1ZVRvU3lzdGVtQ29sb3JNYXAoV1RGTW92ZShwYXJhbWV0ZXJz LmNzc1ZhbHVlVG9TeXN0ZW1Db2xvck1hcCkpOwogICAgIFJlbmRlclRoZW1lSU9TOjpzZXRGb2N1 c1JpbmdDb2xvcihwYXJhbWV0ZXJzLmZvY3VzUmluZ0NvbG9yKTsKICNlbmRpZgogCi0jaWYgUExB VEZPUk0oQ09DT0EpCiAgICAgLy8gRklYTUUoMjA3NzE2KTogVGhlIGZvbGxvd2luZyBzaG91bGQg YmUgcmVtb3ZlZCB3aGVuIHRoZSBHUFUgcHJvY2VzcyBpcyBjb21wbGV0ZS4KICAgICBmb3IgKHNp emVfdCBpID0gMCwgc2l6ZSA9IHBhcmFtZXRlcnMubWVkaWFFeHRlbnNpb25IYW5kbGVzLnNpemUo KTsgaSA8IHNpemU7ICsraSkKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1h bmVudGx5KHBhcmFtZXRlcnMubWVkaWFFeHRlbnNpb25IYW5kbGVzW2ldKTsKLSNlbmRpZgogCiAj aWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpCiAgICAgaWYgKHBhcmFtZXRlcnMucHJlZmVy ZW5jZXNFeHRlbnNpb25IYW5kbGUpIHsKQEAgLTM0NSwxNCArMzQ0LDYgQEAgdm9pZCBXZWJQcm9j ZXNzOjppbml0aWFsaXplUHJvY2Vzc05hbWUoYwogdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9j ZXNzTmFtZSgpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxh ZyBvbmNlRmxhZzsKLSAgICBzdGQ6OmNhbGxfb25jZSgKLSAgICAgICAgb25jZUZsYWcsCi0gICAg ICAgIFt0aGlzXSB7Ci0gICAgICAgICAgICAvLyBDaGVja2luZyBpbiB3aXRoIExhdW5jaCBTZXJ2 aWNlcyBpcyBuZWNlc3NhcnkgdG8gYmUgYWJsZSB0byBzZXQgdGhlIHByb2Nlc3MnIGRpc3BsYXkg bmFtZS4KLSAgICAgICAgICAgIGxhdW5jaFNlcnZpY2VzQ2hlY2tJbigpOwotICAgIH0pOwotCiAg ICAgTlNTdHJpbmcgKmFwcGxpY2F0aW9uTmFtZTsKICAgICBzd2l0Y2ggKG1fcHJvY2Vzc1R5cGUp IHsKICAgICBjYXNlIFByb2Nlc3NUeXBlOjpJbnNwZWN0b3I6CkBAIC01NDYsNiArNTM3LDExIEBA IHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJvY2UKICNpZiBIQVZFKEFQUF9T U08pCiAgICAgW05TVVJMU2Vzc2lvbiBfZGlzYWJsZUFwcFNTT107CiAjZW5kaWYKKworI2lmIEhB VkUoQ1NDSEVDS0ZJWERJU0FCTEUpCisgICAgLy8gX0NTQ2hlY2tGaXhEaXNhYmxlKCkgbmVlZHMg dG8gYmUgY2FsbGVkIGJlZm9yZSBjaGVja2luZyBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcy4KKyAg ICBfQ1NDaGVja0ZpeERpc2FibGUoKTsKKyNlbmRpZgogfQogCiAjaWYgVVNFKEFQUEtJVCkK 395278 2020-04-02 10:27:51 -0700 2020-04-02 11:26:32 -0700 Patch bug-209911-20200402102750.patch text/plain 10729 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjU5Mzg1KQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0 LTAyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIFJlbW92ZSByZWR1bmRhbnQgY2FsbCB0byBjaGVjayBpbiB3aXRoIExhdW5jaCBTZXJ2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5OTEx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgTW92ZSBkZWNs YXJhdGlvbnMgdG8gU1BJIGhlYWRlciBmaWxlcy4KKworICAgICAgICAqIFBBTC54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHBhbC9zcGkvY29jb2EvQ29yZVNlcnZpY2VzU1BJ Lmg6IEFkZGVkLgorICAgICAgICAqIHBhbC9zcGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoK KwogMjAyMC0wNC0wMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgRml4IHRoZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9QQUwu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Q QUwvUEFMLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDI1OTM4NSkKKysrIFNv dXJjZS9XZWJDb3JlL1BBTC9QQUwueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBj b3B5KQpAQCAtMzQ1LDYgKzM0NSw3IEBACiAJCUEzQzY2Q0RBMUY0NjJENkEwMDlFNkVFOSAvKiBT ZXNzaW9uSUQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2Vzc2lv bklELmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTNDNjZDREIxRjQ2MkQ2QTAw OUU2RUU5IC8qIFNlc3Npb25JRC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBT ZXNzaW9uSUQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzAzNzQ5NDEyNDEyN0ND QjAwRDlBMzZFIC8qIEFjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFj Y2Vzc2liaWxpdHlTdXBwb3J0U1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUMx MzhFQTFBMjQzNjQ0NzIwMDY1NkRGMSAvKiBDb3JlU2VydmljZXNTUEkuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gQ29yZVNlcnZpY2VzU1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxNUNC QjMyMjNGMzRBMTIwMDMwMENDNyAvKiBOU1VzZXJEZWZhdWx0c1NQSS5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBOU1VzZXJEZWZhdWx0c1NQSS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMjE0 N0E0QTFFRkQwQUE2MDAwNTZGQTUgLyogQ29weVBBTEhlYWRlcnMueGNjb25maWcgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0LnhjY29uZmlnOyBwYXRoID0gQ29weVBBTEhlYWRlcnMueGNjb25maWc7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNEQUNCMzVFMjM4NzNFNDgwMDE4RDdDRSAvKiBNZWRpYVRv b2xib3hTb2Z0TGluay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBNZWRpYVRvb2xib3hTb2Z0TGlu ay5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00MjcsNiArNDI4LDcgQEAKIAkJ CQkwQzJEQTEyMjFGM0JFQjQ5MDBEQkMzMTcgLyogQVZLaXRTUEkuaCAqLywKIAkJCQkwQzJEQTEy MzFGM0JFQjQ5MDBEQkMzMTcgLyogQ0ZOU1VSTENvbm5lY3Rpb25TUEkuaCAqLywKIAkJCQk3QTM2 RDBGODIyM0FEOUFCMDBCMDUyMkUgLyogQ29tbW9uQ3J5cHRvU1BJLmggKi8sCisJCQkJQzEzOEVB MUEyNDM2NDQ3MjAwNjU2REYxIC8qIENvcmVTZXJ2aWNlc1NQSS5oICovLAogCQkJCTBDMkRBMTI0 MUYzQkVCNDkwMERCQzMxNyAvKiBDb3JlVGV4dFNQSS5oICovLAogCQkJCTBDMkRBMTI1MUYzQkVC NDkwMERCQzMxNyAvKiBEYXRhRGV0ZWN0b3JzQ29yZVNQSS5oICovLAogCQkJCTFEMTJDQzRBMjQx MUJDQUUwMEZEQTBBMyAvKiBGZWF0dXJlRmxhZ3NTUEkuaCAqLywKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQSS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQSS5oCShub25leGlz dGVudCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVTZXJ2aWNlc1NQ SS5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21h IG9uY2UKKworI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisKKyNpbmNsdWRlIDxDYXJib25D b3JlL1J1bnRpbWVQcml2Lmg+CisKKyNlbmRpZgorCitleHRlcm4gIkMiIHZvaWQgX0NTQ2hlY2tG aXhEaXNhYmxlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVu Y2hTZXJ2aWNlc1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3Bp L2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmgJKHJldmlzaW9uIDI1OTM4NSkKKysrIFNvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMxLDYgKzMxLDcgQEAKIAogI2lmIFBMQVRGT1JNKE1BQykKICNpbXBvcnQgPENvcmVT ZXJ2aWNlcy9Db3JlU2VydmljZXNQcml2Lmg+CisjaW1wb3J0IDxMYXVuY2hTZXJ2aWNlcy9MU0Fw cGxpY2F0aW9uU2VydmljZXNQcml2Lmg+CiAjZWxpZiBQTEFURk9STShJT1NfRkFNSUxZKQogI2lt cG9ydCA8TW9iaWxlQ29yZVNlcnZpY2VzL0xTQXBwTGlua1ByaXYuaD4KICNlbGlmIFBMQVRGT1JN KElPUykKQEAgLTEwMyw2ICsxMDQsMTAgQEAgQ0ZUeXBlUmVmIF9MU0NvcHlBcHBsaWNhdGlvbklu Zm9ybWF0aW9uSQogCiBPU1N0YXR1cyBfUmVnaXN0ZXJBcHBsaWNhdGlvbihDRkRpY3Rpb25hcnlS ZWYsIFByb2Nlc3NTZXJpYWxOdW1iZXIqKTsKIAordHlwZWRlZiBib29sICheTFNTZXJ2ZXJDb25u ZWN0aW9uQWxsb3dlZEJsb2NrKSAoQ0ZEaWN0aW9uYXJ5UmVmIG9wdGlvbnNSZWYpOworZXh0ZXJu ICJDIiB2b2lkIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9u U3RhdHVzKHVpbnQ2NF90IGZsYWdzLCBMU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2sgYmxv Y2spOworZXh0ZXJuICJDIiBDRkRpY3Rpb25hcnlSZWYgX0xTQXBwbGljYXRpb25DaGVja0luKExT U2Vzc2lvbklEIHNlc3Npb25JRCwgQ0ZEaWN0aW9uYXJ5UmVmIGFwcGxpY2F0aW9uSW5mbyk7CisK IFdURl9FWFRFUk5fQ19FTkQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTkzODUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTAyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9s bGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFJlbW92ZSByZWR1bmRhbnQgY2FsbCB0 byBjaGVjayBpbiB3aXRoIExhdW5jaCBTZXJ2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5OTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCisKKyAgICAgICAgVGhlcmUgaXMgbm8gbmVlZCB0byBleHBsaWNpdGx5IGNoZWNr IGluIHdpdGggTGF1bmNoIFNlcnZpY2VzIG9yIGNhbGwgUmVnaXN0ZXJBcHBsaWNhdGlvbiBpbiB0 aGUgV2ViQ29udGVudCBwcm9jZXNzLAorICAgICAgICBzaW5jZSB0aGlzIGlzIGhhbmRsZWQgd2hl biBjYWxsaW5nIFtOU0FwcGxpY2F0aW9uIF9hY2Nlc3NpYmlsaXR5SW5pdGlhbGl6ZV0uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSB0aGlzIG9ubHkgcmVtb3ZlcyBhIHJlZHVuZGFudCBj YWxsLCBhbmQgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAg KiBTaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW06CisgICAgICAgICogV2ViUHJvY2Vz cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6 OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBs YXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MpOgorCiAyMDIwLTA0LTAyICB5b3Vlbm4gZmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBEZWJ1ZyBjcmFzaDogQVNTRVJUSU9OIEZBSUxF RDogbV9vbmdvaW5nRmV0Y2hlcy5jb250YWlucyh0YXNrLmZldGNoSWRlbnRpZmllcigpKQpJbmRl eDogU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0F1eGlsaWFyeVByb2Nlc3NNYWMubW0J KHJldmlzaW9uIDI1OTM4NSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9BdXhpbGlhcnlQ cm9jZXNzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBACiAjaW1wb3J0IDxt YWNoL21hY2guaD4KICNpbXBvcnQgPG1hY2gvdGFzay5oPgogI2ltcG9ydCA8cGFsL2NyeXB0by9D cnlwdG9EaWdlc3QuaD4KKyNpbXBvcnQgPHBhbC9zcGkvY29jb2EvQ29yZVNlcnZpY2VzU1BJLmg+ CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL0xhdW5jaFNlcnZpY2VzU1BJLmg+CiAjaW1wb3J0IDxw d2QuaD4KICNpbXBvcnQgPHN0ZGxpYi5oPgpAQCAtNzIsMTMgKzczLDYgQEAgZW51bSBMU1Nlc3Np b25JRCB7CiB9OwogI2VuZGlmCiAKLXR5cGVkZWYgYm9vbCAoXkxTU2VydmVyQ29ubmVjdGlvbkFs bG93ZWRCbG9jaykgKCBDRkRpY3Rpb25hcnlSZWYgb3B0aW9uc1JlZiApOwotZXh0ZXJuICJDIiB2 b2lkIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz KHVpbnQ2NF90IGZsYWdzLCBMU1NlcnZlckNvbm5lY3Rpb25BbGxvd2VkQmxvY2sgYmxvY2spOwot ZXh0ZXJuICJDIiBDRkRpY3Rpb25hcnlSZWYgX0xTQXBwbGljYXRpb25DaGVja0luKExTU2Vzc2lv bklEIHNlc3Npb25JRCwgQ0ZEaWN0aW9uYXJ5UmVmIGFwcGxpY2F0aW9uSW5mbyk7Ci0jaWYgSEFW RShDU0NIRUNLRklYRElTQUJMRSkKLWV4dGVybiAiQyIgdm9pZCBfQ1NDaGVja0ZpeERpc2FibGUo KTsKLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29h Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW0JKHJldmlzaW9uIDI1OTM4NSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDcg QEAKICNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAjaW1wb3J0IDxwYWwvc3Bp L2NmL0NGVXRpbGl0aWVzU1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NnL0NvcmVHcmFwaGljc1NQ SS5oPgorI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9Db3JlU2VydmljZXNTUEkuaD4KICNpbXBvcnQg PHBhbC9zcGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvY29j b2EvTlNBY2Nlc3NpYmlsaXR5U1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL1F1YXJ0ekNv cmVTUEkuaD4KQEAgLTIzMCw2ICsyMzEsOCBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5p dGlhbGl6ZVdlYlByCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19OU1JV TkxPT1ApCiAgICAgLy8gTmVlZCB0byBpbml0aWFsaXplIGFjY2Vzc2liaWxpdHkgZm9yIFZvaWNl T3ZlciB0byB3b3JrIHdoZW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBpcyB1c2luZyBOU1J1bkxv b3AuCiAgICAgLy8gQ3VycmVudGx5LCBpdCBpcyBhbHNvIG5lZWRlZCB0byBhbGxvY2F0ZSBhbmQg aW5pdGlhbGl6ZSBhbiBOU0FwcGxpY2F0aW9uIG9iamVjdC4KKyAgICAvLyBUaGlzIG1ldGhvZCBj YWxsIHdpbGwgYWxzbyBjYWxsIFJlZ2lzdGVyQXBwbGljYXRpb24sIHNvIHRoZXJlIGlzIG5vIG5l ZWQgZm9yIHVzIHRvIGNhbGwgdGhpcyBvcgorICAgIC8vIGNoZWNrIGluIHdpdGggTGF1bmNoIFNl cnZpY2VzCiAgICAgW05TQXBwbGljYXRpb24gX2FjY2Vzc2liaWxpdHlJbml0aWFsaXplXTsKICNl bmRpZgogCkBAIC0yNzQsNyArMjc3LDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcgogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHko cGFyYW1ldGVycy5keW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXNbaV0pOwogI2VuZGlmCiAgICAg Ci0jaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKHBhcmFtZXRlcnMubmVIZWxwZXJFeHRlbnNp b25IYW5kbGUpCiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgq cGFyYW1ldGVycy5uZUhlbHBlckV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKHBhcmFtZXRlcnMu bmVTZXNzaW9uTWFuYWdlckV4dGVuc2lvbkhhbmRsZSkKQEAgLTI4NSwxOCArMjg3LDE1IEBAIHZv aWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKIAogICAgIGlmIChwYXJhbWV0 ZXJzLm1pbWVUeXBlc01hcCkKICAgICAgICAgb3ZlcnJpZGRlbk1pbWVUeXBlc01hcCgpID0gV1RG TW92ZShwYXJhbWV0ZXJzLm1pbWVUeXBlc01hcCk7Ci0jZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAgICAgUmVuZGVyVGhlbWVJT1M6OnNldENTU1ZhbHVlVG9TeXN0ZW1Db2xvck1h cChXVEZNb3ZlKHBhcmFtZXRlcnMuY3NzVmFsdWVUb1N5c3RlbUNvbG9yTWFwKSk7CiAgICAgUmVu ZGVyVGhlbWVJT1M6OnNldEZvY3VzUmluZ0NvbG9yKHBhcmFtZXRlcnMuZm9jdXNSaW5nQ29sb3Ip OwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDT0NPQSkKICAgICAvLyBGSVhNRSgyMDc3MTYpOiBU aGUgZm9sbG93aW5nIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhlIEdQVSBwcm9jZXNzIGlzIGNv bXBsZXRlLgogICAgIGZvciAoc2l6ZV90IGkgPSAwLCBzaXplID0gcGFyYW1ldGVycy5tZWRpYUV4 dGVuc2lvbkhhbmRsZXMuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKQogICAgICAgICBTYW5kYm94RXh0 ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5tZWRpYUV4dGVuc2lvbkhhbmRs ZXNbaV0pOwotI2VuZGlmCiAKICNpZiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkKICAgICBp ZiAocGFyYW1ldGVycy5wcmVmZXJlbmNlc0V4dGVuc2lvbkhhbmRsZSkgewpAQCAtMzQ1LDE0ICsz NDQsNiBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjCiB2b2lkIFdl YlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkKIHsKICNpZiBQTEFURk9STShNQUMpCi0gICAg c3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOwotICAgIHN0ZDo6Y2FsbF9vbmNlKAotICAg ICAgICBvbmNlRmxhZywKLSAgICAgICAgW3RoaXNdIHsKLSAgICAgICAgICAgIC8vIENoZWNraW5n IGluIHdpdGggTGF1bmNoIFNlcnZpY2VzIGlzIG5lY2Vzc2FyeSB0byBiZSBhYmxlIHRvIHNldCB0 aGUgcHJvY2VzcycgZGlzcGxheSBuYW1lLgotICAgICAgICAgICAgbGF1bmNoU2VydmljZXNDaGVj a0luKCk7Ci0gICAgfSk7Ci0KICAgICBOU1N0cmluZyAqYXBwbGljYXRpb25OYW1lOwogICAgIHN3 aXRjaCAobV9wcm9jZXNzVHlwZSkgewogICAgIGNhc2UgUHJvY2Vzc1R5cGU6Okluc3BlY3RvcjoK QEAgLTU0Niw2ICs1MzcsMTIgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVQ cm9jZQogI2lmIEhBVkUoQVBQX1NTTykKICAgICBbTlNVUkxTZXNzaW9uIF9kaXNhYmxlQXBwU1NP XTsKICNlbmRpZgorCisjaWYgSEFWRShDU0NIRUNLRklYRElTQUJMRSkKKyAgICAvLyBfQ1NDaGVj a0ZpeERpc2FibGUoKSBuZWVkcyB0byBiZSBjYWxsZWQgYmVmb3JlIGNoZWNraW5nIGluIHdpdGgg TGF1bmNoIFNlcnZpY2VzLiBUaGUgV2ViQ29udGVudCBwcm9jZXNzIGlzIGNoZWNraW5nIGluCisg ICAgLy8gd2l0aCBMYXVuY2ggU2VydmljZXMgaW4gV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHJvY2VzcyB3aGVuIGNhbGxpbmcgK1tOU0FwcGxpY2F0aW9uIF9hY2Nlc3NpYmlsaXR5 SW5pdGlhbGl6ZV0uCisgICAgX0NTQ2hlY2tGaXhEaXNhYmxlKCk7CisjZW5kaWYKIH0KIAogI2lm IFVTRShBUFBLSVQpCg==