234569 2021-12-21 10:40:11 -0800 Don't create LocalStorage database for read if it does not exist 2021-12-23 17:51:18 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen beidson webkit-bug-importer youennf oldest_to_newest 1826045 0 sihui_liu 2021-12-21 10:40:11 -0800 ... 1826052 1 447734 sihui_liu 2021-12-21 10:45:21 -0800 Created attachment 447734 Patch 1826568 2 447734 achristensen 2021-12-23 10:22:39 -0800 Comment on attachment 447734 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447734&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStorageDatabaseTracker.mm:35 > +static NSString *expectedMessage; Add an ivar to LocalStorageUIDelegate instead of a new static global, which I've been working to remove in TestWebKitAPI. [[LocalStorageUIDelegate alloc] initWithExpectedMessage:@"testValue"] 1826665 3 447918 sihui_liu 2021-12-23 16:40:34 -0800 Created attachment 447918 Patch for landing 1826670 4 447921 sihui_liu 2021-12-23 16:55:39 -0800 Created attachment 447921 Patch for landing 1826676 5 ews-feeder 2021-12-23 17:50:35 -0800 Committed r287418 (245553@main): <https://commits.webkit.org/245553@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447921. 1826677 6 webkit-bug-importer 2021-12-23 17:51:18 -0800 <rdar://problem/86870643> 447734 2021-12-21 10:45:21 -0800 2021-12-23 16:40:32 -0800 Patch bug-234569-20211221104521.patch text/plain 9632 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk0OTU1MTlmZTk5YzNjZDFl Y2U0MTI2NjI0MjdiODAxYmFmZWRlZDguLjhlYTA3MzQxMjU3Yjc4NWIyZDJhODE1YmE2NjI0OWEw MmQwNDgwZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMTItMjEgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY3JlYXRlIExvY2FsU3Rv cmFnZSBkYXRhYmFzZSBmb3IgcmVhZCBpZiBpdCBkb2VzIG5vdCBleGlzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgZGF0YWJhc2UgZG9lcyBub3Qg ZXhpc3RzIHdoZW4gcmVhZCwgd2UgY2FuIHJldHVybiBlbXB0eSBvciBudWxsLCBpbnN0ZWFkIG9m IGNyZWF0aW5nIGFuIGVtcHR5IGRhdGFiYXNlLgorCisgICAgICAgIE5ldyBBUEkgdGVzdDogV0tX ZWJWaWV3LkxvY2FsU3RvcmFnZU5vUmVjb3JkQWZ0ZXJHZXRJdGVtCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VBcmVhLmNwcDoKKyAgICAgICAgKFdlYktp dDo6U1FMaXRlU3RvcmFnZUFyZWE6OmlzRW1wdHkpOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVT dG9yYWdlQXJlYTo6cHJlcGFyZURhdGFiYXNlKToKKyAgICAgICAgKFdlYktpdDo6U1FMaXRlU3Rv cmFnZUFyZWE6OmdldEl0ZW1Gcm9tRGF0YWJhc2UpOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVT dG9yYWdlQXJlYTo6YWxsSXRlbXMpOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVTdG9yYWdlQXJl YTo6c2V0SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0ZVN0b3JhZ2VBcmVhOjpyZW1vdmVJ dGVtKToKKyAgICAgICAgKFdlYktpdDo6U1FMaXRlU3RvcmFnZUFyZWE6OmNsZWFyKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VBcmVhLmg6CisKIDIwMjEt MTItMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJv dmUgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkgbG9nZ2luZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VB cmVhLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9y YWdlQXJlYS5jcHAKaW5kZXggZTYzYTkwMGIzOTJmYzc4ZDlhYjU4YTU2NmM0ODZiZjliMzdkMzc3 Ny4uNGY1MGU0YmU1ZTc3Mzk2NzUxZDgwNDhlOTA1N2E3Mzg1YzFjZjIzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VBcmVhLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFn ZUFyZWEuY3BwCkBAIC0xMDEsNyArMTAxLDEwIEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFyZWE6Omlz RW1wdHkoKQogICAgIGlmIChtX2NhY2hlKQogICAgICAgICByZXR1cm4gbV9jYWNoZS0+aXNFbXB0 eSgpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBhcmVEYXRh YmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pKQorICAgICAgICByZXR1cm4gdHJ1ZTsK KworICAgIGlmICghbV9kYXRhYmFzZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBhdXRv IHN0YXRlbWVudCA9IGNhY2hlZFN0YXRlbWVudChTdGF0ZW1lbnRUeXBlOjpDb3VudEl0ZW1zKTsK QEAgLTE0OCwxMSArMTUxLDE1IEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFyZWE6OmNyZWF0ZVRhYmxl SWZOZWNlc3NhcnkoKQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFNRTGl0ZVN0b3JhZ2VB cmVhOjpwcmVwYXJlRGF0YWJhc2UoKQorYm9vbCBTUUxpdGVTdG9yYWdlQXJlYTo6cHJlcGFyZURh dGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzIHNob3VsZENyZWF0ZUlmTm90RXhpc3RzKQog ewogICAgIGlmIChtX2RhdGFiYXNlICYmIG1fZGF0YWJhc2UtPmlzT3BlbigpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAorICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOworICAgIGlmIChzaG91bGRD cmVhdGVJZk5vdEV4aXN0cyA9PSBTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8gJiYgIUZpbGVT eXN0ZW06OmZpbGVFeGlzdHMobV9wYXRoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBt X2RhdGFiYXNlID0gbWFrZVVuaXF1ZTxXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZT4oKTsKICAgICBG aWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMoRmlsZVN5c3RlbTo6cGFyZW50UGF0aChtX3Bh dGgpKTsKICAgICBpZiAoIW1fZGF0YWJhc2UtPm9wZW4obV9wYXRoKSkgewpAQCAtMjI0LDkgKzIz MSwxMiBAQCBFeHBlY3RlZDxTdHJpbmcsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFnZUFyZWE6 OmdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXkpCiAKIEV4cGVjdGVkPFN0cmluZywgU3RvcmFnZUVy cm9yPiBTUUxpdGVTdG9yYWdlQXJlYTo6Z2V0SXRlbUZyb21EYXRhYmFzZShjb25zdCBTdHJpbmcm IGtleSkKIHsKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlmICghcHJlcGFyZURh dGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAgIHJldHVybiBtYWtl VW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlmICghbV9kYXRhYmFz ZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRlbU5vdEZv dW5kKTsKKwogICAgIGF1dG8gc3RhdGVtZW50ID0gY2FjaGVkU3RhdGVtZW50KFN0YXRlbWVudFR5 cGU6OkdldEl0ZW0pOwogICAgIGlmICghc3RhdGVtZW50IHx8IHN0YXRlbWVudC0+YmluZFRleHQo MSwga2V5KSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTdG9yYWdlLCAiU1FMaXRlU3Rv cmFnZUFyZWE6OmdldEl0ZW1Gcm9tRGF0YWJhc2UgZmFpbGVkIG9uIGNyZWF0aW5nIHN0YXRlbWVu dCAoJWQpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVy cm9yTXNnKCkpOwpAQCAtMjQ4LDcgKzI1OCw3IEBAIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IFNR TGl0ZVN0b3JhZ2VBcmVhOjphbGxJdGVtcygpCiB7CiAgICAgQVNTRVJUKCFpc01haW5SdW5Mb29w KCkpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBhcmVEYXRh YmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pIHx8ICFtX2RhdGFiYXNlKQogICAgICAg ICByZXR1cm4gSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4geyB9OwogCiAgICAgSGFzaE1hcDxTdHJp bmcsIFN0cmluZz4gaXRlbXM7CkBAIC0yOTYsMTEgKzMwNiwxMCBAQCBFeHBlY3RlZDx2b2lkLCBT dG9yYWdlRXJyb3I+IFNRTGl0ZVN0b3JhZ2VBcmVhOjpzZXRJdGVtKElQQzo6Q29ubmVjdGlvbjo6 VW5pcXVlSQogewogICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlmICghcHJl cGFyZURhdGFiYXNlKCkpCisgICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3JlYXRlSWZO b3RFeGlzdHM6OlllcykpCiAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJy b3I6OkRhdGFiYXNlKTsKIAogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwotCiAg ICAgU3RyaW5nIG9sZFZhbHVlOwogICAgIGlmIChhdXRvIHZhbHVlT3JFcnJvciA9IGdldEl0ZW0o a2V5KSkKICAgICAgICAgb2xkVmFsdWUgPSB2YWx1ZU9yRXJyb3IudmFsdWUoKTsKQEAgLTMzMSw5 ICszNDAsMTIgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBTUUxpdGVTdG9yYWdlQXJl YTo6cmVtb3ZlSXRlbShJUEM6OkNvbm5lY3Rpb246OlVuaXEKIHsKICAgICBBU1NFUlQoIWlzTWFp blJ1bkxvb3AoKSk7CiAKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlmICghcHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAgIHJldHVy biBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlmICghbV9k YXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRl bU5vdEZvdW5kKTsKKwogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwogICAgIFN0 cmluZyBvbGRWYWx1ZTsKICAgICBpZiAoYXV0byB2YWx1ZU9yRXJyb3IgPSBnZXRJdGVtKGtleSkp CkBAIC0zNTksNyArMzcxLDcgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBTUUxpdGVT dG9yYWdlQXJlYTo6Y2xlYXIoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRAogewogICAgIEFTU0VS VCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlmICghcHJlcGFyZURhdGFiYXNlKCkpCisgICAg aWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3JlYXRlSWZOb3RFeGlzdHM6Ok5vKSkKICAgICAg ICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6RGF0YWJhc2UpOwogCiAgICAg aWYgKG1fY2FjaGUgJiYgbV9jYWNoZS0+aXNFbXB0eSgpKQpAQCAtMzY4LDYgKzM4MCw5IEBAIEV4 cGVjdGVkPHZvaWQsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFnZUFyZWE6OmNsZWFyKElQQzo6 Q29ubmVjdGlvbjo6VW5pcXVlSUQKICAgICBpZiAobV9jYWNoZSkKICAgICAgICAgbV9jYWNoZS0+ Y2xlYXIoKTsKIAorICAgIGlmICghbV9kYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4 cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRlbU5vdEZvdW5kKTsKKyAgICAgICAgCiAgICAgc3RhcnRU cmFuc2FjdGlvbklmTmVjZXNzYXJ5KCk7CiAgICAgYXV0byBzdGF0ZW1lbnQgPSBjYWNoZWRTdGF0 ZW1lbnQoU3RhdGVtZW50VHlwZTo6RGVsZXRlQWxsSXRlbXMpOwogICAgIGlmICghc3RhdGVtZW50 IHx8IHN0YXRlbWVudC0+c3RlcCgpICE9IFNRTElURV9ET05FKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJlYS5oCmlu ZGV4IGU5MDU2YTEzNWFiYzAzMzFiMDNkNDg5OWRhNzcyMWNlNmZiNjM0OTYuLjUyY2M5ZDYwZTdl NWE1MzkxZmM4YzQ4M2ZiNjhjMjkwMzYwOTcxNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJlYS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJlYS5oCkBAIC01Miw3 ICs1Miw4IEBAIHByaXZhdGU6CiAgICAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBjbGVh cihJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlELCBTdG9yYWdlQXJlYUltcGxJZGVudGlmaWVyLCBj b25zdCBTdHJpbmcmIHVybFN0cmluZykgZmluYWw7CiAKICAgICBib29sIGNyZWF0ZVRhYmxlSWZO ZWNlc3NhcnkoKTsKLSAgICBib29sIHByZXBhcmVEYXRhYmFzZSgpOworICAgIGVudW0gY2xhc3Mg U2hvdWxkQ3JlYXRlSWZOb3RFeGlzdHMgOiBib29sIHsgTm8sIFllcyB9OworICAgIGJvb2wgcHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzKTsKICAgICB2b2lkIHN0YXJ0VHJh bnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwogCiAgICAgZW51bSBjbGFzcyBTdGF0ZW1lbnRUeXBlIDog dWludDhfdCB7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggZTBkMzA5OTQyMjBjZTRjNmVkZGJmOWM1MWVmOWFhZTNiMDQxOTQ2NS4uN2MzYzU0Y2Qz NTBjZjVkZTQ2MzllYzEwYzI4ZTZiZDRhMzc5OTZmYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTIxICBT aWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNyZWF0ZSBM b2NhbFN0b3JhZ2UgZGF0YWJhc2UgZm9yIHJlYWQgaWYgaXQgZG9lcyBub3QgZXhpc3QKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDU2OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIubW06CisgICAg ICAgICgtW0xvY2FsU3RvcmFnZVVJRGVsZWdhdGUgd2ViVmlldzpydW5KYXZhU2NyaXB0QWxlcnRQ YW5lbFdpdGhNZXNzYWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6XSk6Cisg ICAgICAgIChURVNUKToKKwogMjAyMS0xMi0yMCAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29t PgogCiAgICAgICAgIFN0b3AgYXNzdW1pbmcgV1BUIGlzIGEgcmVmdGVzdCBiYXNlZCBvbiBleGlz dGVuY2Ugb2YgLXJlZi5odG1sIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLm1tIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIubW0KaW5kZXggMDUzN2Y0ZTBlNzc4MDRlOGU3MjkzYTgzYzEzOWQzNjc1ZmY1ZjJlNi4uOGUy MGMzNzEzMTM1ODhhNGY1MzJiYzRiM2IzODNjMDFiMTcyN2U0YSAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXIubW0KQEAgLTMyLDEzICszMiwxNSBAQAogI2ltcG9ydCA8V2Vi S2l0L1dlYktpdC5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKK3N0YXRpYyBO U1N0cmluZyAqZXhwZWN0ZWRNZXNzYWdlOworCiBAaW50ZXJmYWNlIExvY2FsU3RvcmFnZVVJRGVs ZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlPgogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g TG9jYWxTdG9yYWdlVUlEZWxlZ2F0ZQogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IHJ1bkphdmFTY3JpcHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyaW5nICopbWVzc2Fn ZSBpbml0aWF0ZWRCeUZyYW1lOihXS0ZyYW1lSW5mbyAqKWZyYW1lIGNvbXBsZXRpb25IYW5kbGVy Oih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIEVYUEVDVF9TVFJFUSgi dGVzdFZhbHVlIiwgbWVzc2FnZS5VVEY4U3RyaW5nKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoZXhw ZWN0ZWRNZXNzYWdlLCBtZXNzYWdlKTsKICAgICByZWFkeVRvQ29udGludWUgPSB0cnVlOwogICAg IGNvbXBsZXRpb25IYW5kbGVyKCk7CiB9CkBAIC01Nyw2ICs1OSw3IEBAIFRFU1QoV0tXZWJWaWV3 LCBMb2NhbFN0b3JhZ2VGZXRjaERhdGFSZWNvcmRzKQogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0 TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAs IDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CiAgICAgYXV0byB1aURl bGVnYXRlID0gYWRvcHROUyhbW0xvY2FsU3RvcmFnZVVJRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK ICAgICB3ZWJWaWV3LmdldCgpLlVJRGVsZWdhdGUgPSB1aURlbGVnYXRlLmdldCgpOworICAgIGV4 cGVjdGVkTWVzc2FnZSA9IEAidGVzdFZhbHVlIjsKICAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmlu ZzpAIjxzY3JpcHQ+bG9jYWxTdG9yYWdlLnNldEl0ZW0oJ3Rlc3RLZXknLCAndGVzdFZhbHVlJyk7 YWxlcnQobG9jYWxTdG9yYWdlLmdldEl0ZW0oJ3Rlc3RLZXknKSk7PC9zY3JpcHQ+IiBiYXNlVVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2xvY2FsaG9zdCJdXTsKICAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJnJlYWR5VG9Db250aW51ZSk7CiAKQEAgLTcwLDMgKzczLDI4IEBA IFRFU1QoV0tXZWJWaWV3LCBMb2NhbFN0b3JhZ2VGZXRjaERhdGFSZWNvcmRzKQogICAgIH1dOwog ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVhZHlUb0NvbnRpbnVlKTsKIH0KKworVEVT VChXS1dlYlZpZXcsIExvY2FsU3RvcmFnZU5vUmVjb3JkQWZ0ZXJHZXRJdGVtKQoreworICAgIHJl YWR5VG9Db250aW51ZSA9IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHRE YXRhU3RvcmVdIHJlbW92ZURhdGFPZlR5cGVzOltXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0 ZURhdGFUeXBlc10gbW9kaWZpZWRTaW5jZTpbTlNEYXRlIGRpc3RhbnRQYXN0XSBjb21wbGV0aW9u SGFuZGxlcjpeKCkgeworICAgICAgICByZWFkeVRvQ29udGludWUgPSB0cnVlOworICAgIH1dOwor ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVhZHlUb0NvbnRpbnVlKTsKKworICAgIGF1 dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNv bmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIHVpRGVsZWdhdGUgPSBhZG9wdE5TKFtbTG9j YWxTdG9yYWdlVUlEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIHdlYlZpZXcuZ2V0KCkuVUlE ZWxlZ2F0ZSA9IHVpRGVsZWdhdGUuZ2V0KCk7CisgICAgcmVhZHlUb0NvbnRpbnVlID0gZmFsc2U7 CisgICAgZXhwZWN0ZWRNZXNzYWdlID0gQCJudWxsIjsKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0 cmluZzpAIjxzY3JpcHQ+YWxlcnQobG9jYWxTdG9yYWdlLmdldEl0ZW0oJ3Rlc3RLZXknKSk7PC9z Y3JpcHQ+IiBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL3dlYmtpdC5vcmci XV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWFkeVRvQ29udGludWUpOworCisg ICAgcmVhZHlUb0NvbnRpbnVlID0gZmFsc2U7CisgICAgW1tXS1dlYnNpdGVEYXRhU3RvcmUgZGVm YXVsdERhdGFTdG9yZV0gZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6W1dLV2Vic2l0ZURhdGFTdG9y ZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TQXJyYXk8V0tXZWJz aXRlRGF0YVJlY29yZCAqPiAqZGF0YVJlY29yZHMpIHsKKyAgICAgICAgRVhQRUNUX0VRKDB1LCBk YXRhUmVjb3Jkcy5jb3VudCk7CisgICAgICAgIHJlYWR5VG9Db250aW51ZSA9IHRydWU7CisgICAg fV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWFkeVRvQ29udGludWUpOworfQo= 447918 2021-12-23 16:40:34 -0800 2021-12-23 16:55:36 -0800 Patch for landing bug-234569-20211223164033.patch text/plain 10409 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMzYWUzNWM5ZDZkYzU0YzQ1 ZjBmODc5N2NlNDc0MzhiZjQ4NWRhYmYuLjM3ZDAxMTM1MDhkODlhY2YxZTQxNTE1NzllOThhM2Yx ZGExYTgzYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMTItMjMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY3JlYXRlIExvY2FsU3Rv cmFnZSBkYXRhYmFzZSBmb3IgcmVhZCBpZiBpdCBkb2VzIG5vdCBleGlzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBJZiBkYXRhYmFzZSBkb2VzIG5v dCBleGlzdHMgd2hlbiByZWFkLCB3ZSBjYW4gcmV0dXJuIGVtcHR5IG9yIG51bGwsIGluc3RlYWQg b2YgY3JlYXRpbmcgYW4gZW1wdHkgZGF0YWJhc2UuCisKKyAgICAgICAgTmV3IEFQSSB0ZXN0OiBX S1dlYlZpZXcuTG9jYWxTdG9yYWdlTm9SZWNvcmRBZnRlckdldEl0ZW0KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTUUxpdGVTdG9yYWdlQXJlYTo6aXNFbXB0eSk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0 ZVN0b3JhZ2VBcmVhOjpwcmVwYXJlRGF0YWJhc2UpOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVT dG9yYWdlQXJlYTo6Z2V0SXRlbUZyb21EYXRhYmFzZSk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0 ZVN0b3JhZ2VBcmVhOjphbGxJdGVtcyk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0ZVN0b3JhZ2VB cmVhOjpzZXRJdGVtKToKKyAgICAgICAgKFdlYktpdDo6U1FMaXRlU3RvcmFnZUFyZWE6OnJlbW92 ZUl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVTdG9yYWdlQXJlYTo6Y2xlYXIpOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaDoKKwogMjAy MS0xMi0yMyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1 cmUgZmlsZSBoYW5kbGVzIHVzZWQgaW4gRmlsZVN5c3RlbUFjY2VzcyBBUEkgYXJlIGNsb3NlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0 b3JhZ2VBcmVhLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxp dGVTdG9yYWdlQXJlYS5jcHAKaW5kZXggZTYzYTkwMGIzOTJmYzc4ZDlhYjU4YTU2NmM0ODZiZjli MzdkMzc3Ny4uNGY1MGU0YmU1ZTc3Mzk2NzUxZDgwNDhlOTA1N2E3Mzg1YzFjZjIzMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VB cmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRl U3RvcmFnZUFyZWEuY3BwCkBAIC0xMDEsNyArMTAxLDEwIEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFy ZWE6OmlzRW1wdHkoKQogICAgIGlmIChtX2NhY2hlKQogICAgICAgICByZXR1cm4gbV9jYWNoZS0+ aXNFbXB0eSgpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBh cmVEYXRhYmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKworICAgIGlmICghbV9kYXRhYmFzZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAg ICBhdXRvIHN0YXRlbWVudCA9IGNhY2hlZFN0YXRlbWVudChTdGF0ZW1lbnRUeXBlOjpDb3VudEl0 ZW1zKTsKQEAgLTE0OCwxMSArMTUxLDE1IEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFyZWE6OmNyZWF0 ZVRhYmxlSWZOZWNlc3NhcnkoKQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFNRTGl0ZVN0 b3JhZ2VBcmVhOjpwcmVwYXJlRGF0YWJhc2UoKQorYm9vbCBTUUxpdGVTdG9yYWdlQXJlYTo6cHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzIHNob3VsZENyZWF0ZUlmTm90RXhp c3RzKQogewogICAgIGlmIChtX2RhdGFiYXNlICYmIG1fZGF0YWJhc2UtPmlzT3BlbigpKQogICAg ICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOworICAgIGlmIChz aG91bGRDcmVhdGVJZk5vdEV4aXN0cyA9PSBTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8gJiYg IUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobV9wYXRoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisK ICAgICBtX2RhdGFiYXNlID0gbWFrZVVuaXF1ZTxXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZT4oKTsK ICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMoRmlsZVN5c3RlbTo6cGFyZW50UGF0 aChtX3BhdGgpKTsKICAgICBpZiAoIW1fZGF0YWJhc2UtPm9wZW4obV9wYXRoKSkgewpAQCAtMjI0 LDkgKzIzMSwxMiBAQCBFeHBlY3RlZDxTdHJpbmcsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFn ZUFyZWE6OmdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXkpCiAKIEV4cGVjdGVkPFN0cmluZywgU3Rv cmFnZUVycm9yPiBTUUxpdGVTdG9yYWdlQXJlYTo6Z2V0SXRlbUZyb21EYXRhYmFzZShjb25zdCBT dHJpbmcmIGtleSkKIHsKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlmICghcHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAgIHJldHVy biBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlmICghbV9k YXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRl bU5vdEZvdW5kKTsKKwogICAgIGF1dG8gc3RhdGVtZW50ID0gY2FjaGVkU3RhdGVtZW50KFN0YXRl bWVudFR5cGU6OkdldEl0ZW0pOwogICAgIGlmICghc3RhdGVtZW50IHx8IHN0YXRlbWVudC0+Ymlu ZFRleHQoMSwga2V5KSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTdG9yYWdlLCAiU1FM aXRlU3RvcmFnZUFyZWE6OmdldEl0ZW1Gcm9tRGF0YWJhc2UgZmFpbGVkIG9uIGNyZWF0aW5nIHN0 YXRlbWVudCAoJWQpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+ bGFzdEVycm9yTXNnKCkpOwpAQCAtMjQ4LDcgKzI1OCw3IEBAIEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+IFNRTGl0ZVN0b3JhZ2VBcmVhOjphbGxJdGVtcygpCiB7CiAgICAgQVNTRVJUKCFpc01haW5S dW5Mb29wKCkpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBh cmVEYXRhYmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pIHx8ICFtX2RhdGFiYXNlKQog ICAgICAgICByZXR1cm4gSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4geyB9OwogCiAgICAgSGFzaE1h cDxTdHJpbmcsIFN0cmluZz4gaXRlbXM7CkBAIC0yOTYsMTEgKzMwNiwxMCBAQCBFeHBlY3RlZDx2 b2lkLCBTdG9yYWdlRXJyb3I+IFNRTGl0ZVN0b3JhZ2VBcmVhOjpzZXRJdGVtKElQQzo6Q29ubmVj dGlvbjo6VW5pcXVlSQogewogICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlm ICghcHJlcGFyZURhdGFiYXNlKCkpCisgICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3Jl YXRlSWZOb3RFeGlzdHM6OlllcykpCiAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChTdG9y YWdlRXJyb3I6OkRhdGFiYXNlKTsKIAogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgp OwotCiAgICAgU3RyaW5nIG9sZFZhbHVlOwogICAgIGlmIChhdXRvIHZhbHVlT3JFcnJvciA9IGdl dEl0ZW0oa2V5KSkKICAgICAgICAgb2xkVmFsdWUgPSB2YWx1ZU9yRXJyb3IudmFsdWUoKTsKQEAg LTMzMSw5ICszNDAsMTIgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBTUUxpdGVTdG9y YWdlQXJlYTo6cmVtb3ZlSXRlbShJUEM6OkNvbm5lY3Rpb246OlVuaXEKIHsKICAgICBBU1NFUlQo IWlzTWFpblJ1bkxvb3AoKSk7CiAKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlm ICghcHJlcGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAg IHJldHVybiBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlm ICghbV9kYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJv cjo6SXRlbU5vdEZvdW5kKTsKKwogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwog ICAgIFN0cmluZyBvbGRWYWx1ZTsKICAgICBpZiAoYXV0byB2YWx1ZU9yRXJyb3IgPSBnZXRJdGVt KGtleSkpCkBAIC0zNTksNyArMzcxLDcgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBT UUxpdGVTdG9yYWdlQXJlYTo6Y2xlYXIoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRAogewogICAg IEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlmICghcHJlcGFyZURhdGFiYXNlKCkp CisgICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3JlYXRlSWZOb3RFeGlzdHM6Ok5vKSkK ICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6RGF0YWJhc2UpOwog CiAgICAgaWYgKG1fY2FjaGUgJiYgbV9jYWNoZS0+aXNFbXB0eSgpKQpAQCAtMzY4LDYgKzM4MCw5 IEBAIEV4cGVjdGVkPHZvaWQsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFnZUFyZWE6OmNsZWFy KElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQKICAgICBpZiAobV9jYWNoZSkKICAgICAgICAgbV9j YWNoZS0+Y2xlYXIoKTsKIAorICAgIGlmICghbV9kYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1h a2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRlbU5vdEZvdW5kKTsKKyAgICAgICAgCiAgICAg c3RhcnRUcmFuc2FjdGlvbklmTmVjZXNzYXJ5KCk7CiAgICAgYXV0byBzdGF0ZW1lbnQgPSBjYWNo ZWRTdGF0ZW1lbnQoU3RhdGVtZW50VHlwZTo6RGVsZXRlQWxsSXRlbXMpOwogICAgIGlmICghc3Rh dGVtZW50IHx8IHN0YXRlbWVudC0+c3RlcCgpICE9IFNRTElURV9ET05FKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJl YS5oCmluZGV4IGU5MDU2YTEzNWFiYzAzMzFiMDNkNDg5OWRhNzcyMWNlNmZiNjM0OTYuLjUyY2M5 ZDYwZTdlNWE1MzkxZmM4YzQ4M2ZiNjhjMjkwMzYwOTcxNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJlYS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxpdGVTdG9yYWdlQXJlYS5oCkBA IC01Miw3ICs1Miw4IEBAIHByaXZhdGU6CiAgICAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9y PiBjbGVhcihJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlELCBTdG9yYWdlQXJlYUltcGxJZGVudGlm aWVyLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykgZmluYWw7CiAKICAgICBib29sIGNyZWF0ZVRh YmxlSWZOZWNlc3NhcnkoKTsKLSAgICBib29sIHByZXBhcmVEYXRhYmFzZSgpOworICAgIGVudW0g Y2xhc3MgU2hvdWxkQ3JlYXRlSWZOb3RFeGlzdHMgOiBib29sIHsgTm8sIFllcyB9OworICAgIGJv b2wgcHJlcGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzKTsKICAgICB2b2lkIHN0 YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwogCiAgICAgZW51bSBjbGFzcyBTdGF0ZW1lbnRU eXBlIDogdWludDhfdCB7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggYjc1MTMzNGYzMjY1MjFmYWRiM2FkOTllYTNiZWQ3N2MxNmM4Yjg1ZC4uZDA4 MTJiYzBhM2FlOWZiMTcxMjBhYWYyNThmZDJjMWVmODAzZTQ0MSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEy LTIzICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNy ZWF0ZSBMb2NhbFN0b3JhZ2UgZGF0YWJhc2UgZm9yIHJlYWQgaWYgaXQgZG9lcyBub3QgZXhpc3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDU2OQor CisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5t bToKKyAgICAgICAgKC1bTG9jYWxTdG9yYWdlVUlEZWxlZ2F0ZSB3ZWJWaWV3OnJ1bkphdmFTY3Jp cHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxl cjpdKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTEyLTIzICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBBUEkgdGVzdGluZyBzdXBwb3J0IGZv ciBtb2RhbCBjb250YWluZXIgb2JzZXJ2YXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXIubW0KaW5kZXggMDUzN2Y0ZTBlNzc4MDRlOGU3MjkzYTgzYzEzOWQzNjc1ZmY1ZjJl Ni4uYTUzZGE1M2E2YWUzYjc2YmUzZDcxOTkzYzAyMDc1OTkyZWZiOTZhYyAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXIubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9M b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIubW0KQEAgLTI5LDE5ICsyOSwzMCBAQAogI2ltcG9y dCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3QuaCIKICNpbXBvcnQgPFdlYktp dC9XS1dlYnNpdGVEYXRhUmVjb3JkUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0 ZURhdGFTdG9yZVByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYktpdC5oPgogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKLUBpbnRlcmZhY2UgTG9jYWxTdG9yYWdlVUlEZWxlZ2F0ZSA6 IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGU+CitAaW50ZXJmYWNlIExvY2FsU3RvcmFnZVVJRGVsZWdh dGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlPiB7CitAcHJpdmF0ZQorICAgIE5TU3RyaW5nICpl eHBlY3RlZE1lc3NhZ2U7Cit9CistICh2b2lkKXNldEV4cGVjdGVkTWVzc2FnZTooTlNTdHJpbmcg KilfZXhwZWN0ZWRNZXNzYWdlOwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gTG9jYWxTdG9yYWdl VUlEZWxlZ2F0ZQogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHJ1bkphdmFT Y3JpcHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyaW5nICopbWVzc2FnZSBpbml0aWF0ZWRC eUZyYW1lOihXS0ZyYW1lSW5mbyAqKWZyYW1lIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSh2 b2lkKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIEVYUEVDVF9TVFJFUSgidGVzdFZhbHVlIiwg bWVzc2FnZS5VVEY4U3RyaW5nKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoZXhwZWN0ZWRNZXNzYWdl LCBtZXNzYWdlKTsKICAgICByZWFkeVRvQ29udGludWUgPSB0cnVlOwogICAgIGNvbXBsZXRpb25I YW5kbGVyKCk7CiB9CisKKy0gKHZvaWQpc2V0RXhwZWN0ZWRNZXNzYWdlOihOU1N0cmluZyAqKV9l eHBlY3RlZE1lc3NhZ2UKK3sKKyAgICBleHBlY3RlZE1lc3NhZ2UgPSBfZXhwZWN0ZWRNZXNzYWdl OworfQogQGVuZAogCiBURVNUKFdLV2ViVmlldywgTG9jYWxTdG9yYWdlRmV0Y2hEYXRhUmVjb3Jk cykKQEAgLTU3LDYgKzY4LDcgQEAgVEVTVChXS1dlYlZpZXcsIExvY2FsU3RvcmFnZUZldGNoRGF0 YVJlY29yZHMpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNv bmZpZ3VyYXRpb24uZ2V0KCldKTsKICAgICBhdXRvIHVpRGVsZWdhdGUgPSBhZG9wdE5TKFtbTG9j YWxTdG9yYWdlVUlEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIHdlYlZpZXcuZ2V0KCkuVUlE ZWxlZ2F0ZSA9IHVpRGVsZWdhdGUuZ2V0KCk7CisgICAgW3VpRGVsZWdhdGUuZ2V0KCkgc2V0RXhw ZWN0ZWRNZXNzYWdlOkAidGVzdFZhbHVlIl07CiAgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6 QCI8c2NyaXB0PmxvY2FsU3RvcmFnZS5zZXRJdGVtKCd0ZXN0S2V5JywgJ3Rlc3RWYWx1ZScpO2Fs ZXJ0KGxvY2FsU3RvcmFnZS5nZXRJdGVtKCd0ZXN0S2V5JykpOzwvc2NyaXB0PiIgYmFzZVVSTDpb TlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly9sb2NhbGhvc3QiXV07CiAgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZyZWFkeVRvQ29udGludWUpOwogCkBAIC03MCwzICs4MiwzMiBAQCBU RVNUKFdLV2ViVmlldywgTG9jYWxTdG9yYWdlRmV0Y2hEYXRhUmVjb3JkcykKICAgICB9XTsKICAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlYWR5VG9Db250aW51ZSk7CiB9CisKK1RFU1Qo V0tXZWJWaWV3LCBMb2NhbFN0b3JhZ2VOb1JlY29yZEFmdGVyR2V0SXRlbSkKK3sKKyAgICByZWFk eVRvQ29udGludWUgPSBmYWxzZTsKKyAgICBbW1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0 YVN0b3JlXSByZW1vdmVEYXRhT2ZUeXBlczpbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbFdlYnNpdGVE YXRhVHlwZXNdIG1vZGlmaWVkU2luY2U6W05TRGF0ZSBkaXN0YW50UGFzdF0gY29tcGxldGlvbkhh bmRsZXI6XigpIHsKKyAgICAgICAgcmVhZHlUb0NvbnRpbnVlID0gdHJ1ZTsKKyAgICB9XTsKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlYWR5VG9Db250aW51ZSk7CisKKyAgICBhdXRv IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10g aW5pdF0pOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25m aWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byB1aURlbGVnYXRlID0gYWRvcHROUyhbW0xvY2Fs U3RvcmFnZVVJRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICB3ZWJWaWV3LmdldCgpLlVJRGVs ZWdhdGUgPSB1aURlbGVnYXRlLmdldCgpOworICAgIHJlYWR5VG9Db250aW51ZSA9IGZhbHNlOwor ICAgIFt1aURlbGVnYXRlLmdldCgpIHNldEV4cGVjdGVkTWVzc2FnZTpAIm51bGwiXTsKKyAgICBb d2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxzY3JpcHQ+YWxlcnQobG9jYWxTdG9yYWdlLmdldEl0 ZW0oJ3Rlc3RLZXknKSk7PC9zY3JpcHQ+IiBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAi aHR0cDovL3dlYmtpdC5vcmciXV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWFk eVRvQ29udGludWUpOworCisgICAgcmVhZHlUb0NvbnRpbnVlID0gZmFsc2U7CisgICAgW1tXS1dl YnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6 W1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBjb21wbGV0aW9uSGFuZGxl cjpeKE5TQXJyYXk8V0tXZWJzaXRlRGF0YVJlY29yZCAqPiAqZGF0YVJlY29yZHMpIHsKKyAgICAg ICAgRVhQRUNUX0VRKDB1LCBkYXRhUmVjb3Jkcy5jb3VudCk7CisgICAgICAgIHJlYWR5VG9Db250 aW51ZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWFk eVRvQ29udGludWUpOworCisgICAgUmV0YWluUHRyPE5TVVJMPiB1cmwgPSBbW1tjb25maWd1cmF0 aW9uIHdlYnNpdGVEYXRhU3RvcmVdIF9jb25maWd1cmF0aW9uXSBfd2ViU3RvcmFnZURpcmVjdG9y eV07CisgICAgTlNBcnJheSAqZmlsZXMgPSBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJd IGNvbnRlbnRzT2ZEaXJlY3RvcnlBdFBhdGg6dXJsLmdldCgpLnBhdGggZXJyb3I6bmlsXTsKKyAg ICBFWFBFQ1RfRVEoMFUsIFtmaWxlcyBjb3VudF0pOworfQo= 447921 2021-12-23 16:55:39 -0800 2021-12-23 17:50:36 -0800 Patch for landing bug-234569-20211223165538.patch text/plain 10401 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMzYWUzNWM5ZDZkYzU0YzQ1 ZjBmODc5N2NlNDc0MzhiZjQ4NWRhYmYuLjM3ZDAxMTM1MDhkODlhY2YxZTQxNTE1NzllOThhM2Yx ZGExYTgzYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMTItMjMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY3JlYXRlIExvY2FsU3Rv cmFnZSBkYXRhYmFzZSBmb3IgcmVhZCBpZiBpdCBkb2VzIG5vdCBleGlzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBJZiBkYXRhYmFzZSBkb2VzIG5v dCBleGlzdHMgd2hlbiByZWFkLCB3ZSBjYW4gcmV0dXJuIGVtcHR5IG9yIG51bGwsIGluc3RlYWQg b2YgY3JlYXRpbmcgYW4gZW1wdHkgZGF0YWJhc2UuCisKKyAgICAgICAgTmV3IEFQSSB0ZXN0OiBX S1dlYlZpZXcuTG9jYWxTdG9yYWdlTm9SZWNvcmRBZnRlckdldEl0ZW0KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuY3BwOgorICAgICAgICAoV2Vi S2l0OjpTUUxpdGVTdG9yYWdlQXJlYTo6aXNFbXB0eSk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0 ZVN0b3JhZ2VBcmVhOjpwcmVwYXJlRGF0YWJhc2UpOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVT dG9yYWdlQXJlYTo6Z2V0SXRlbUZyb21EYXRhYmFzZSk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0 ZVN0b3JhZ2VBcmVhOjphbGxJdGVtcyk6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0ZVN0b3JhZ2VB cmVhOjpzZXRJdGVtKToKKyAgICAgICAgKFdlYktpdDo6U1FMaXRlU3RvcmFnZUFyZWE6OnJlbW92 ZUl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpTUUxpdGVTdG9yYWdlQXJlYTo6Y2xlYXIpOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaDoKKwogMjAy MS0xMi0yMyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1 cmUgZmlsZSBoYW5kbGVzIHVzZWQgaW4gRmlsZVN5c3RlbUFjY2VzcyBBUEkgYXJlIGNsb3NlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0 b3JhZ2VBcmVhLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TUUxp dGVTdG9yYWdlQXJlYS5jcHAKaW5kZXggZTYzYTkwMGIzOTJmYzc4ZDlhYjU4YTU2NmM0ODZiZjli MzdkMzc3Ny4uNDA5YTMzODhhMGI4ZWNmOWFiNzEwNDliNzI5ZmRlMzkyN2M0OGViNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VB cmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRl U3RvcmFnZUFyZWEuY3BwCkBAIC0xMDEsNyArMTAxLDEwIEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFy ZWE6OmlzRW1wdHkoKQogICAgIGlmIChtX2NhY2hlKQogICAgICAgICByZXR1cm4gbV9jYWNoZS0+ aXNFbXB0eSgpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBh cmVEYXRhYmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKworICAgIGlmICghbV9kYXRhYmFzZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAg ICBhdXRvIHN0YXRlbWVudCA9IGNhY2hlZFN0YXRlbWVudChTdGF0ZW1lbnRUeXBlOjpDb3VudEl0 ZW1zKTsKQEAgLTE0OCwxMSArMTUxLDE1IEBAIGJvb2wgU1FMaXRlU3RvcmFnZUFyZWE6OmNyZWF0 ZVRhYmxlSWZOZWNlc3NhcnkoKQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFNRTGl0ZVN0 b3JhZ2VBcmVhOjpwcmVwYXJlRGF0YWJhc2UoKQorYm9vbCBTUUxpdGVTdG9yYWdlQXJlYTo6cHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzIHNob3VsZENyZWF0ZUlmTm90RXhp c3RzKQogewogICAgIGlmIChtX2RhdGFiYXNlICYmIG1fZGF0YWJhc2UtPmlzT3BlbigpKQogICAg ICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOworICAgIGlmIChz aG91bGRDcmVhdGVJZk5vdEV4aXN0cyA9PSBTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8gJiYg IUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobV9wYXRoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisK ICAgICBtX2RhdGFiYXNlID0gbWFrZVVuaXF1ZTxXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZT4oKTsK ICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMoRmlsZVN5c3RlbTo6cGFyZW50UGF0 aChtX3BhdGgpKTsKICAgICBpZiAoIW1fZGF0YWJhc2UtPm9wZW4obV9wYXRoKSkgewpAQCAtMjI0 LDkgKzIzMSwxMiBAQCBFeHBlY3RlZDxTdHJpbmcsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFn ZUFyZWE6OmdldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXkpCiAKIEV4cGVjdGVkPFN0cmluZywgU3Rv cmFnZUVycm9yPiBTUUxpdGVTdG9yYWdlQXJlYTo6Z2V0SXRlbUZyb21EYXRhYmFzZShjb25zdCBT dHJpbmcmIGtleSkKIHsKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlmICghcHJl cGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAgIHJldHVy biBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlmICghbV9k YXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRl bU5vdEZvdW5kKTsKKwogICAgIGF1dG8gc3RhdGVtZW50ID0gY2FjaGVkU3RhdGVtZW50KFN0YXRl bWVudFR5cGU6OkdldEl0ZW0pOwogICAgIGlmICghc3RhdGVtZW50IHx8IHN0YXRlbWVudC0+Ymlu ZFRleHQoMSwga2V5KSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTdG9yYWdlLCAiU1FM aXRlU3RvcmFnZUFyZWE6OmdldEl0ZW1Gcm9tRGF0YWJhc2UgZmFpbGVkIG9uIGNyZWF0aW5nIHN0 YXRlbWVudCAoJWQpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+ bGFzdEVycm9yTXNnKCkpOwpAQCAtMjQ4LDcgKzI1OCw3IEBAIEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+IFNRTGl0ZVN0b3JhZ2VBcmVhOjphbGxJdGVtcygpCiB7CiAgICAgQVNTRVJUKCFpc01haW5S dW5Mb29wKCkpOwogCi0gICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoKSkKKyAgICBpZiAoIXByZXBh cmVEYXRhYmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0czo6Tm8pIHx8ICFtX2RhdGFiYXNlKQog ICAgICAgICByZXR1cm4gSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4geyB9OwogCiAgICAgSGFzaE1h cDxTdHJpbmcsIFN0cmluZz4gaXRlbXM7CkBAIC0yOTYsMTEgKzMwNiwxMCBAQCBFeHBlY3RlZDx2 b2lkLCBTdG9yYWdlRXJyb3I+IFNRTGl0ZVN0b3JhZ2VBcmVhOjpzZXRJdGVtKElQQzo6Q29ubmVj dGlvbjo6VW5pcXVlSQogewogICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlm ICghcHJlcGFyZURhdGFiYXNlKCkpCisgICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3Jl YXRlSWZOb3RFeGlzdHM6OlllcykpCiAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChTdG9y YWdlRXJyb3I6OkRhdGFiYXNlKTsKIAogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgp OwotCiAgICAgU3RyaW5nIG9sZFZhbHVlOwogICAgIGlmIChhdXRvIHZhbHVlT3JFcnJvciA9IGdl dEl0ZW0oa2V5KSkKICAgICAgICAgb2xkVmFsdWUgPSB2YWx1ZU9yRXJyb3IudmFsdWUoKTsKQEAg LTMzMSw5ICszNDAsMTIgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBTUUxpdGVTdG9y YWdlQXJlYTo6cmVtb3ZlSXRlbShJUEM6OkNvbm5lY3Rpb246OlVuaXEKIHsKICAgICBBU1NFUlQo IWlzTWFpblJ1bkxvb3AoKSk7CiAKLSAgICBpZiAoIXByZXBhcmVEYXRhYmFzZSgpKQorICAgIGlm ICghcHJlcGFyZURhdGFiYXNlKFNob3VsZENyZWF0ZUlmTm90RXhpc3RzOjpObykpCiAgICAgICAg IHJldHVybiBtYWtlVW5leHBlY3RlZChTdG9yYWdlRXJyb3I6OkRhdGFiYXNlKTsKIAorICAgIGlm ICghbV9kYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJv cjo6SXRlbU5vdEZvdW5kKTsKKwogICAgIHN0YXJ0VHJhbnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwog ICAgIFN0cmluZyBvbGRWYWx1ZTsKICAgICBpZiAoYXV0byB2YWx1ZU9yRXJyb3IgPSBnZXRJdGVt KGtleSkpCkBAIC0zNTksNyArMzcxLDcgQEAgRXhwZWN0ZWQ8dm9pZCwgU3RvcmFnZUVycm9yPiBT UUxpdGVTdG9yYWdlQXJlYTo6Y2xlYXIoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRAogewogICAg IEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKIAotICAgIGlmICghcHJlcGFyZURhdGFiYXNlKCkp CisgICAgaWYgKCFwcmVwYXJlRGF0YWJhc2UoU2hvdWxkQ3JlYXRlSWZOb3RFeGlzdHM6Ok5vKSkK ICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6RGF0YWJhc2UpOwog CiAgICAgaWYgKG1fY2FjaGUgJiYgbV9jYWNoZS0+aXNFbXB0eSgpKQpAQCAtMzY4LDYgKzM4MCw5 IEBAIEV4cGVjdGVkPHZvaWQsIFN0b3JhZ2VFcnJvcj4gU1FMaXRlU3RvcmFnZUFyZWE6OmNsZWFy KElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQKICAgICBpZiAobV9jYWNoZSkKICAgICAgICAgbV9j YWNoZS0+Y2xlYXIoKTsKIAorICAgIGlmICghbV9kYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuIG1h a2VVbmV4cGVjdGVkKFN0b3JhZ2VFcnJvcjo6SXRlbU5vdEZvdW5kKTsKKwogICAgIHN0YXJ0VHJh bnNhY3Rpb25JZk5lY2Vzc2FyeSgpOwogICAgIGF1dG8gc3RhdGVtZW50ID0gY2FjaGVkU3RhdGVt ZW50KFN0YXRlbWVudFR5cGU6OkRlbGV0ZUFsbEl0ZW1zKTsKICAgICBpZiAoIXN0YXRlbWVudCB8 fCBzdGF0ZW1lbnQtPnN0ZXAoKSAhPSBTUUxJVEVfRE9ORSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1NRTGl0ZVN0b3JhZ2VBcmVhLmggYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaAppbmRl eCBlOTA1NmExMzVhYmMwMzMxYjAzZDQ4OTlkYTc3MjFjZTZmYjYzNDk2Li41MmNjOWQ2MGU3ZTVh NTM5MWZjOGM0ODNmYjY4YzI5MDM2MDk3MTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU1FMaXRlU3RvcmFnZUFyZWEuaApAQCAtNTIsNyAr NTIsOCBAQCBwcml2YXRlOgogICAgIEV4cGVjdGVkPHZvaWQsIFN0b3JhZ2VFcnJvcj4gY2xlYXIo SVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgU3RvcmFnZUFyZWFJbXBsSWRlbnRpZmllciwgY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcpIGZpbmFsOwogCiAgICAgYm9vbCBjcmVhdGVUYWJsZUlmTmVj ZXNzYXJ5KCk7Ci0gICAgYm9vbCBwcmVwYXJlRGF0YWJhc2UoKTsKKyAgICBlbnVtIGNsYXNzIFNo b3VsZENyZWF0ZUlmTm90RXhpc3RzIDogYm9vbCB7IE5vLCBZZXMgfTsKKyAgICBib29sIHByZXBh cmVEYXRhYmFzZShTaG91bGRDcmVhdGVJZk5vdEV4aXN0cyk7CiAgICAgdm9pZCBzdGFydFRyYW5z YWN0aW9uSWZOZWNlc3NhcnkoKTsKIAogICAgIGVudW0gY2xhc3MgU3RhdGVtZW50VHlwZSA6IHVp bnQ4X3QgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IGI3NTEzMzRmMzI2NTIxZmFkYjNhZDk5ZWEzYmVkNzdjMTZjOGI4NWQuLmQwODEyYmMwYTNh ZTlmYjE3MTIwYWFmMjU4ZmQyYzFlZjgwM2U0NDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0xMi0yMyAgU2lo dWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBjcmVhdGUgTG9j YWxTdG9yYWdlIGRhdGFiYXNlIGZvciByZWFkIGlmIGl0IGRvZXMgbm90IGV4aXN0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ1NjkKKworICAgICAg ICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIubW06CisgICAg ICAgICgtW0xvY2FsU3RvcmFnZVVJRGVsZWdhdGUgd2ViVmlldzpydW5KYXZhU2NyaXB0QWxlcnRQ YW5lbFdpdGhNZXNzYWdlOmluaXRpYXRlZEJ5RnJhbWU6Y29tcGxldGlvbkhhbmRsZXI6XSk6Cisg ICAgICAgIChURVNUKToKKwogMjAyMS0xMi0yMyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgQVBJIHRlc3Rpbmcgc3VwcG9ydCBmb3IgbW9kYWwg Y29udGFpbmVyIG9ic2VydmF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5tbSBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy Lm1tCmluZGV4IDA1MzdmNGUwZTc3ODA0ZThlNzI5M2E4M2MxMzlkMzY3NWZmNWYyZTYuLjYyODYy MDJmMjc0NTczZmE2YzZlZDRlNmE2ODk0MjBmZDRmMmFiZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyLm1tCkBAIC0yOSwxOSArMjksMzAgQEAKICNpbXBvcnQgIlBsYXRm b3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0LmgiCiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJz aXRlRGF0YVJlY29yZFByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9XS1dlYnNpdGVEYXRhU3Rv cmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0Lmg+CisjaW1wb3J0IDxXZWJLaXQv X1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgogCi1AaW50ZXJmYWNlIExvY2FsU3RvcmFnZVVJRGVsZWdhdGUgOiBOU09iamVj dCA8V0tVSURlbGVnYXRlPgorQGludGVyZmFjZSBMb2NhbFN0b3JhZ2VVSURlbGVnYXRlIDogTlNP YmplY3QgPFdLVUlEZWxlZ2F0ZT4geworQHByaXZhdGUKKyAgICBOU1N0cmluZyAqZXhwZWN0ZWRN ZXNzYWdlOworfQorLSAodm9pZClzZXRFeHBlY3RlZE1lc3NhZ2U6KE5TU3RyaW5nICopX2V4cGVj dGVkTWVzc2FnZTsKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIExvY2FsU3RvcmFnZVVJRGVsZWdh dGUKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBydW5KYXZhU2NyaXB0QWxl cnRQYW5lbFdpdGhNZXNzYWdlOihOU1N0cmluZyAqKW1lc3NhZ2UgaW5pdGlhdGVkQnlGcmFtZToo V0tGcmFtZUluZm8gKilmcmFtZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkpY29t cGxldGlvbkhhbmRsZXIKIHsKLSAgICBFWFBFQ1RfU1RSRVEoInRlc3RWYWx1ZSIsIG1lc3NhZ2Uu VVRGOFN0cmluZyk7CisgICAgRVhQRUNUX1dLX1NUUkVRKGV4cGVjdGVkTWVzc2FnZSwgbWVzc2Fn ZSk7CiAgICAgcmVhZHlUb0NvbnRpbnVlID0gdHJ1ZTsKICAgICBjb21wbGV0aW9uSGFuZGxlcigp OwogfQorCistICh2b2lkKXNldEV4cGVjdGVkTWVzc2FnZTooTlNTdHJpbmcgKilfZXhwZWN0ZWRN ZXNzYWdlCit7CisgICAgZXhwZWN0ZWRNZXNzYWdlID0gX2V4cGVjdGVkTWVzc2FnZTsKK30KIEBl bmQKIAogVEVTVChXS1dlYlZpZXcsIExvY2FsU3RvcmFnZUZldGNoRGF0YVJlY29yZHMpCkBAIC01 Nyw2ICs2OCw3IEBAIFRFU1QoV0tXZWJWaWV3LCBMb2NhbFN0b3JhZ2VGZXRjaERhdGFSZWNvcmRz KQogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRo RnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0 aW9uLmdldCgpXSk7CiAgICAgYXV0byB1aURlbGVnYXRlID0gYWRvcHROUyhbW0xvY2FsU3RvcmFn ZVVJRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKICAgICB3ZWJWaWV3LmdldCgpLlVJRGVsZWdhdGUg PSB1aURlbGVnYXRlLmdldCgpOworICAgIFt1aURlbGVnYXRlLmdldCgpIHNldEV4cGVjdGVkTWVz c2FnZTpAInRlc3RWYWx1ZSJdOwogICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPHNjcmlw dD5sb2NhbFN0b3JhZ2Uuc2V0SXRlbSgndGVzdEtleScsICd0ZXN0VmFsdWUnKTthbGVydChsb2Nh bFN0b3JhZ2UuZ2V0SXRlbSgndGVzdEtleScpKTs8L3NjcmlwdD4iIGJhc2VVUkw6W05TVVJMIFVS TFdpdGhTdHJpbmc6QCJodHRwOi8vbG9jYWxob3N0Il1dOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmcmVhZHlUb0NvbnRpbnVlKTsKIApAQCAtNzAsMyArODIsMzIgQEAgVEVTVChXS1dl YlZpZXcsIExvY2FsU3RvcmFnZUZldGNoRGF0YVJlY29yZHMpCiAgICAgfV07CiAgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZyZWFkeVRvQ29udGludWUpOwogfQorCitURVNUKFdLV2ViVmll dywgTG9jYWxTdG9yYWdlTm9SZWNvcmRBZnRlckdldEl0ZW0pCit7CisgICAgcmVhZHlUb0NvbnRp bnVlID0gZmFsc2U7CisgICAgW1tXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0g cmVtb3ZlRGF0YU9mVHlwZXM6W1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVz XSBtb2RpZmllZFNpbmNlOltOU0RhdGUgZGlzdGFudFBhc3RdIGNvbXBsZXRpb25IYW5kbGVyOl4o KSB7CisgICAgICAgIHJlYWR5VG9Db250aW51ZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZyZWFkeVRvQ29udGludWUpOworCisgICAgYXV0byBjb25maWd1 cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK KyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv bi5nZXQoKV0pOworICAgIGF1dG8gdWlEZWxlZ2F0ZSA9IGFkb3B0TlMoW1tMb2NhbFN0b3JhZ2VV SURlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgd2ViVmlldy5nZXQoKS5VSURlbGVnYXRlID0g dWlEZWxlZ2F0ZS5nZXQoKTsKKyAgICByZWFkeVRvQ29udGludWUgPSBmYWxzZTsKKyAgICBbdWlE ZWxlZ2F0ZS5nZXQoKSBzZXRFeHBlY3RlZE1lc3NhZ2U6QCJudWxsIl07CisgICAgW3dlYlZpZXcg bG9hZEhUTUxTdHJpbmc6QCI8c2NyaXB0PmFsZXJ0KGxvY2FsU3RvcmFnZS5nZXRJdGVtKCd0ZXN0 S2V5JykpOzwvc2NyaXB0PiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly93 ZWJraXQub3JnIl1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVhZHlUb0NvbnRp bnVlKTsKKworICAgIHJlYWR5VG9Db250aW51ZSA9IGZhbHNlOworICAgIFtbV0tXZWJzaXRlRGF0 YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdIGZldGNoRGF0YVJlY29yZHNPZlR5cGVzOltXS1dlYnNp dGVEYXRhU3RvcmUgYWxsV2Vic2l0ZURhdGFUeXBlc10gY29tcGxldGlvbkhhbmRsZXI6XihOU0Fy cmF5PFdLV2Vic2l0ZURhdGFSZWNvcmQgKj4gKmRhdGFSZWNvcmRzKSB7CisgICAgICAgIEVYUEVD VF9FUSgwdSwgZGF0YVJlY29yZHMuY291bnQpOworICAgICAgICByZWFkeVRvQ29udGludWUgPSB0 cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVhZHlUb0NvbnRp bnVlKTsKKworICAgIFJldGFpblB0cjxOU1VSTD4gdXJsID0gW1tbY29uZmlndXJhdGlvbiB3ZWJz aXRlRGF0YVN0b3JlXSBfY29uZmlndXJhdGlvbl0gX3dlYlN0b3JhZ2VEaXJlY3RvcnldOworICAg IE5TQXJyYXkgKmZpbGVzID0gW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjb250ZW50 c09mRGlyZWN0b3J5QXRQYXRoOnVybC5nZXQoKS5wYXRoIGVycm9yOm5pbF07CisgICAgRVhQRUNU X0VRKDBVLCBbZmlsZXMgY291bnRdKTsKK30K