200189 2019-07-26 19:14:59 -0700 Try fixing crash at com.apple.WebKit.Networking: NetworkProcess::setSharedHTTPCookieStorage 2019-07-29 17:22:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu beidson cdumez commit-queue ggaren rniwa webkit-bug-importer oldest_to_newest 1556326 0 sihui_liu 2019-07-26 19:14:59 -0700 <rdar://problem/41325767> 1556498 1 375064 sihui_liu 2019-07-28 23:24:30 -0700 Created attachment 375064 Patch 1556596 2 375064 cdumez 2019-07-29 09:56:24 -0700 Comment on attachment 375064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375064&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:624 > + swap(m_networkProcess, networkProcess); Indentation problem? Also, why swap instead of a WTFMove()? If you're right about the reason for the crash, wouldn't it mean that ensureNetworkProcess() is now likely to re-enter and re-construct m_networkProcess? 1556655 3 375092 sihui_liu 2019-07-29 12:42:54 -0700 Created attachment 375092 Patch 1556664 4 375092 cdumez 2019-07-29 13:06:00 -0700 Comment on attachment 375092 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375092&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:475 > + if (!RunLoop::isMain()) { Can we at lease add a ASSERT(RunLoop::isMain()); debug assertion? > Source/WebKit/UIProcess/WebProcessPool.cpp:476 > + callOnMainRunLoopAndWait([this] { I am not convinced |this| is guaranteed to still be alive by the time you get to the main runloop. We likely this to protect/ref it in the lambda. 1556665 5 sihui_liu 2019-07-29 13:11:06 -0700 (In reply to Chris Dumez from comment #4) > Comment on attachment 375092 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375092&action=review > > > Source/WebKit/UIProcess/WebProcessPool.cpp:475 > > + if (!RunLoop::isMain()) { > > Can we at lease add a ASSERT(RunLoop::isMain()); debug assertion? Okay. > > > Source/WebKit/UIProcess/WebProcessPool.cpp:476 > > + callOnMainRunLoopAndWait([this] { > > I am not convinced |this| is guaranteed to still be alive by the time you > get to the main runloop. We likely this to protect/ref it in the lambda. Will add. 1556666 6 375093 sihui_liu 2019-07-29 13:11:51 -0700 Created attachment 375093 Patch 1556669 7 375093 cdumez 2019-07-29 13:13:06 -0700 Comment on attachment 375093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375093&action=review r=me > Source/WebKit/UIProcess/WebProcessPool.cpp:476 > + if (!RunLoop::isMain()) { We may want to put in a comment explaining this is a temporary workaround for apps using our API on non-main threads. 1556680 8 375093 ggaren 2019-07-29 13:32:35 -0700 Comment on attachment 375093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375093&action=review >> Source/WebKit/UIProcess/WebProcessPool.cpp:476 >> + if (!RunLoop::isMain()) { > > We may want to put in a comment explaining this is a temporary workaround for apps using our API on non-main threads. Yes, let's please do that, with a link to a bug report. That way, future programmers have context, and will know under what conditions they can remove this / what they should test if they remove this. 1556736 9 sihui_liu 2019-07-29 15:03:13 -0700 (In reply to Geoffrey Garen from comment #8) > Comment on attachment 375093 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375093&action=review > > >> Source/WebKit/UIProcess/WebProcessPool.cpp:476 > >> + if (!RunLoop::isMain()) { > > > > We may want to put in a comment explaining this is a temporary workaround for apps using our API on non-main threads. > > Yes, let's please do that, with a link to a bug report. That way, future > programmers have context, and will know under what conditions they can > remove this / what they should test if they remove this. Sure, will add after the last bot turns green. 1556819 10 375127 sihui_liu 2019-07-29 16:54:34 -0700 Created attachment 375127 Patch for landing 1556841 11 375127 commit-queue 2019-07-29 17:21:51 -0700 Comment on attachment 375127 Patch for landing Clearing flags on attachment: 375127 Committed r247933: <https://trac.webkit.org/changeset/247933> 1556842 12 commit-queue 2019-07-29 17:21:52 -0700 All reviewed patches have been landed. Closing bug. 1556843 13 webkit-bug-importer 2019-07-29 17:22:15 -0700 <rdar://problem/53687367> 375064 2019-07-28 23:24:30 -0700 2019-07-29 12:42:52 -0700 Patch bug-200189-20190728232429.patch text/plain 3904 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3ODk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUyZmY3Yjg5YzJkYmIxZjUw MWQ0MDc3OTViMjJhODNiNzg0ODNkODIuLmNjOTc4MDljNjAyMjY0MjlkZWVjMmRjYjA1MDYxMDNk YzdlNzQxZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMjggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IGZpeGluZyBjcmFzaCBhdCBj b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmc6IE5ldHdvcmtQcm9jZXNzOjpzZXRTaGFyZWRIVFRQ Q29va2llU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAwMTg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTMyNTc2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaW5kaWNh dGVzIHRoYXQgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBhY2Nlc3NlZCBiZWZvcmUgYmVpbmcgc2V0 IGluIG5ldHdvcmsgcHJvY2Vzcy4gCisgICAgICAgIHNoYXJlZENvb2tpZVN0b3JhZ2UgaXMgc2V0 IGR1cmluZyB0aGUgcHJvY2Vzc2luZyBvZiBJbml0aWFsaXplTmV0d29ya1Byb2Nlc3MgbWVzc2Fn ZSwgYW5kIGFjY2Vzc2VzIHRvIAorICAgICAgICBzaGFyZWRDb29raWVTdG9yYWdlIGlzIHN1cHBv c2VkIHRvIGhhcHBlbiBhZnRlciB0aGF0LiBUaGVyZWZvcmUsIGl0IGlzIGxpa2VseSBzb21lIG1l c3NhZ2UgaXMgcmVjZWl2ZWQgYW5kIAorICAgICAgICBoYW5kbGVkIGJlZm9yZSBJbml0aWFsaXpl TmV0d29ya1Byb2Nlc3MuIAorCisgICAgICAgIE9uZSBwb3NzaWJsZSBleHBsYW5hdGlvbiBpcyBX ZWJLaXQgQVBJcyBnZXQgY2FsbGVkIG9uIGRpZmZlcmVudCB0aHJlYWRzLCBzbyB0aGF0IG1lc3Nh Z2UgaXMgc2VudCBpbiBiZXR3ZWVuIAorICAgICAgICBuZXR3b3JrIHByb2Nlc3MgZ2V0cyBsYXVu Y2hlZCAobV9uZXR3b3JrUHJvY2VzcyBpcyBzZXQpIGFuZCBJbml0aWFsaXplTmV0d29ya1Byb2Nl c3MgbWVzc2FnZSBpcyBzZW50LiBUbyBzb2x2ZSAKKyAgICAgICAgdGhpcyBpc3N1ZSwgd2UgY2Fu IGRlbGF5IHNldHRpbmcgb2YgbV9uZXR3b3JrUHJvY2VzcyB0byB1bnRpbCBJbml0aWFsaXplTmV0 d29ya1Byb2Nlc3MgaXMgc2VudCB0byBuZXR3b3JrIAorICAgICAgICBwcm9jZXNzLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAxOS0wNy0yNyAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IG1vcmUgc3lzY2FsbHMg aW4gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcycgc2FuZGJveCBwcm9maWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggZWU4NGFjZWI2MDI1MzdiODljYjhm NmYzYThlNjEyYmFiMmQ0YTk4Ny4uZDI5NzQ4YWJhMGZkOWE4NzE3Mzk4YjFiM2NlZTdhOGIzOWVi NTRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAt NDcyLDYgKzQ3Miw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNjcmVlblByb3BlcnRpZXNTdGF0 ZUNoYW5nZWQoKQogCiBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zdXJl TmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0aFdlYnNpdGVEYXRhU3RvcmUpCiB7 CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGlmIChtX25ldHdvcmtQcm9j ZXNzKSB7CiAgICAgICAgIGlmICh3aXRoV2Vic2l0ZURhdGFTdG9yZSkgewogICAgICAgICAgICAg bV9uZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vic2l0ZURhdGFTdG9y ZSkpOwpAQCAtNDgwLDcgKzQ4Miw3IEBAIE5ldHdvcmtQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQ b29sOjplbnN1cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3aXRoCiAgICAgICAg IHJldHVybiAqbV9uZXR3b3JrUHJvY2VzczsKICAgICB9CiAKLSAgICBtX25ldHdvcmtQcm9jZXNz ID0gc3RkOjptYWtlX3VuaXF1ZTxOZXR3b3JrUHJvY2Vzc1Byb3h5PigqdGhpcyk7CisgICAgYXV0 byBuZXR3b3JrUHJvY2VzcyA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya1Byb2Nlc3NQcm94eT4o KnRoaXMpOwogCiAgICAgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcGFyYW1ldGVy czsKIApAQCAtNTUyLDcgKzU1NCw3IEBAIE5ldHdvcmtQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQ b29sOjplbnN1cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3aXRoCiAgICAgICAg IHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGly ZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlKCktPndlYnNp dGVEYXRhU3RvcmUoKS5wYXJhbWV0ZXJzKCkuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5OwogICAg IAogICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9y eShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURp cmVjdG9yeSwgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0 YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotICAgIG1fbmV0d29ya1Byb2Nlc3MtPmNy ZWF0ZVN5bUxpbmtGb3JGaWxlVXBncmFkZShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSk7CisgICAgbmV0d29ya1Byb2Nlc3MtPmNy ZWF0ZVN5bUxpbmtGb3JGaWxlVXBncmFkZShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShT RVJWSUNFX1dPUktFUikKQEAgLTYxOCw3ICs2MjAsOCBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBX ZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0 aAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKHBhcmFtZXRlcnMpOwogCiAg ICAgLy8gSW5pdGlhbGl6ZSB0aGUgbmV0d29yayBwcm9jZXNzLgotICAgIG1fbmV0d29ya1Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpJbml0aWFsaXplTmV0d29ya1Byb2Nl c3MocGFyYW1ldGVycyksIDApOworICAgIG5ldHdvcmtQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpO ZXR3b3JrUHJvY2Vzczo6SW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKHBhcmFtZXRlcnMpLCAwKTsK KyAgICAgICAgc3dhcChtX25ldHdvcmtQcm9jZXNzLCBuZXR3b3JrUHJvY2Vzcyk7CiAKICAgICBp ZiAoV2ViUHJlZmVyZW5jZXM6OmFueVBhZ2VzQXJlVXNpbmdQcml2YXRlQnJvd3NpbmcoKSkKICAg ICAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OkFk ZFdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnM6OmxlZ2FjeVByaXZh dGVTZXNzaW9uUGFyYW1ldGVycygpKSwgMCk7Cg== 375092 2019-07-29 12:42:54 -0700 2019-07-29 13:11:50 -0700 Patch bug-200189-20190729124253.patch text/plain 5462 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhMDE1YjgxM2U5MzIzM2E2 ZjM5ZjhkZDE0ZjRmNTk0MjA0NWFhNmUuLmIxOWIwOWFkZTQxZWYxYjZhYjIwN2UzYzk3YTE1NGMw ZTJjYWVlODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMjkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IGZpeGluZyBjcmFzaCBhdCBj b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmc6IE5ldHdvcmtQcm9jZXNzOjpzZXRTaGFyZWRIVFRQ Q29va2llU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAwMTg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTMyNTc2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaW5kaWNh dGVzIHRoYXQgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBhY2Nlc3NlZCBiZWZvcmUgYmVpbmcgc2V0 IGluIG5ldHdvcmsgcHJvY2Vzcy4gCisgICAgICAgIHNoYXJlZENvb2tpZVN0b3JhZ2UgaXMgc2V0 IGR1cmluZyB0aGUgcHJvY2Vzc2luZyBvZiBJbml0aWFsaXplTmV0d29ya1Byb2Nlc3MgbWVzc2Fn ZSwgYW5kIGFjY2VzcyB0byAKKyAgICAgICAgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBzdXBwb3Nl ZCB0byBoYXBwZW4gYWZ0ZXIgdGhhdC4gVGhlcmVmb3JlLCBpdCBpcyBsaWtlbHkgc29tZSBtZXNz YWdlIGlzIHJlY2VpdmVkIGFuZCAKKyAgICAgICAgaGFuZGxlZCBiZWZvcmUgSW5pdGlhbGl6ZU5l dHdvcmtQcm9jZXNzLiAKKyAKKyAgICAgICAgT25lIHBvc3NpYmxlIGV4cGxhbmF0aW9uIGlzIFdl YktpdCBBUElzIGdldCBjYWxsZWQgb24gZGlmZmVyZW50IHRocmVhZHMuIEJlY2F1c2Ugb2YgdGhl IHJhY2UgaW4gY2hlY2tpbmcgYW5kIAorICAgICAgICBzZXR0aW5nIG1fbmV0d29ya1Byb2Nlc3Ms IHNvbWUgbWVzc2FnZSBpcyBzZW50IGJldHdlZW4gbmV0d29yayBwcm9jZXNzIGdldHMgbGF1bmNo ZWQgKG1fbmV0d29ya1Byb2Nlc3MgaXMgc2V0KSAKKyAgICAgICAgYW5kIEluaXRpYWxpemVOZXR3 b3JrUHJvY2VzcyBtZXNzYWdlIGlzIHNlbnQuIFRvIG1pdGlnYXRlIHRoaXMgaXNzdWUsIHdlIG1h a2Ugc3VyZSBtX25ldHdvcmtQcm9jZXNzIGlzIHNldCBvbmx5CisgICAgICAgIGluIHRoZSBtYWlu IHJ1bmxvb3AgYW5kIG9ubHkgYWZ0ZXIgSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzIGlzIHNlbnQu IAorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAxOS0wNy0y OSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVSSBw cm9jZXNzIG9jY2FzaW9uYWxseSBoYW5ncyBpbiAtW1VJS2V5Ym9hcmRUYXNrUXVldWUgbG9ja1do ZW5SZWFkeUZvck1haW5UaHJlYWRdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAKaW5kZXggZWU4NGFjZWI2MDI1MzdiODljYjhmNmYzYThlNjEyYmFiMmQ0YTk4Ny4u NTIyYWE2Y2VmODI1YzNhZWE4MDdlYzYzZWIxZjUxZGNhNDJlNTUzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtNDcyLDYgKzQ3MiwxMyBAQCB2b2lk IFdlYlByb2Nlc3NQb29sOjpzY3JlZW5Qcm9wZXJ0aWVzU3RhdGVDaGFuZ2VkKCkKIAogTmV0d29y a1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKFdlYnNp dGVEYXRhU3RvcmUqIHdpdGhXZWJzaXRlRGF0YVN0b3JlKQogeworICAgIGlmICghUnVuTG9vcDo6 aXNNYWluKCkpIHsKKyAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFt0aGlzXSB7Cisg ICAgICAgICAgICBlbnN1cmVOZXR3b3JrUHJvY2VzcygpOworICAgICAgICB9KTsKKyAgICAgICAg cmV0dXJuICptX25ldHdvcmtQcm9jZXNzOworICAgIH0KKwogICAgIGlmIChtX25ldHdvcmtQcm9j ZXNzKSB7CiAgICAgICAgIGlmICh3aXRoV2Vic2l0ZURhdGFTdG9yZSkgewogICAgICAgICAgICAg bV9uZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vic2l0ZURhdGFTdG9y ZSkpOwpAQCAtNDgwLDcgKzQ4Nyw3IEBAIE5ldHdvcmtQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQ b29sOjplbnN1cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3aXRoCiAgICAgICAg IHJldHVybiAqbV9uZXR3b3JrUHJvY2VzczsKICAgICB9CiAKLSAgICBtX25ldHdvcmtQcm9jZXNz ID0gc3RkOjptYWtlX3VuaXF1ZTxOZXR3b3JrUHJvY2Vzc1Byb3h5PigqdGhpcyk7CisgICAgYXV0 byBuZXR3b3JrUHJvY2VzcyA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya1Byb2Nlc3NQcm94eT4o KnRoaXMpOwogCiAgICAgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcGFyYW1ldGVy czsKIApAQCAtNTUyLDcgKzU1OSw3IEBAIE5ldHdvcmtQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQ b29sOjplbnN1cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3aXRoCiAgICAgICAg IHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGly ZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlKCktPndlYnNp dGVEYXRhU3RvcmUoKS5wYXJhbWV0ZXJzKCkuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5OwogICAg IAogICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9y eShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFzZURp cmVjdG9yeSwgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0 YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotICAgIG1fbmV0d29ya1Byb2Nlc3MtPmNy ZWF0ZVN5bUxpbmtGb3JGaWxlVXBncmFkZShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSk7CisgICAgbmV0d29ya1Byb2Nlc3MtPmNy ZWF0ZVN5bUxpbmtGb3JGaWxlVXBncmFkZShwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShT RVJWSUNFX1dPUktFUikKQEAgLTYxOCwzMSArNjI1LDMyIEBAIE5ldHdvcmtQcm9jZXNzUHJveHkm IFdlYlByb2Nlc3NQb29sOjplbnN1cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3 aXRoCiAgICAgcGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MocGFyYW1ldGVycyk7CiAK ICAgICAvLyBJbml0aWFsaXplIHRoZSBuZXR3b3JrIHByb2Nlc3MuCi0gICAgbV9uZXR3b3JrUHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OkluaXRpYWxpemVOZXR3b3JrUHJv Y2VzcyhwYXJhbWV0ZXJzKSwgMCk7CisgICAgbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 Ok5ldHdvcmtQcm9jZXNzOjpJbml0aWFsaXplTmV0d29ya1Byb2Nlc3MocGFyYW1ldGVycyksIDAp OwogCiAgICAgaWYgKFdlYlByZWZlcmVuY2VzOjphbnlQYWdlc0FyZVVzaW5nUHJpdmF0ZUJyb3dz aW5nKCkpCi0gICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQ cm9jZXNzOjpBZGRXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzOjps ZWdhY3lQcml2YXRlU2Vzc2lvblBhcmFtZXRlcnMoKSksIDApOworICAgICAgICBuZXR3b3JrUHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OkFkZFdlYnNpdGVEYXRhU3RvcmUo V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnM6OmxlZ2FjeVByaXZhdGVTZXNzaW9uUGFyYW1ldGVy cygpKSwgMCk7CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICBtX25ldHdvcmtQcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6U2V0UU9TKG5ldHdvcmtQcm9jZXNzTGF0ZW5j eVFPUygpLCBuZXR3b3JrUHJvY2Vzc1Rocm91Z2hwdXRRT1MoKSksIDApOworICAgIG5ldHdvcmtQ cm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6U2V0UU9TKG5ldHdvcmtQcm9j ZXNzTGF0ZW5jeVFPUygpLCBuZXR3b3JrUHJvY2Vzc1Rocm91Z2hwdXRRT1MoKSksIDApOwogI2Vu ZGlmCiAKICAgICBpZiAobV9kaWROZXR3b3JrUHJvY2Vzc0NyYXNoKSB7CiAgICAgICAgIG1fZGlk TmV0d29ya1Byb2Nlc3NDcmFzaCA9IGZhbHNlOwotICAgICAgICByZWluc3RhdGVOZXR3b3JrUHJv Y2Vzc0Fzc2VydGlvblN0YXRlKCptX25ldHdvcmtQcm9jZXNzKTsKKyAgICAgICAgcmVpbnN0YXRl TmV0d29ya1Byb2Nlc3NBc3NlcnRpb25TdGF0ZSgqbmV0d29ya1Byb2Nlc3MpOwogICAgIH0KIAog ICAgIGlmICh3aXRoV2Vic2l0ZURhdGFTdG9yZSkgewotICAgICAgICBtX25ldHdvcmtQcm9jZXNz LT5hZGRTZXNzaW9uKG1ha2VSZWYoKndpdGhXZWJzaXRlRGF0YVN0b3JlKSk7CisgICAgICAgIG5l dHdvcmtQcm9jZXNzLT5hZGRTZXNzaW9uKG1ha2VSZWYoKndpdGhXZWJzaXRlRGF0YVN0b3JlKSk7 CiAgICAgICAgIHdpdGhXZWJzaXRlRGF0YVN0b3JlLT5jbGVhclBlbmRpbmdDb29raWVzKCk7CiAg ICAgfQogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBuZXR3b3JrIHByb2Nlc3Mga25vd3MgYWJvdXQg YWxsIHRoZSBzZXNzaW9ucyB0aGF0IGhhdmUgYmVlbiByZWdpc3RlcmVkIGJlZm9yZSBpdCBzdGFy dGVkLgogICAgIGZvciAoYXV0byYgc2Vzc2lvbklEIDogbV9zZXNzaW9uVG9QYWdlSURzTWFwLmtl eXMoKSkgewogICAgICAgICBpZiAoYXV0byogd2Vic2l0ZURhdGFTdG9yZSA9IFdlYnNpdGVEYXRh U3RvcmU6OmV4aXN0aW5nTm9uRGVmYXVsdERhdGFTdG9yZUZvclNlc3Npb25JRChzZXNzaW9uSUQp KQotICAgICAgICAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbigqd2Vic2l0ZURhdGFT dG9yZSk7CisgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbigqd2Vic2l0ZURh dGFTdG9yZSk7CiAgICAgfQogCisgICAgbV9uZXR3b3JrUHJvY2VzcyA9IFdURk1vdmUobmV0d29y a1Byb2Nlc3MpOwogICAgIHJldHVybiAqbV9uZXR3b3JrUHJvY2VzczsKIH0KIAo= 375093 2019-07-29 13:11:51 -0700 2019-07-29 16:54:33 -0700 Patch bug-200189-20190729131150.patch text/plain 5526 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhMDE1YjgxM2U5MzIzM2E2 ZjM5ZjhkZDE0ZjRmNTk0MjA0NWFhNmUuLmIxOWIwOWFkZTQxZWYxYjZhYjIwN2UzYzk3YTE1NGMw ZTJjYWVlODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMjkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IGZpeGluZyBjcmFzaCBhdCBj b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmc6IE5ldHdvcmtQcm9jZXNzOjpzZXRTaGFyZWRIVFRQ Q29va2llU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAwMTg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTMyNTc2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaW5kaWNh dGVzIHRoYXQgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBhY2Nlc3NlZCBiZWZvcmUgYmVpbmcgc2V0 IGluIG5ldHdvcmsgcHJvY2Vzcy4gCisgICAgICAgIHNoYXJlZENvb2tpZVN0b3JhZ2UgaXMgc2V0 IGR1cmluZyB0aGUgcHJvY2Vzc2luZyBvZiBJbml0aWFsaXplTmV0d29ya1Byb2Nlc3MgbWVzc2Fn ZSwgYW5kIGFjY2VzcyB0byAKKyAgICAgICAgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBzdXBwb3Nl ZCB0byBoYXBwZW4gYWZ0ZXIgdGhhdC4gVGhlcmVmb3JlLCBpdCBpcyBsaWtlbHkgc29tZSBtZXNz YWdlIGlzIHJlY2VpdmVkIGFuZCAKKyAgICAgICAgaGFuZGxlZCBiZWZvcmUgSW5pdGlhbGl6ZU5l dHdvcmtQcm9jZXNzLiAKKyAKKyAgICAgICAgT25lIHBvc3NpYmxlIGV4cGxhbmF0aW9uIGlzIFdl YktpdCBBUElzIGdldCBjYWxsZWQgb24gZGlmZmVyZW50IHRocmVhZHMuIEJlY2F1c2Ugb2YgdGhl IHJhY2UgaW4gY2hlY2tpbmcgYW5kIAorICAgICAgICBzZXR0aW5nIG1fbmV0d29ya1Byb2Nlc3Ms IHNvbWUgbWVzc2FnZSBpcyBzZW50IGJldHdlZW4gbmV0d29yayBwcm9jZXNzIGdldHMgbGF1bmNo ZWQgKG1fbmV0d29ya1Byb2Nlc3MgaXMgc2V0KSAKKyAgICAgICAgYW5kIEluaXRpYWxpemVOZXR3 b3JrUHJvY2VzcyBtZXNzYWdlIGlzIHNlbnQuIFRvIG1pdGlnYXRlIHRoaXMgaXNzdWUsIHdlIG1h a2Ugc3VyZSBtX25ldHdvcmtQcm9jZXNzIGlzIHNldCBvbmx5CisgICAgICAgIGluIHRoZSBtYWlu IHJ1bmxvb3AgYW5kIG9ubHkgYWZ0ZXIgSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzIGlzIHNlbnQu IAorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAxOS0wNy0y OSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVSSBw cm9jZXNzIG9jY2FzaW9uYWxseSBoYW5ncyBpbiAtW1VJS2V5Ym9hcmRUYXNrUXVldWUgbG9ja1do ZW5SZWFkeUZvck1haW5UaHJlYWRdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAKaW5kZXggZWU4NGFjZWI2MDI1MzdiODljYjhmNmYzYThlNjEyYmFiMmQ0YTk4Ny4u NWZhY2QwY2U2NjRkNWM1MWJmNmNmYzdiYjU5ODhlODUyMGI3YjcwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtNDcyLDYgKzQ3MiwxNCBAQCB2b2lk IFdlYlByb2Nlc3NQb29sOjpzY3JlZW5Qcm9wZXJ0aWVzU3RhdGVDaGFuZ2VkKCkKIAogTmV0d29y a1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKFdlYnNp dGVEYXRhU3RvcmUqIHdpdGhXZWJzaXRlRGF0YVN0b3JlKQogeworICAgIEFTU0VSVChSdW5Mb29w Ojppc01haW4oKSk7CisgICAgaWYgKCFSdW5Mb29wOjppc01haW4oKSkgeworICAgICAgICBjYWxs T25NYWluUnVuTG9vcEFuZFdhaXQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KV0geworICAgICAgICAgICAgZW5zdXJlTmV0d29ya1Byb2Nlc3MoKTsKKyAgICAgICAgfSk7Cisg ICAgICAgIHJldHVybiAqbV9uZXR3b3JrUHJvY2VzczsKKyAgICB9CisKICAgICBpZiAobV9uZXR3 b3JrUHJvY2VzcykgewogICAgICAgICBpZiAod2l0aFdlYnNpdGVEYXRhU3RvcmUpIHsKICAgICAg ICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmFkZFNlc3Npb24obWFrZVJlZigqd2l0aFdlYnNpdGVE YXRhU3RvcmUpKTsKQEAgLTQ4MCw3ICs0ODgsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQ cm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0aAog ICAgICAgICByZXR1cm4gKm1fbmV0d29ya1Byb2Nlc3M7CiAgICAgfQogCi0gICAgbV9uZXR3b3Jr UHJvY2VzcyA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya1Byb2Nlc3NQcm94eT4oKnRoaXMpOwor ICAgIGF1dG8gbmV0d29ya1Byb2Nlc3MgPSBzdGQ6Om1ha2VfdW5pcXVlPE5ldHdvcmtQcm9jZXNz UHJveHk+KCp0aGlzKTsKIAogICAgIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHBh cmFtZXRlcnM7CiAKQEAgLTU1Miw3ICs1NjAsNyBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQ cm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0aAog ICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmluZGV4ZWREYXRh YmFzZURpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZSgp LT53ZWJzaXRlRGF0YVN0b3JlKCkucGFyYW1ldGVycygpLmluZGV4ZWREYXRhYmFzZURpcmVjdG9y eTsKICAgICAKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3JpdGVE aXJlY3RvcnkocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0 YWJhc2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMuaW5k ZXhlZERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICBtX25ldHdvcmtQcm9j ZXNzLT5jcmVhdGVTeW1MaW5rRm9yRmlsZVVwZ3JhZGUocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0 b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkpOworICAgIG5ldHdvcmtQcm9j ZXNzLT5jcmVhdGVTeW1MaW5rRm9yRmlsZVVwZ3JhZGUocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0 b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkpOwogI2VuZGlmCiAKICNpZiBF TkFCTEUoU0VSVklDRV9XT1JLRVIpCkBAIC02MTgsMzEgKzYyNiwzMiBAQCBOZXR3b3JrUHJvY2Vz c1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFT dG9yZSogd2l0aAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKHBhcmFtZXRl cnMpOwogCiAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgbmV0d29yayBwcm9jZXNzLgotICAgIG1fbmV0 d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpJbml0aWFsaXplTmV0 d29ya1Byb2Nlc3MocGFyYW1ldGVycyksIDApOworICAgIG5ldHdvcmtQcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6SW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKHBhcmFtZXRl cnMpLCAwKTsKIAogICAgIGlmIChXZWJQcmVmZXJlbmNlczo6YW55UGFnZXNBcmVVc2luZ1ByaXZh dGVCcm93c2luZygpKQotICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpO ZXR3b3JrUHJvY2Vzczo6QWRkV2Vic2l0ZURhdGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlUGFyYW1l dGVyczo6bGVnYWN5UHJpdmF0ZVNlc3Npb25QYXJhbWV0ZXJzKCkpLCAwKTsKKyAgICAgICAgbmV0 d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpBZGRXZWJzaXRlRGF0 YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzOjpsZWdhY3lQcml2YXRlU2Vzc2lvblBh cmFtZXRlcnMoKSksIDApOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgbV9uZXR3b3JrUHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFFPUyhuZXR3b3JrUHJvY2Vz c0xhdGVuY3lRT1MoKSwgbmV0d29ya1Byb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAwKTsKKyAgICBu ZXR3b3JrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFFPUyhuZXR3 b3JrUHJvY2Vzc0xhdGVuY3lRT1MoKSwgbmV0d29ya1Byb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAw KTsKICNlbmRpZgogCiAgICAgaWYgKG1fZGlkTmV0d29ya1Byb2Nlc3NDcmFzaCkgewogICAgICAg ICBtX2RpZE5ldHdvcmtQcm9jZXNzQ3Jhc2ggPSBmYWxzZTsKLSAgICAgICAgcmVpbnN0YXRlTmV0 d29ya1Byb2Nlc3NBc3NlcnRpb25TdGF0ZSgqbV9uZXR3b3JrUHJvY2Vzcyk7CisgICAgICAgIHJl aW5zdGF0ZU5ldHdvcmtQcm9jZXNzQXNzZXJ0aW9uU3RhdGUoKm5ldHdvcmtQcm9jZXNzKTsKICAg ICB9CiAKICAgICBpZiAod2l0aFdlYnNpdGVEYXRhU3RvcmUpIHsKLSAgICAgICAgbV9uZXR3b3Jr UHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vic2l0ZURhdGFTdG9yZSkpOworICAg ICAgICBuZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vic2l0ZURhdGFT dG9yZSkpOwogICAgICAgICB3aXRoV2Vic2l0ZURhdGFTdG9yZS0+Y2xlYXJQZW5kaW5nQ29va2ll cygpOwogICAgIH0KIAogICAgIC8vIE1ha2Ugc3VyZSB0aGUgbmV0d29yayBwcm9jZXNzIGtub3dz IGFib3V0IGFsbCB0aGUgc2Vzc2lvbnMgdGhhdCBoYXZlIGJlZW4gcmVnaXN0ZXJlZCBiZWZvcmUg aXQgc3RhcnRlZC4KICAgICBmb3IgKGF1dG8mIHNlc3Npb25JRCA6IG1fc2Vzc2lvblRvUGFnZUlE c01hcC5rZXlzKCkpIHsKICAgICAgICAgaWYgKGF1dG8qIHdlYnNpdGVEYXRhU3RvcmUgPSBXZWJz aXRlRGF0YVN0b3JlOjpleGlzdGluZ05vbkRlZmF1bHREYXRhU3RvcmVGb3JTZXNzaW9uSUQoc2Vz c2lvbklEKSkKLSAgICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmFkZFNlc3Npb24oKndlYnNp dGVEYXRhU3RvcmUpOworICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3MtPmFkZFNlc3Npb24oKndl YnNpdGVEYXRhU3RvcmUpOwogICAgIH0KIAorICAgIG1fbmV0d29ya1Byb2Nlc3MgPSBXVEZNb3Zl KG5ldHdvcmtQcm9jZXNzKTsKICAgICByZXR1cm4gKm1fbmV0d29ya1Byb2Nlc3M7CiB9CiAK 375127 2019-07-29 16:54:34 -0700 2019-07-29 17:21:51 -0700 Patch for landing bug-200189-20190729165433.patch text/plain 5763 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhMDE1YjgxM2U5MzIzM2E2 ZjM5ZjhkZDE0ZjRmNTk0MjA0NWFhNmUuLmViY2M3MTUyMzczMjJjMmUwNGExNGNlYzYyM2IzMjdl ZTUyNmY3YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDctMjkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IGZpeGluZyBjcmFzaCBhdCBj b20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmc6IE5ldHdvcmtQcm9jZXNzOjpzZXRTaGFyZWRIVFRQ Q29va2llU3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAwMTg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTMyNTc2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBUaGUgY3Jhc2ggaW5kaWNhdGVz IHRoYXQgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBhY2Nlc3NlZCBiZWZvcmUgYmVpbmcgc2V0IGlu IG5ldHdvcmsgcHJvY2Vzcy4gCisgICAgICAgIHNoYXJlZENvb2tpZVN0b3JhZ2UgaXMgc2V0IGR1 cmluZyB0aGUgcHJvY2Vzc2luZyBvZiBJbml0aWFsaXplTmV0d29ya1Byb2Nlc3MgbWVzc2FnZSwg YW5kIGFjY2VzcyB0byAKKyAgICAgICAgc2hhcmVkQ29va2llU3RvcmFnZSBpcyBzdXBwb3NlZCB0 byBoYXBwZW4gYWZ0ZXIgdGhhdC4gVGhlcmVmb3JlLCBpdCBpcyBsaWtlbHkgc29tZSBtZXNzYWdl IGlzIHJlY2VpdmVkIGFuZCAKKyAgICAgICAgaGFuZGxlZCBiZWZvcmUgSW5pdGlhbGl6ZU5ldHdv cmtQcm9jZXNzLiAKKyAKKyAgICAgICAgT25lIHBvc3NpYmxlIGV4cGxhbmF0aW9uIGlzIFdlYktp dCBBUElzIGdldCBjYWxsZWQgb24gZGlmZmVyZW50IHRocmVhZHMuIEJlY2F1c2Ugb2YgdGhlIHJh Y2UgaW4gY2hlY2tpbmcgYW5kIAorICAgICAgICBzZXR0aW5nIG1fbmV0d29ya1Byb2Nlc3MsIHNv bWUgbWVzc2FnZSBpcyBzZW50IGJldHdlZW4gbmV0d29yayBwcm9jZXNzIGdldHMgbGF1bmNoZWQg KG1fbmV0d29ya1Byb2Nlc3MgaXMgc2V0KSAKKyAgICAgICAgYW5kIEluaXRpYWxpemVOZXR3b3Jr UHJvY2VzcyBtZXNzYWdlIGlzIHNlbnQuIFRvIG1pdGlnYXRlIHRoaXMgaXNzdWUsIHdlIG1ha2Ug c3VyZSBtX25ldHdvcmtQcm9jZXNzIGlzIHNldCBvbmx5CisgICAgICAgIGluIHRoZSBtYWluIHJ1 bmxvb3AgYW5kIG9ubHkgYWZ0ZXIgSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzIGlzIHNlbnQuIAor CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKwogMjAxOS0wNy0yOSAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVSSBwcm9j ZXNzIG9jY2FzaW9uYWxseSBoYW5ncyBpbiAtW1VJS2V5Ym9hcmRUYXNrUXVldWUgbG9ja1doZW5S ZWFkeUZvck1haW5UaHJlYWRdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHAKaW5kZXggZWU4NGFjZWI2MDI1MzdiODljYjhmNmYzYThlNjEyYmFiMmQ0YTk4Ny4uN2Ni NGYxMTRiZmE4MjU3YWRjMmM0NGI4YzcyZjkyZmZmNGQ0YTAxYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtNDcyLDYgKzQ3MiwxOCBAQCB2b2lkIFdl YlByb2Nlc3NQb29sOjpzY3JlZW5Qcm9wZXJ0aWVzU3RhdGVDaGFuZ2VkKCkKIAogTmV0d29ya1By b2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKFdlYnNpdGVE YXRhU3RvcmUqIHdpdGhXZWJzaXRlRGF0YVN0b3JlKQogeworICAgIEFTU0VSVChSdW5Mb29wOjpp c01haW4oKSk7CisgICAgCisgICAgLy8gRklYTUU6IFRoaXMgaXMgYSB0ZW1wb3Jhcnkgd29ya2Fy b3VuZCBmb3IgYXBwcyB1c2luZyBXZWJLaXQgQVBJIG9uIG5vbi1tYWluIHRocmVhZHMuCisgICAg Ly8gV2Ugc2hvdWxkIHJlbW92ZSB0aGlzIG9uY2Ugd2UgZW5mb3JjZSB0aHJlYWRpbmcgdmlvbGF0 aW9uIGNoZWNrIG9uIG91ciBBUElzLgorICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDAyNDYuCisgICAgaWYgKCFSdW5Mb29wOjppc01haW4oKSkgeworICAg ICAgICBjYWxsT25NYWluUnVuTG9vcEFuZFdhaXQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKV0geworICAgICAgICAgICAgZW5zdXJlTmV0d29ya1Byb2Nlc3MoKTsKKyAgICAg ICAgfSk7CisgICAgICAgIHJldHVybiAqbV9uZXR3b3JrUHJvY2VzczsKKyAgICB9CisKICAgICBp ZiAobV9uZXR3b3JrUHJvY2VzcykgewogICAgICAgICBpZiAod2l0aFdlYnNpdGVEYXRhU3RvcmUp IHsKICAgICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmFkZFNlc3Npb24obWFrZVJlZigqd2l0 aFdlYnNpdGVEYXRhU3RvcmUpKTsKQEAgLTQ4MCw3ICs0OTIsNyBAQCBOZXR3b3JrUHJvY2Vzc1By b3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9y ZSogd2l0aAogICAgICAgICByZXR1cm4gKm1fbmV0d29ya1Byb2Nlc3M7CiAgICAgfQogCi0gICAg bV9uZXR3b3JrUHJvY2VzcyA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya1Byb2Nlc3NQcm94eT4o KnRoaXMpOworICAgIGF1dG8gbmV0d29ya1Byb2Nlc3MgPSBzdGQ6Om1ha2VfdW5pcXVlPE5ldHdv cmtQcm9jZXNzUHJveHk+KCp0aGlzKTsKIAogICAgIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzIHBhcmFtZXRlcnM7CiAKQEAgLTU1Miw3ICs1NjQsNyBAQCBOZXR3b3JrUHJvY2Vzc1By b3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9y ZSogd2l0aAogICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLmlu ZGV4ZWREYXRhYmFzZURpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERh dGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkucGFyYW1ldGVycygpLmluZGV4ZWREYXRhYmFz ZURpcmVjdG9yeTsKICAgICAKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JS ZWFkV3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5p bmRleGVkRGF0YWJhc2VEaXJlY3RvcnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICBtX25l dHdvcmtQcm9jZXNzLT5jcmVhdGVTeW1MaW5rRm9yRmlsZVVwZ3JhZGUocGFyYW1ldGVycy5kZWZh dWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkpOworICAgIG5l dHdvcmtQcm9jZXNzLT5jcmVhdGVTeW1MaW5rRm9yRmlsZVVwZ3JhZGUocGFyYW1ldGVycy5kZWZh dWx0RGF0YVN0b3JlUGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkpOwogI2VuZGlm CiAKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCkBAIC02MTgsMzEgKzYzMCwzMiBAQCBOZXR3 b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vi c2l0ZURhdGFTdG9yZSogd2l0aAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNz KHBhcmFtZXRlcnMpOwogCiAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgbmV0d29yayBwcm9jZXNzLgot ICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpJbml0 aWFsaXplTmV0d29ya1Byb2Nlc3MocGFyYW1ldGVycyksIDApOworICAgIG5ldHdvcmtQcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6SW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNz KHBhcmFtZXRlcnMpLCAwKTsKIAogICAgIGlmIChXZWJQcmVmZXJlbmNlczo6YW55UGFnZXNBcmVV c2luZ1ByaXZhdGVCcm93c2luZygpKQotICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6QWRkV2Vic2l0ZURhdGFTdG9yZShXZWJzaXRlRGF0YVN0 b3JlUGFyYW1ldGVyczo6bGVnYWN5UHJpdmF0ZVNlc3Npb25QYXJhbWV0ZXJzKCkpLCAwKTsKKyAg ICAgICAgbmV0d29ya1Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpBZGRX ZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzOjpsZWdhY3lQcml2YXRl U2Vzc2lvblBhcmFtZXRlcnMoKSksIDApOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgbV9u ZXR3b3JrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFFPUyhuZXR3 b3JrUHJvY2Vzc0xhdGVuY3lRT1MoKSwgbmV0d29ya1Byb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAw KTsKKyAgICBuZXR3b3JrUHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNl dFFPUyhuZXR3b3JrUHJvY2Vzc0xhdGVuY3lRT1MoKSwgbmV0d29ya1Byb2Nlc3NUaHJvdWdocHV0 UU9TKCkpLCAwKTsKICNlbmRpZgogCiAgICAgaWYgKG1fZGlkTmV0d29ya1Byb2Nlc3NDcmFzaCkg ewogICAgICAgICBtX2RpZE5ldHdvcmtQcm9jZXNzQ3Jhc2ggPSBmYWxzZTsKLSAgICAgICAgcmVp bnN0YXRlTmV0d29ya1Byb2Nlc3NBc3NlcnRpb25TdGF0ZSgqbV9uZXR3b3JrUHJvY2Vzcyk7Cisg ICAgICAgIHJlaW5zdGF0ZU5ldHdvcmtQcm9jZXNzQXNzZXJ0aW9uU3RhdGUoKm5ldHdvcmtQcm9j ZXNzKTsKICAgICB9CiAKICAgICBpZiAod2l0aFdlYnNpdGVEYXRhU3RvcmUpIHsKLSAgICAgICAg bV9uZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vic2l0ZURhdGFTdG9y ZSkpOworICAgICAgICBuZXR3b3JrUHJvY2Vzcy0+YWRkU2Vzc2lvbihtYWtlUmVmKCp3aXRoV2Vi c2l0ZURhdGFTdG9yZSkpOwogICAgICAgICB3aXRoV2Vic2l0ZURhdGFTdG9yZS0+Y2xlYXJQZW5k aW5nQ29va2llcygpOwogICAgIH0KIAogICAgIC8vIE1ha2Ugc3VyZSB0aGUgbmV0d29yayBwcm9j ZXNzIGtub3dzIGFib3V0IGFsbCB0aGUgc2Vzc2lvbnMgdGhhdCBoYXZlIGJlZW4gcmVnaXN0ZXJl ZCBiZWZvcmUgaXQgc3RhcnRlZC4KICAgICBmb3IgKGF1dG8mIHNlc3Npb25JRCA6IG1fc2Vzc2lv blRvUGFnZUlEc01hcC5rZXlzKCkpIHsKICAgICAgICAgaWYgKGF1dG8qIHdlYnNpdGVEYXRhU3Rv cmUgPSBXZWJzaXRlRGF0YVN0b3JlOjpleGlzdGluZ05vbkRlZmF1bHREYXRhU3RvcmVGb3JTZXNz aW9uSUQoc2Vzc2lvbklEKSkKLSAgICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmFkZFNlc3Np b24oKndlYnNpdGVEYXRhU3RvcmUpOworICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3MtPmFkZFNl c3Npb24oKndlYnNpdGVEYXRhU3RvcmUpOwogICAgIH0KIAorICAgIG1fbmV0d29ya1Byb2Nlc3Mg PSBXVEZNb3ZlKG5ldHdvcmtQcm9jZXNzKTsKICAgICByZXR1cm4gKm1fbmV0d29ya1Byb2Nlc3M7 CiB9CiAK