237537 2022-03-07 09:25:24 -0800 File System Access: throw exception if file or directory cannot be accessed in file system 2022-03-08 15:07:18 -0800 1 1 1 Unclassified WebKit Website Storage WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez sihui_liu webkit-bug-importer youennf oldest_to_newest 1848792 0 sihui_liu 2022-03-07 09:25:24 -0800 ... 1848990 1 454041 sihui_liu 2022-03-07 15:09:03 -0800 Created attachment 454041 Patch 1849149 2 454041 youennf 2022-03-08 01:03:07 -0800 Comment on attachment 454041 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454041&action=review > Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp:60 > + return nullptr; Should we add release logging if we are not able to create the file handle? 1849252 3 454041 cdumez 2022-03-08 07:22:33 -0800 Comment on attachment 454041 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454041&action=review I assume this is not testable? > Source/WebKit/ChangeLog:8 > + When a FileSystemHandle is created, we will ensure that correspoding directory or file exists (create the Typo: correspoding 1849341 4 454041 sihui_liu 2022-03-08 11:27:12 -0800 Comment on attachment 454041 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454041&action=review >> Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp:60 >> + return nullptr; > > Should we add release logging if we are not able to create the file handle? The boolean result does not contain error information (and from the error type we can probably infer the errored place), so I would prefer adding error log when we need to debug an error we spot in production builds. 1849342 5 sihui_liu 2022-03-08 11:28:21 -0800 (In reply to Chris Dumez from comment #3) > Comment on attachment 454041 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454041&action=review > > I assume this is not testable? > > > Source/WebKit/ChangeLog:8 > > + When a FileSystemHandle is created, we will ensure that correspoding directory or file exists (create the > > Typo: correspoding ah will change 1849343 6 454135 sihui_liu 2022-03-08 11:28:37 -0800 Created attachment 454135 Patch for landing 1849345 7 454136 sihui_liu 2022-03-08 11:29:00 -0800 Created attachment 454136 Patch for landing 1849414 8 ews-feeder 2022-03-08 15:06:01 -0800 Committed r291014 (248189@main): <https://commits.webkit.org/248189@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454136. 1849415 9 webkit-bug-importer 2022-03-08 15:07:18 -0800 <rdar://problem/89992180> 454041 2022-03-07 15:09:03 -0800 2022-03-08 11:28:34 -0800 Patch bug-237537-20220307150902.patch text/plain 6222 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY0MmVkMTg5MmZmMGYwZTY2 MDdhNjlhMTNjNTdlMTYxYWI0MmRiNzEuLjg1YTlhNDIxODM4ZTI2MDkyZTc1YzJlOTg3ODIwYzU0 Yzg1ZjFhYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMDcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmlsZSBTeXN0ZW0gQWNjZXNzOiB0 aHJvdyBleGNlcHRpb24gaWYgZmlsZSBvciBkaXJlY3RvcnkgY2Fubm90IGJlIGFjY2Vzc2VkIGlu IGZpbGUgc3lzdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzc1MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXaGVuIGEgRmlsZVN5c3RlbUhhbmRsZSBpcyBjcmVhdGVkLCB3ZSB3aWxsIGVuc3VyZSB0 aGF0IGNvcnJlc3BvZGluZyBkaXJlY3Rvcnkgb3IgZmlsZSBleGlzdHMgKGNyZWF0ZSB0aGUgCisg ICAgICAgIGRpcmVjdG9yeSBvciBmaWxlIGlmIGl0IGRvZXMgbm90IGV4aXN0IHlldCkuIEhvd2V2 ZXIsIHdlIGRpZCBub3QgY2hlY2sgdGhlIHJlc3VsdCBvZiB0aGUgZmlsZSBzeXN0ZW0gY2FsbHMu CisgICAgICAgIFRoYXQgbWVhbnMsIHdlIG1heSBmYWlsIHRvIGNyZWF0ZSB0aGUgZmlsZSAoZS5n LiBkdWUgdG8gbm8gZGlzayBzcGFjZSwgb3IgY2FzZXMgaW4gcmRhcjovLzg5MjkxNTY2KSwgYnV0 IHdlIAorICAgICAgICBzdGlsbCByZXR1cm4gc3VjY2VzcyB0byB0aGUgRmlsZVN5c3RlbUhhbmRs ZSBjcmVhdGlvbiByZXF1ZXN0LiBXZSBzaG91bGQgZml4IHRoaXMgYnkgY2hlY2tpbmcgdGhlIGZp bGUgc3lzdGVtCisgICAgICAgIGNhbGwncyByZXN1bHQgYmVmb3JlIGNvbXBsZXRpbmcgdGhlIHJl cXVlc3QuICAKKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxlU3lzdGVtU3RvcmFnZUhhbmRs ZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OkZp bGVTeXN0ZW1TdG9yYWdlSGFuZGxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdl L0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3Rv cmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxl U3lzdGVtU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUhhbmRsZSk6CisKIDIwMjItMDMtMDcgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBPcHRpbWl6ZSB0aGUgcGFzc2lu ZyBvZiBkYXRhIGFjcm9zcyB0aHJlYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmNwcApp bmRleCA4MmQyY2Y1OWZkNzMxMGQzOWRmMjNlY2I1YTM2YjlhMjg2OTkzZTU1Li5iNmUzYzM5Mzg1 ZTI5ZTdjNzRiOGEzYzI5MGNmMjUyYmZmOGUzODMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZUhh bmRsZS5jcHAKQEAgLTM5LDI4ICszOSwzNyBAQCBjb25zdGV4cHIgY2hhciBwYXRoU2VwYXJhdG9y ID0gJ1xcJzsKIGNvbnN0ZXhwciBjaGFyIHBhdGhTZXBhcmF0b3IgPSAnLyc7CiAjZW5kaWYKIAot RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OkZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlKEZpbGVTeXN0 ZW1TdG9yYWdlTWFuYWdlciYgbWFuYWdlciwgVHlwZSB0eXBlLCBTdHJpbmcmJiBwYXRoLCBTdHJp bmcmJiBuYW1lKQotICAgIDogbV9pZGVudGlmaWVyKFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJ ZGVudGlmaWVyOjpnZW5lcmF0ZVRocmVhZFNhZmUoKSkKLSAgICAsIG1fbWFuYWdlcihtYW5hZ2Vy KQotICAgICwgbV90eXBlKHR5cGUpCi0gICAgLCBtX3BhdGgoV1RGTW92ZShwYXRoKSkKLSAgICAs IG1fbmFtZShXVEZNb3ZlKG5hbWUpKQorc3RkOjp1bmlxdWVfcHRyPEZpbGVTeXN0ZW1TdG9yYWdl SGFuZGxlPiBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6Y3JlYXRlKEZpbGVTeXN0ZW1TdG9yYWdl TWFuYWdlciYgbWFuYWdlciwgVHlwZSB0eXBlLCBTdHJpbmcmJiBwYXRoLCBTdHJpbmcmJiBuYW1l KQogewotICAgIEFTU0VSVCghbV9wYXRoLmlzRW1wdHkoKSk7Ci0KLSAgICBzd2l0Y2ggKG1fdHlw ZSkgeworICAgIGJvb2wgY2FuQWNjZXNzID0gZmFsc2U7CisgICAgc3dpdGNoICh0eXBlKSB7CiAg ICAgY2FzZSBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6VHlwZTo6RGlyZWN0b3J5OgotICAgICAg ICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMobV9wYXRoKTsKLSAgICAgICAgcmV0dXJu OworICAgICAgICBjYW5BY2Nlc3MgPSBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMocGF0 aCk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OlR5 cGU6OkZpbGU6Ci0gICAgICAgIGlmICghRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhtX3BhdGgpKSB7 Ci0gICAgICAgICAgICBhdXRvIGhhbmRsZSA9IEZpbGVTeXN0ZW06Om9wZW5GaWxlKG1fcGF0aCwg RmlsZVN5c3RlbTo6RmlsZU9wZW5Nb2RlOjpXcml0ZSk7CisgICAgICAgIGlmIChhdXRvIGhhbmRs ZSA9IEZpbGVTeXN0ZW06Om9wZW5GaWxlKHBhdGgsIEZpbGVTeXN0ZW06OkZpbGVPcGVuTW9kZTo6 V3JpdGUpOyBGaWxlU3lzdGVtOjppc0hhbmRsZVZhbGlkKGhhbmRsZSkpIHsKICAgICAgICAgICAg IEZpbGVTeXN0ZW06OmNsb3NlRmlsZShoYW5kbGUpOworICAgICAgICAgICAgY2FuQWNjZXNzID0g dHJ1ZTsKICAgICAgICAgfQotICAgICAgICByZXR1cm47CisgICAgICAgIGJyZWFrOwogICAgIGNh c2UgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OlR5cGU6OkFueToKICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgfQorCisgICAgaWYgKCFjYW5BY2Nlc3MpCisgICAgICAgIHJldHVy biBudWxscHRyOworCisgICAgcmV0dXJuIHN0ZDo6dW5pcXVlX3B0cjxGaWxlU3lzdGVtU3RvcmFn ZUhhbmRsZT4obmV3IEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlKG1hbmFnZXIsIHR5cGUsIFdURk1v dmUocGF0aCksIFdURk1vdmUobmFtZSkpKTsKK30KKworRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6 OkZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlKEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciYgbWFuYWdl ciwgVHlwZSB0eXBlLCBTdHJpbmcmJiBwYXRoLCBTdHJpbmcmJiBuYW1lKQorICAgIDogbV9pZGVu dGlmaWVyKFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyOjpnZW5lcmF0ZVRocmVh ZFNhZmUoKSkKKyAgICAsIG1fbWFuYWdlcihtYW5hZ2VyKQorICAgICwgbV90eXBlKHR5cGUpCisg ICAgLCBtX3BhdGgoV1RGTW92ZShwYXRoKSkKKyAgICAsIG1fbmFtZShXVEZNb3ZlKG5hbWUpKQor eworICAgIEFTU0VSVCghbV9wYXRoLmlzRW1wdHkoKSk7CiB9CiAKIHZvaWQgRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGU6OmNsb3NlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZUhhbmRsZS5oIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmgKaW5kZXggMTYx YTg5YjgwYTNkMTg0YWYxZDM5OGFlODEzZjgzMDFjZWIwNTc0Ni4uOTBlYTJjZThmMjUxNTI1OWI0 N2Y4NDM1YWE0MTJmZmNhNDM4MmNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmgKQEAg LTQzLDcgKzQzLDcgQEAgY2xhc3MgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUgOiBwdWJsaWMgQ2Fu TWFrZVdlYWtQdHI8RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUsIFcKICAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBlbnVtIGNsYXNzIFR5cGUgOiB1aW50OF90IHsgRmls ZSwgRGlyZWN0b3J5LCBBbnkgfTsKLSAgICBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZShGaWxlU3lz dGVtU3RvcmFnZU1hbmFnZXImLCBUeXBlLCBTdHJpbmcmJiBwYXRoLCBTdHJpbmcmJiBuYW1lKTsK KyAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlPiBjcmVh dGUoRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyJiwgVHlwZSwgU3RyaW5nJiYgcGF0aCwgU3RyaW5n JiYgbmFtZSk7CiAKICAgICBXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmllciBpZGVu dGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAgICAgY29uc3QgU3RyaW5n JiBwYXRoKCkgY29uc3QgeyByZXR1cm4gbV9wYXRoOyB9CkBAIC02NSw2ICs2NSw3IEBAIHB1Ymxp YzoKICAgICBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZpbGVTeXN0ZW1TeW5jQWNjZXNzSGFuZGxl SWRlbnRpZmllcj4gYWN0aXZlU3luY0FjY2Vzc0hhbmRsZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWN0 aXZlU3luY0FjY2Vzc0hhbmRsZTsgfQogCiBwcml2YXRlOgorICAgIEZpbGVTeXN0ZW1TdG9yYWdl SGFuZGxlKEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciYsIFR5cGUsIFN0cmluZyYmIHBhdGgsIFN0 cmluZyYmIG5hbWUpOwogICAgIEV4cGVjdGVkPFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJZGVu dGlmaWVyLCBGaWxlU3lzdGVtU3RvcmFnZUVycm9yPiByZXF1ZXN0Q3JlYXRlSGFuZGxlKElQQzo6 Q29ubmVjdGlvbjo6VW5pcXVlSUQsIFR5cGUsIFN0cmluZyYmIG5hbWUsIGJvb2wgY3JlYXRlSWZO ZWNlc3NhcnkpOwogCiAgICAgV2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIgbV9p ZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9y YWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA2Y2RiNzk2 NTNhNjhlNTFkZTVkNTExNDYwYjNhNWNlOThmZmYwNGIwLi41ODQ2MjMxMDllYzYyNTgzMGNkZTZm NmZlNzYyM2ZkNTBmY2Y5OTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcApA QCAtNzcsNyArNzcsOSBAQCBFeHBlY3RlZDxXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRp ZmllciwgRmlsZVN5c3RlbVN0b3JhZ2VFcnJvcj4gRmlsZVN5c3RlbQogICAgICAgICB9CiAgICAg fQogCi0gICAgYXV0byBuZXdIYW5kbGUgPSBtYWtlVW5pcXVlPEZpbGVTeXN0ZW1TdG9yYWdlSGFu ZGxlPigqdGhpcywgdHlwZSwgV1RGTW92ZShwYXRoKSwgV1RGTW92ZShuYW1lKSk7CisgICAgYXV0 byBuZXdIYW5kbGUgPSBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6Y3JlYXRlKCp0aGlzLCB0eXBl LCBXVEZNb3ZlKHBhdGgpLCBXVEZNb3ZlKG5hbWUpKTsKKyAgICBpZiAoIW5ld0hhbmRsZSkKKyAg ICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKEZpbGVTeXN0ZW1TdG9yYWdlRXJyb3I6OlVua25v d24pOwogICAgIGF1dG8gbmV3SGFuZGxlSWRlbnRpZmllciA9IG5ld0hhbmRsZS0+aWRlbnRpZmll cigpOwogICAgIG1faGFuZGxlc0J5Q29ubmVjdGlvbi5lbnN1cmUoY29ubmVjdGlvbiwgWyZdIHsK ICAgICAgICAgcmV0dXJuIEhhc2hTZXQ8V2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZp ZXI+IHsgfTsK 454135 2022-03-08 11:28:37 -0800 2022-03-08 11:28:57 -0800 Patch for landing bug-237537-20220308112836.patch text/plain 6238 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhOWI5OTNmOWVmYzQ3NGY2 NTU0MmFkMWEzOWM1MTUzNjAyMDI1ZmYuLjNlNmZjNmI5OTk0N2UyNTY2OGVhNjA1YWUxMWE3ZjUy ODc0MTUxMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMDggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmlsZSBTeXN0ZW0gQWNjZXNzOiB0 aHJvdyBleGNlcHRpb24gaWYgZmlsZSBvciBkaXJlY3RvcnkgY2Fubm90IGJlIGFjY2Vzc2VkIGlu IGZpbGUgc3lzdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzc1MzcKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAg ICAgIFdoZW4gYSBGaWxlU3lzdGVtSGFuZGxlIGlzIGNyZWF0ZWQsIHdlIHdpbGwgZW5zdXJlIHRo YXQgY29ycmVzcG9kaW5nIGRpcmVjdG9yeSBvciBmaWxlIGV4aXN0cyAoY3JlYXRlIHRoZSAKKyAg ICAgICAgZGlyZWN0b3J5IG9yIGZpbGUgaWYgaXQgZG9lcyBub3QgZXhpc3QgeWV0KS4gSG93ZXZl ciwgd2UgZGlkIG5vdCBjaGVjayB0aGUgcmVzdWx0IG9mIHRoZSBmaWxlIHN5c3RlbSBjYWxscy4K KyAgICAgICAgVGhhdCBtZWFucywgd2UgbWF5IGZhaWwgdG8gY3JlYXRlIHRoZSBmaWxlIChlLmcu IGR1ZSB0byBubyBkaXNrIHNwYWNlLCBvciBjYXNlcyBpbiByZGFyOi8vODkyOTE1NjYpLCBidXQg d2UgCisgICAgICAgIHN0aWxsIHJldHVybiBzdWNjZXNzIHRvIHRoZSBGaWxlU3lzdGVtSGFuZGxl IGNyZWF0aW9uIHJlcXVlc3QuIFdlIHNob3VsZCBmaXggdGhpcyBieSBjaGVja2luZyB0aGUgZmls ZSBzeXN0ZW0KKyAgICAgICAgY2FsbCdzIHJlc3VsdCBiZWZvcmUgY29tcGxldGluZyB0aGUgcmVx dWVzdC4gIAorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3Rv cmFnZUhhbmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxl OjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6Rmls ZVN5c3RlbVN0b3JhZ2VIYW5kbGUpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2Uv RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9y YWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbGVT eXN0ZW1TdG9yYWdlTWFuYWdlcjo6Y3JlYXRlSGFuZGxlKToKKwogMjAyMi0wMy0wOCAgU2lodWkg TGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBGaWxlIFN5c3RlbSBBY2Nlc3M6 IGRpc2FsbG93IGVtcHR5IG5hbWUgaW4gRmlsZVN5c3RlbUhhbmRsZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxl LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3Rv cmFnZUhhbmRsZS5jcHAKaW5kZXggNzhjNDgwNzIwNjgzN2JiNmNjOTVkYjk1ZjQ2OTEyOTY1MGVj NGFiNy4uNzI2NGNjODJjOWQwNWM0MTBkMzhlZjEzNmY2NDZkOGU1N2RiNWUwMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdl SGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmls ZVN5c3RlbVN0b3JhZ2VIYW5kbGUuY3BwCkBAIC0zOSwyOCArMzksMzcgQEAgY29uc3RleHByIGNo YXIgcGF0aFNlcGFyYXRvciA9ICdcXCc7CiBjb25zdGV4cHIgY2hhciBwYXRoU2VwYXJhdG9yID0g Jy8nOwogI2VuZGlmCiAKLUZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpGaWxlU3lzdGVtU3RvcmFn ZUhhbmRsZShGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXImIG1hbmFnZXIsIFR5cGUgdHlwZSwgU3Ry aW5nJiYgcGF0aCwgU3RyaW5nJiYgbmFtZSkKLSAgICA6IG1faWRlbnRpZmllcihXZWJDb3JlOjpG aWxlU3lzdGVtSGFuZGxlSWRlbnRpZmllcjo6Z2VuZXJhdGVUaHJlYWRTYWZlKCkpCi0gICAgLCBt X21hbmFnZXIobWFuYWdlcikKLSAgICAsIG1fdHlwZSh0eXBlKQotICAgICwgbV9wYXRoKFdURk1v dmUocGF0aCkpCi0gICAgLCBtX25hbWUoV1RGTW92ZShuYW1lKSkKK3N0ZDo6dW5pcXVlX3B0cjxG aWxlU3lzdGVtU3RvcmFnZUhhbmRsZT4gRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OmNyZWF0ZShG aWxlU3lzdGVtU3RvcmFnZU1hbmFnZXImIG1hbmFnZXIsIFR5cGUgdHlwZSwgU3RyaW5nJiYgcGF0 aCwgU3RyaW5nJiYgbmFtZSkKIHsKLSAgICBBU1NFUlQoIW1fcGF0aC5pc0VtcHR5KCkpOwotCi0g ICAgc3dpdGNoIChtX3R5cGUpIHsKKyAgICBib29sIGNhbkFjY2VzcyA9IGZhbHNlOworICAgIHN3 aXRjaCAodHlwZSkgewogICAgIGNhc2UgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OlR5cGU6OkRp cmVjdG9yeToKLSAgICAgICAgRmlsZVN5c3RlbTo6bWFrZUFsbERpcmVjdG9yaWVzKG1fcGF0aCk7 Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgY2FuQWNjZXNzID0gRmlsZVN5c3RlbTo6bWFrZUFs bERpcmVjdG9yaWVzKHBhdGgpOworICAgICAgICBicmVhazsKICAgICBjYXNlIEZpbGVTeXN0ZW1T dG9yYWdlSGFuZGxlOjpUeXBlOjpGaWxlOgotICAgICAgICBpZiAoIUZpbGVTeXN0ZW06OmZpbGVF eGlzdHMobV9wYXRoKSkgewotICAgICAgICAgICAgYXV0byBoYW5kbGUgPSBGaWxlU3lzdGVtOjpv cGVuRmlsZShtX3BhdGgsIEZpbGVTeXN0ZW06OkZpbGVPcGVuTW9kZTo6V3JpdGUpOworICAgICAg ICBpZiAoYXV0byBoYW5kbGUgPSBGaWxlU3lzdGVtOjpvcGVuRmlsZShwYXRoLCBGaWxlU3lzdGVt OjpGaWxlT3Blbk1vZGU6OldyaXRlKTsgRmlsZVN5c3RlbTo6aXNIYW5kbGVWYWxpZChoYW5kbGUp KSB7CiAgICAgICAgICAgICBGaWxlU3lzdGVtOjpjbG9zZUZpbGUoaGFuZGxlKTsKKyAgICAgICAg ICAgIGNhbkFjY2VzcyA9IHRydWU7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuOworICAgICAg ICBicmVhazsKICAgICBjYXNlIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpUeXBlOjpBbnk6CiAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KKworICAgIGlmICghY2FuQWNjZXNz KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8 RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU+KG5ldyBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZShtYW5h Z2VyLCB0eXBlLCBXVEZNb3ZlKHBhdGgpLCBXVEZNb3ZlKG5hbWUpKSk7Cit9CisKK0ZpbGVTeXN0 ZW1TdG9yYWdlSGFuZGxlOjpGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZShGaWxlU3lzdGVtU3RvcmFn ZU1hbmFnZXImIG1hbmFnZXIsIFR5cGUgdHlwZSwgU3RyaW5nJiYgcGF0aCwgU3RyaW5nJiYgbmFt ZSkKKyAgICA6IG1faWRlbnRpZmllcihXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmll cjo6Z2VuZXJhdGVUaHJlYWRTYWZlKCkpCisgICAgLCBtX21hbmFnZXIobWFuYWdlcikKKyAgICAs IG1fdHlwZSh0eXBlKQorICAgICwgbV9wYXRoKFdURk1vdmUocGF0aCkpCisgICAgLCBtX25hbWUo V1RGTW92ZShuYW1lKSkKK3sKKyAgICBBU1NFUlQoIW1fcGF0aC5pc0VtcHR5KCkpOwogfQogCiB2 b2lkIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpjbG9zZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUuaCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZUhh bmRsZS5oCmluZGV4IDE2MWE4OWI4MGEzZDE4NGFmMWQzOThhZTgxM2Y4MzAxY2ViMDU3NDYuLjkw ZWEyY2U4ZjI1MTUyNTliNDdmODQzNWFhNDEyZmZjYTQzODJjYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZUhhbmRsZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3Rv cmFnZUhhbmRsZS5oCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIEZpbGVTeXN0ZW1TdG9yYWdlSGFu ZGxlIDogcHVibGljIENhbk1ha2VXZWFrUHRyPEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLCBXCiAg ICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBUeXBl IDogdWludDhfdCB7IEZpbGUsIERpcmVjdG9yeSwgQW55IH07Ci0gICAgRmlsZVN5c3RlbVN0b3Jh Z2VIYW5kbGUoRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyJiwgVHlwZSwgU3RyaW5nJiYgcGF0aCwg U3RyaW5nJiYgbmFtZSk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxGaWxlU3lzdGVtU3Rv cmFnZUhhbmRsZT4gY3JlYXRlKEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciYsIFR5cGUsIFN0cmlu ZyYmIHBhdGgsIFN0cmluZyYmIG5hbWUpOwogCiAgICAgV2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRs ZUlkZW50aWZpZXIgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQog ICAgIGNvbnN0IFN0cmluZyYgcGF0aCgpIGNvbnN0IHsgcmV0dXJuIG1fcGF0aDsgfQpAQCAtNjUs NiArNjUsNyBAQCBwdWJsaWM6CiAgICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGaWxlU3lzdGVt U3luY0FjY2Vzc0hhbmRsZUlkZW50aWZpZXI+IGFjdGl2ZVN5bmNBY2Nlc3NIYW5kbGUoKSBjb25z dCB7IHJldHVybiBtX2FjdGl2ZVN5bmNBY2Nlc3NIYW5kbGU7IH0KIAogcHJpdmF0ZToKKyAgICBG aWxlU3lzdGVtU3RvcmFnZUhhbmRsZShGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXImLCBUeXBlLCBT dHJpbmcmJiBwYXRoLCBTdHJpbmcmJiBuYW1lKTsKICAgICBFeHBlY3RlZDxXZWJDb3JlOjpGaWxl U3lzdGVtSGFuZGxlSWRlbnRpZmllciwgRmlsZVN5c3RlbVN0b3JhZ2VFcnJvcj4gcmVxdWVzdENy ZWF0ZUhhbmRsZShJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlELCBUeXBlLCBTdHJpbmcmJiBuYW1l LCBib29sIGNyZWF0ZUlmTmVjZXNzYXJ5KTsKIAogICAgIFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5k bGVJZGVudGlmaWVyIG1faWRlbnRpZmllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5j cHAKaW5kZXggNmNkYjc5NjUzYTY4ZTUxZGU1ZDUxMTQ2MGIzYTVjZTk4ZmZmMDRiMC4uNTg0NjIz MTA5ZWM2MjU4MzBjZGU2ZjZmZTc2MjNmZDUwZmNmOTkyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9y YWdlTWFuYWdlci5jcHAKQEAgLTc3LDcgKzc3LDkgQEAgRXhwZWN0ZWQ8V2ViQ29yZTo6RmlsZVN5 c3RlbUhhbmRsZUlkZW50aWZpZXIsIEZpbGVTeXN0ZW1TdG9yYWdlRXJyb3I+IEZpbGVTeXN0ZW0K ICAgICAgICAgfQogICAgIH0KIAotICAgIGF1dG8gbmV3SGFuZGxlID0gbWFrZVVuaXF1ZTxGaWxl U3lzdGVtU3RvcmFnZUhhbmRsZT4oKnRoaXMsIHR5cGUsIFdURk1vdmUocGF0aCksIFdURk1vdmUo bmFtZSkpOworICAgIGF1dG8gbmV3SGFuZGxlID0gRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OmNy ZWF0ZSgqdGhpcywgdHlwZSwgV1RGTW92ZShwYXRoKSwgV1RGTW92ZShuYW1lKSk7CisgICAgaWYg KCFuZXdIYW5kbGUpCisgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChGaWxlU3lzdGVtU3Rv cmFnZUVycm9yOjpVbmtub3duKTsKICAgICBhdXRvIG5ld0hhbmRsZUlkZW50aWZpZXIgPSBuZXdI YW5kbGUtPmlkZW50aWZpZXIoKTsKICAgICBtX2hhbmRsZXNCeUNvbm5lY3Rpb24uZW5zdXJlKGNv bm5lY3Rpb24sIFsmXSB7CiAgICAgICAgIHJldHVybiBIYXNoU2V0PFdlYkNvcmU6OkZpbGVTeXN0 ZW1IYW5kbGVJZGVudGlmaWVyPiB7IH07Cg== 454136 2022-03-08 11:29:00 -0800 2022-03-08 15:06:03 -0800 Patch for landing bug-237537-20220308112900.patch text/plain 6239 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhOWI5OTNmOWVmYzQ3NGY2 NTU0MmFkMWEzOWM1MTUzNjAyMDI1ZmYuLjU1MTRmNDEzMzU2MTM5MTUzYjBlMTI0MTg5OGJlNTQx M2NmNDM0MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMDggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmlsZSBTeXN0ZW0gQWNjZXNzOiB0 aHJvdyBleGNlcHRpb24gaWYgZmlsZSBvciBkaXJlY3RvcnkgY2Fubm90IGJlIGFjY2Vzc2VkIGlu IGZpbGUgc3lzdGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzc1MzcKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAg ICAgIFdoZW4gYSBGaWxlU3lzdGVtSGFuZGxlIGlzIGNyZWF0ZWQsIHdlIHdpbGwgZW5zdXJlIHRo YXQgY29ycmVzcG9uZGluZyBkaXJlY3Rvcnkgb3IgZmlsZSBleGlzdHMgKGNyZWF0ZSB0aGUgCisg ICAgICAgIGRpcmVjdG9yeSBvciBmaWxlIGlmIGl0IGRvZXMgbm90IGV4aXN0IHlldCkuIEhvd2V2 ZXIsIHdlIGRpZCBub3QgY2hlY2sgdGhlIHJlc3VsdCBvZiB0aGUgZmlsZSBzeXN0ZW0gY2FsbHMu CisgICAgICAgIFRoYXQgbWVhbnMsIHdlIG1heSBmYWlsIHRvIGNyZWF0ZSB0aGUgZmlsZSAoZS5n LiBkdWUgdG8gbm8gZGlzayBzcGFjZSwgb3IgY2FzZXMgaW4gcmRhcjovLzg5MjkxNTY2KSwgYnV0 IHdlIAorICAgICAgICBzdGlsbCByZXR1cm4gc3VjY2VzcyB0byB0aGUgRmlsZVN5c3RlbUhhbmRs ZSBjcmVhdGlvbiByZXF1ZXN0LiBXZSBzaG91bGQgZml4IHRoaXMgYnkgY2hlY2tpbmcgdGhlIGZp bGUgc3lzdGVtCisgICAgICAgIGNhbGwncyByZXN1bHQgYmVmb3JlIGNvbXBsZXRpbmcgdGhlIHJl cXVlc3QuICAKKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxlU3lzdGVtU3RvcmFnZUhhbmRs ZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OkZp bGVTeXN0ZW1TdG9yYWdlSGFuZGxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdl L0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3Rv cmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxl U3lzdGVtU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUhhbmRsZSk6CisKIDIwMjItMDMtMDggIFNpaHVp IExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgRmlsZSBTeXN0ZW0gQWNjZXNz OiBkaXNhbGxvdyBlbXB0eSBuYW1lIGluIEZpbGVTeXN0ZW1IYW5kbGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZUhhbmRs ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGUuY3BwCmluZGV4IDc4YzQ4MDcyMDY4MzdiYjZjYzk1ZGI5NWY0NjkxMjk2NTBl YzRhYjcuLjcyNjRjYzgyYzlkMDVjNDEwZDM4ZWYxMzZmNjQ2ZDhlNTdkYjVlMDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFn ZUhhbmRsZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0Zp bGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmNwcApAQCAtMzksMjggKzM5LDM3IEBAIGNvbnN0ZXhwciBj aGFyIHBhdGhTZXBhcmF0b3IgPSAnXFwnOwogY29uc3RleHByIGNoYXIgcGF0aFNlcGFyYXRvciA9 ICcvJzsKICNlbmRpZgogCi1GaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6RmlsZVN5c3RlbVN0b3Jh Z2VIYW5kbGUoRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyJiBtYW5hZ2VyLCBUeXBlIHR5cGUsIFN0 cmluZyYmIHBhdGgsIFN0cmluZyYmIG5hbWUpCi0gICAgOiBtX2lkZW50aWZpZXIoV2ViQ29yZTo6 RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXI6OmdlbmVyYXRlVGhyZWFkU2FmZSgpKQotICAgICwg bV9tYW5hZ2VyKG1hbmFnZXIpCi0gICAgLCBtX3R5cGUodHlwZSkKLSAgICAsIG1fcGF0aChXVEZN b3ZlKHBhdGgpKQotICAgICwgbV9uYW1lKFdURk1vdmUobmFtZSkpCitzdGQ6OnVuaXF1ZV9wdHI8 RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU+IEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpjcmVhdGUo RmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyJiBtYW5hZ2VyLCBUeXBlIHR5cGUsIFN0cmluZyYmIHBh dGgsIFN0cmluZyYmIG5hbWUpCiB7Ci0gICAgQVNTRVJUKCFtX3BhdGguaXNFbXB0eSgpKTsKLQot ICAgIHN3aXRjaCAobV90eXBlKSB7CisgICAgYm9vbCBjYW5BY2Nlc3MgPSBmYWxzZTsKKyAgICBz d2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpUeXBlOjpE aXJlY3Rvcnk6Ci0gICAgICAgIEZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3RvcmllcyhtX3BhdGgp OwotICAgICAgICByZXR1cm47CisgICAgICAgIGNhbkFjY2VzcyA9IEZpbGVTeXN0ZW06Om1ha2VB bGxEaXJlY3RvcmllcyhwYXRoKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGaWxlU3lzdGVt U3RvcmFnZUhhbmRsZTo6VHlwZTo6RmlsZToKLSAgICAgICAgaWYgKCFGaWxlU3lzdGVtOjpmaWxl RXhpc3RzKG1fcGF0aCkpIHsKLSAgICAgICAgICAgIGF1dG8gaGFuZGxlID0gRmlsZVN5c3RlbTo6 b3BlbkZpbGUobV9wYXRoLCBGaWxlU3lzdGVtOjpGaWxlT3Blbk1vZGU6OldyaXRlKTsKKyAgICAg ICAgaWYgKGF1dG8gaGFuZGxlID0gRmlsZVN5c3RlbTo6b3BlbkZpbGUocGF0aCwgRmlsZVN5c3Rl bTo6RmlsZU9wZW5Nb2RlOjpXcml0ZSk7IEZpbGVTeXN0ZW06OmlzSGFuZGxlVmFsaWQoaGFuZGxl KSkgewogICAgICAgICAgICAgRmlsZVN5c3RlbTo6Y2xvc2VGaWxlKGhhbmRsZSk7CisgICAgICAg ICAgICBjYW5BY2Nlc3MgPSB0cnVlOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKKyAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6VHlwZTo6QW55Ogog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CisKKyAgICBpZiAoIWNhbkFjY2Vz cykKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRy PEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlPihuZXcgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUobWFu YWdlciwgdHlwZSwgV1RGTW92ZShwYXRoKSwgV1RGTW92ZShuYW1lKSkpOworfQorCitGaWxlU3lz dGVtU3RvcmFnZUhhbmRsZTo6RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUoRmlsZVN5c3RlbVN0b3Jh Z2VNYW5hZ2VyJiBtYW5hZ2VyLCBUeXBlIHR5cGUsIFN0cmluZyYmIHBhdGgsIFN0cmluZyYmIG5h bWUpCisgICAgOiBtX2lkZW50aWZpZXIoV2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZp ZXI6OmdlbmVyYXRlVGhyZWFkU2FmZSgpKQorICAgICwgbV9tYW5hZ2VyKG1hbmFnZXIpCisgICAg LCBtX3R5cGUodHlwZSkKKyAgICAsIG1fcGF0aChXVEZNb3ZlKHBhdGgpKQorICAgICwgbV9uYW1l KFdURk1vdmUobmFtZSkpCit7CisgICAgQVNTRVJUKCFtX3BhdGguaXNFbXB0eSgpKTsKIH0KIAog dm9pZCBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6Y2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlLmgg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VI YW5kbGUuaAppbmRleCAxNjFhODliODBhM2QxODRhZjFkMzk4YWU4MTNmODMwMWNlYjA1NzQ2Li45 MGVhMmNlOGYyNTE1MjU5YjQ3Zjg0MzVhYTQxMmZmY2E0MzgyY2IwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGUuaApAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBGaWxlU3lzdGVtU3RvcmFnZUhh bmRsZSA6IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZSwgVwog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIGVudW0gY2xhc3MgVHlw ZSA6IHVpbnQ4X3QgeyBGaWxlLCBEaXJlY3RvcnksIEFueSB9OwotICAgIEZpbGVTeXN0ZW1TdG9y YWdlSGFuZGxlKEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciYsIFR5cGUsIFN0cmluZyYmIHBhdGgs IFN0cmluZyYmIG5hbWUpOworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8RmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGU+IGNyZWF0ZShGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXImLCBUeXBlLCBTdHJp bmcmJiBwYXRoLCBTdHJpbmcmJiBuYW1lKTsKIAogICAgIFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5k bGVJZGVudGlmaWVyIGlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2lkZW50aWZpZXI7IH0K ICAgICBjb25zdCBTdHJpbmcmIHBhdGgoKSBjb25zdCB7IHJldHVybiBtX3BhdGg7IH0KQEAgLTY1 LDYgKzY1LDcgQEAgcHVibGljOgogICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6RmlsZVN5c3Rl bVN5bmNBY2Nlc3NIYW5kbGVJZGVudGlmaWVyPiBhY3RpdmVTeW5jQWNjZXNzSGFuZGxlKCkgY29u c3QgeyByZXR1cm4gbV9hY3RpdmVTeW5jQWNjZXNzSGFuZGxlOyB9CiAKIHByaXZhdGU6CisgICAg RmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUoRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyJiwgVHlwZSwg U3RyaW5nJiYgcGF0aCwgU3RyaW5nJiYgbmFtZSk7CiAgICAgRXhwZWN0ZWQ8V2ViQ29yZTo6Rmls ZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIsIEZpbGVTeXN0ZW1TdG9yYWdlRXJyb3I+IHJlcXVlc3RD cmVhdGVIYW5kbGUoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgVHlwZSwgU3RyaW5nJiYgbmFt ZSwgYm9vbCBjcmVhdGVJZk5lY2Vzc2FyeSk7CiAKICAgICBXZWJDb3JlOjpGaWxlU3lzdGVtSGFu ZGxlSWRlbnRpZmllciBtX2lkZW50aWZpZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIu Y3BwCmluZGV4IDZjZGI3OTY1M2E2OGU1MWRlNWQ1MTE0NjBiM2E1Y2U5OGZmZjA0YjAuLjU4NDYy MzEwOWVjNjI1ODMwY2RlNmY2ZmU3NjIzZmQ1MGZjZjk5MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3Rv cmFnZU1hbmFnZXIuY3BwCkBAIC03Nyw3ICs3Nyw5IEBAIEV4cGVjdGVkPFdlYkNvcmU6OkZpbGVT eXN0ZW1IYW5kbGVJZGVudGlmaWVyLCBGaWxlU3lzdGVtU3RvcmFnZUVycm9yPiBGaWxlU3lzdGVt CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBhdXRvIG5ld0hhbmRsZSA9IG1ha2VVbmlxdWU8Rmls ZVN5c3RlbVN0b3JhZ2VIYW5kbGU+KCp0aGlzLCB0eXBlLCBXVEZNb3ZlKHBhdGgpLCBXVEZNb3Zl KG5hbWUpKTsKKyAgICBhdXRvIG5ld0hhbmRsZSA9IEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpj cmVhdGUoKnRoaXMsIHR5cGUsIFdURk1vdmUocGF0aCksIFdURk1vdmUobmFtZSkpOworICAgIGlm ICghbmV3SGFuZGxlKQorICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoRmlsZVN5c3RlbVN0 b3JhZ2VFcnJvcjo6VW5rbm93bik7CiAgICAgYXV0byBuZXdIYW5kbGVJZGVudGlmaWVyID0gbmV3 SGFuZGxlLT5pZGVudGlmaWVyKCk7CiAgICAgbV9oYW5kbGVzQnlDb25uZWN0aW9uLmVuc3VyZShj b25uZWN0aW9uLCBbJl0gewogICAgICAgICByZXR1cm4gSGFzaFNldDxXZWJDb3JlOjpGaWxlU3lz dGVtSGFuZGxlSWRlbnRpZmllcj4geyB9Owo=