226190 2021-05-24 15:12:48 -0700 [GLIB] Stop using UncheckedLock in IconDatabase 2021-05-24 20:13:52 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez berto bugs-noreply cgarcia darin ews-watchlist ggaren gustavo mcatanzaro pnormand sam oldest_to_newest 1763271 0 cdumez 2021-05-24 15:12:48 -0700 Stop using UncheckedLock in IconDatabase to benefit from Clang thread-safety analysis. 1763272 1 429571 cdumez 2021-05-24 15:13:58 -0700 Created attachment 429571 Patch 1763273 2 ews-watchlist 2021-05-24 15:14:40 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1763289 3 429577 cdumez 2021-05-24 15:44:35 -0700 Created attachment 429577 Patch 1763331 4 429592 cdumez 2021-05-24 16:58:09 -0700 Created attachment 429592 Patch 1763406 5 ews-feeder 2021-05-24 20:13:47 -0700 Committed r277991 (238104@main): <https://commits.webkit.org/238104@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429592. 429571 2021-05-24 15:13:58 -0700 2021-05-24 15:44:33 -0700 Patch bug-226190-20210524151357.patch text/plain 1613 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliZDM2ZDcxODc0YjNjYWIy NzEyNDAyNDMyZTdmM2U1OTU3ZjU3YzUuLjRlODJkZmUxNzg2N2IwNTkyMDVhMzM2NWExZTQyY2U0 ODJjY2E5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbR0xJQl0gU3RvcCB1c2luZyBVbmNo ZWNrZWRMb2NrIGluIEljb25EYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNoZWNrZWRMb2NrIGluIEljb25EYXRhYmFz ZSB0byBiZW5lZml0IGZyb20gQ2xhbmcgdGhyZWFkLXNhZmV0eSBhbmFseXNpcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuaDoKKwogMjAyMS0wNS0yNCAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcmV2ZXJ0aW5nIHIyNzc5NDAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n bGliL0ljb25EYXRhYmFzZS5oCmluZGV4IDgwZTE3OGU2MWY1MGZhZmRmM2VhZDRkMjk4YTE4ODAx YWUwM2M3MTcuLjZkZGQ4YWE4ZWY1NTZlYjZmNDE4MzM1Y2RlOTZmZTI3M2U5NmNmZDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFzZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFzZS5oCkBAIC03 MSw4ICs3MSw4IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6U1FMaXRlRGF0YWJhc2UgbV9kYjsK ICAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBtX3BhZ2VVUkxUb0ljb25VUkxNYXA7CiAgICAg TG9jayBtX3BhZ2VVUkxUb0ljb25VUkxNYXBMb2NrOwotICAgIEhhc2hNYXA8U3RyaW5nLCBzdGQ6 OnBhaXI8V2ViQ29yZTo6UGxhdGZvcm1JbWFnZVB0ciwgTW9ub3RvbmljVGltZT4+IG1fbG9hZGVk SWNvbnM7Ci0gICAgVW5jaGVja2VkTG9jayBtX2xvYWRlZEljb25zTG9jazsKKyAgICBIYXNoTWFw PFN0cmluZywgc3RkOjpwYWlyPFdlYkNvcmU6OlBsYXRmb3JtSW1hZ2VQdHIsIE1vbm90b25pY1Rp bWU+PiBtX2xvYWRlZEljb25zIFdURl9HVUFSREVEX0JZX0xPQ0sobV9sb2FkZWRJY29uc0xvY2sp OworICAgIExvY2sgbV9sb2FkZWRJY29uc0xvY2s7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2Vi Q29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX2ljb25JREZvckljb25VUkxTdGF0ZW1lbnQ7CiAgICAg c3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV9zZXRJY29uSURGb3JQ YWdlVVJMU3RhdGVtZW50Owo= 429577 2021-05-24 15:44:35 -0700 2021-05-24 17:07:01 -0700 Patch bug-226190-20210524154434.patch text/plain 4801 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliZDM2ZDcxODc0YjNjYWIy NzEyNDAyNDMyZTdmM2U1OTU3ZjU3YzUuLjRlODJkZmUxNzg2N2IwNTkyMDVhMzM2NWExZTQyY2U0 ODJjY2E5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbR0xJQl0gU3RvcCB1c2luZyBVbmNo ZWNrZWRMb2NrIGluIEljb25EYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNoZWNrZWRMb2NrIGluIEljb25EYXRhYmFz ZSB0byBiZW5lZml0IGZyb20gQ2xhbmcgdGhyZWFkLXNhZmV0eSBhbmFseXNpcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuaDoKKwogMjAyMS0wNS0yNCAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcmV2ZXJ0aW5nIHIyNzc5NDAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2dsaWIvSWNvbkRhdGFiYXNlLmNwcAppbmRleCBkNzRhNDczZTIwYzkwMThmZTM2ZDVhYjZkZmQ4 YWE1MmI1YTY5YTUxLi4zYmMzZWQ5ZGY5OWE5MjMyMThhZWM0Mjk1ZWI2ZTgzOTNlZTczNWZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFzZS5j cHAKQEAgLTU2NiwzNyArNTY2LDM0IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpsb2FkSWNvbkZvclBh Z2VVUkwoY29uc3QgU3RyaW5nJiBwYWdlVVJMLCBBbGxvd0RhdGFiYXNlV3JpdGUKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIExvY2tlciBsb2Nr ZXIgeyBtX2xvYWRlZEljb25zTG9jayB9OwotICAgICAgICAgICAgYXV0byBpdCA9IG1fbG9hZGVk SWNvbnMuZmluZChpY29uVVJMKTsKLSAgICAgICAgICAgIGlmIChpdCAhPSBtX2xvYWRlZEljb25z LmVuZCgpICYmIGl0LT52YWx1ZS5maXJzdCkgewotICAgICAgICAgICAgICAgIGF1dG8gaWNvbiA9 IGl0LT52YWx1ZS5maXJzdDsKLSAgICAgICAgICAgICAgICBpdC0+dmFsdWUuc2Vjb25kID0gTW9u b3RvbmljVGltZTo6bm93KCk7Ci0gICAgICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRlZEljb25z VGltZXIoKTsKLSAgICAgICAgICAgICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKLSAgICAgICAg ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKGljb24pKTsKLSAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGF1dG8gYWRkUmVzdWx0ID0g bV9sb2FkZWRJY29ucy5zZXQoaWNvblVSTCwgc3RkOjptYWtlX3BhaXI8UGxhdGZvcm1JbWFnZVB0 ciwgTW9ub3RvbmljVGltZT4obnVsbHB0ciwgTW9ub3RvbmljVGltZTo6bm93KCkpKTsKLSAgICAg ICAgICAgIGlmICghaWNvbkRhdGEuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBp bWFnZSA9IEJpdG1hcEltYWdlOjpjcmVhdGUoKTsKLSAgICAgICAgICAgICAgICBpZiAoaW1hZ2Ut PnNldERhdGEoU2hhcmVkQnVmZmVyOjpjcmVhdGUoV1RGTW92ZShpY29uRGF0YSkpLCB0cnVlKSA8 IEVuY29kZWREYXRhU3RhdHVzOjpTaXplQXZhaWxhYmxlKSB7Ci0gICAgICAgICAgICAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICBhdXRvIGljb24gPSBbJl0oKSAtPiBXZWJDb3JlOjpQbGF0Zm9ybUltYWdl UHRyIHsKKyAgICAgICAgICAgICAgICBMb2NrZXIgbG9ja2VyIHsgbV9sb2FkZWRJY29uc0xvY2sg fTsKKyAgICAgICAgICAgICAgICBhdXRvIGl0ID0gbV9sb2FkZWRJY29ucy5maW5kKGljb25VUkwp OworICAgICAgICAgICAgICAgIGlmIChpdCAhPSBtX2xvYWRlZEljb25zLmVuZCgpICYmIGl0LT52 YWx1ZS5maXJzdCkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGljb24gPSBpdC0+dmFsdWUu Zmlyc3Q7CisgICAgICAgICAgICAgICAgICAgIGl0LT52YWx1ZS5zZWNvbmQgPSBNb25vdG9uaWNU aW1lOjpub3coKTsKKyAgICAgICAgICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRlZEljb25zVGlt ZXIoKTsKKyAgICAgICAgICAgICAgICAgICAgbG9ja2VyLnVubG9ja0Vhcmx5KCk7CisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBpY29uOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgICAgIGF1dG8gbmF0aXZlSW1hZ2UgPSBpbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJh bWUoKTsKLSAgICAgICAgICAgICAgICBpZiAoIW5hdGl2ZUltYWdlKSB7Ci0gICAgICAgICAgICAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwotICAgICAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGF1dG8gYWRkUmVzdWx0 ID0gbV9sb2FkZWRJY29ucy5zZXQoaWNvblVSTCwgc3RkOjptYWtlX3BhaXI8UGxhdGZvcm1JbWFn ZVB0ciwgTW9ub3RvbmljVGltZT4obnVsbHB0ciwgTW9ub3RvbmljVGltZTo6bm93KCkpKTsKKyAg ICAgICAgICAgICAgICBpZiAoIWljb25EYXRhLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAg ICAgICBhdXRvIGltYWdlID0gQml0bWFwSW1hZ2U6OmNyZWF0ZSgpOworICAgICAgICAgICAgICAg ICAgICBpZiAoaW1hZ2UtPnNldERhdGEoU2hhcmVkQnVmZmVyOjpjcmVhdGUoV1RGTW92ZShpY29u RGF0YSkpLCB0cnVlKSA8IEVuY29kZWREYXRhU3RhdHVzOjpTaXplQXZhaWxhYmxlKQorICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAgICAgICAgICAgICBhZGRS ZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmZpcnN0ID0gbmF0aXZlSW1hZ2UtPnBsYXRmb3JtSW1hZ2Uo KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgYXV0byBuYXRpdmVJbWFnZSA9 IGltYWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpOworICAgICAgICAgICAgICAgICAg ICBpZiAoIW5hdGl2ZUltYWdlKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKKyAgICAgICAgICAgICAgICAgICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS5maXJz dCA9IG5hdGl2ZUltYWdlLT5wbGF0Zm9ybUltYWdlKCk7CisgICAgICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICBhdXRvIGljb24gPSBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmZpcnN0Owot ICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRlZEljb25zVGltZXIoKTsKLSAgICAgICAgICAgIGxv Y2tlci51bmxvY2tFYXJseSgpOworICAgICAgICAgICAgICAgIGF1dG8gaWNvbiA9IGFkZFJlc3Vs dC5pdGVyYXRvci0+dmFsdWUuZmlyc3Q7CisgICAgICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRl ZEljb25zVGltZXIoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gaWNvbjsKKyAgICAgICAgICAg IH0oKTsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoaWNvbikpOwogICAg ICAgICB9KTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9nbGliL0ljb25EYXRhYmFzZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIv SWNvbkRhdGFiYXNlLmgKaW5kZXggODBlMTc4ZTYxZjUwZmFmZGYzZWFkNGQyOThhMTg4MDFhZTAz YzcxNy4uNmRkZDhhYThlZjU1NmViNmY0MTgzMzVjZGU5NmZlMjczZTk2Y2ZkMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvSWNvbkRhdGFiYXNlLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvSWNvbkRhdGFiYXNlLmgKQEAgLTcxLDgg KzcxLDggQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZSBtX2RiOwogICAg IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IG1fcGFnZVVSTFRvSWNvblVSTE1hcDsKICAgICBMb2Nr IG1fcGFnZVVSTFRvSWNvblVSTE1hcExvY2s7Ci0gICAgSGFzaE1hcDxTdHJpbmcsIHN0ZDo6cGFp cjxXZWJDb3JlOjpQbGF0Zm9ybUltYWdlUHRyLCBNb25vdG9uaWNUaW1lPj4gbV9sb2FkZWRJY29u czsKLSAgICBVbmNoZWNrZWRMb2NrIG1fbG9hZGVkSWNvbnNMb2NrOworICAgIEhhc2hNYXA8U3Ry aW5nLCBzdGQ6OnBhaXI8V2ViQ29yZTo6UGxhdGZvcm1JbWFnZVB0ciwgTW9ub3RvbmljVGltZT4+ IG1fbG9hZGVkSWNvbnMgV1RGX0dVQVJERURfQllfTE9DSyhtX2xvYWRlZEljb25zTG9jayk7Cisg ICAgTG9jayBtX2xvYWRlZEljb25zTG9jazsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3Jl OjpTUUxpdGVTdGF0ZW1lbnQ+IG1faWNvbklERm9ySWNvblVSTFN0YXRlbWVudDsKICAgICBzdGQ6 OnVuaXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX3NldEljb25JREZvclBhZ2VV UkxTdGF0ZW1lbnQ7Cg== 429592 2021-05-24 16:58:09 -0700 2021-05-24 20:13:50 -0700 Patch bug-226190-20210524165808.patch text/plain 4758 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliZDM2ZDcxODc0YjNjYWIy NzEyNDAyNDMyZTdmM2U1OTU3ZjU3YzUuLjRlODJkZmUxNzg2N2IwNTkyMDVhMzM2NWExZTQyY2U0 ODJjY2E5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbR0xJQl0gU3RvcCB1c2luZyBVbmNo ZWNrZWRMb2NrIGluIEljb25EYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3RvcCB1c2luZyBVbmNoZWNrZWRMb2NrIGluIEljb25EYXRhYmFz ZSB0byBiZW5lZml0IGZyb20gQ2xhbmcgdGhyZWFkLXNhZmV0eSBhbmFseXNpcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuaDoKKwogMjAyMS0wNS0yNCAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcmV2ZXJ0aW5nIHIyNzc5NDAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2dsaWIvSWNvbkRhdGFiYXNlLmNwcAppbmRleCBkNzRhNDczZTIwYzkwMThmZTM2ZDVhYjZkZmQ4 YWE1MmI1YTY5YTUxLi4zNmFmMTNlNzU5ZmEwNTMzZmRhYzhmYjUzYWJhZjM1MGUzOGIyM2QwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFzZS5j cHAKQEAgLTU2NiwzNyArNTY2LDMzIEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpsb2FkSWNvbkZvclBh Z2VVUkwoY29uc3QgU3RyaW5nJiBwYWdlVVJMLCBBbGxvd0RhdGFiYXNlV3JpdGUKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIExvY2tlciBsb2Nr ZXIgeyBtX2xvYWRlZEljb25zTG9jayB9OwotICAgICAgICAgICAgYXV0byBpdCA9IG1fbG9hZGVk SWNvbnMuZmluZChpY29uVVJMKTsKLSAgICAgICAgICAgIGlmIChpdCAhPSBtX2xvYWRlZEljb25z LmVuZCgpICYmIGl0LT52YWx1ZS5maXJzdCkgewotICAgICAgICAgICAgICAgIGF1dG8gaWNvbiA9 IGl0LT52YWx1ZS5maXJzdDsKLSAgICAgICAgICAgICAgICBpdC0+dmFsdWUuc2Vjb25kID0gTW9u b3RvbmljVGltZTo6bm93KCk7Ci0gICAgICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRlZEljb25z VGltZXIoKTsKLSAgICAgICAgICAgICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKLSAgICAgICAg ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKGljb24pKTsKLSAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGF1dG8gYWRkUmVzdWx0ID0g bV9sb2FkZWRJY29ucy5zZXQoaWNvblVSTCwgc3RkOjptYWtlX3BhaXI8UGxhdGZvcm1JbWFnZVB0 ciwgTW9ub3RvbmljVGltZT4obnVsbHB0ciwgTW9ub3RvbmljVGltZTo6bm93KCkpKTsKLSAgICAg ICAgICAgIGlmICghaWNvbkRhdGEuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBp bWFnZSA9IEJpdG1hcEltYWdlOjpjcmVhdGUoKTsKLSAgICAgICAgICAgICAgICBpZiAoaW1hZ2Ut PnNldERhdGEoU2hhcmVkQnVmZmVyOjpjcmVhdGUoV1RGTW92ZShpY29uRGF0YSkpLCB0cnVlKSA8 IEVuY29kZWREYXRhU3RhdHVzOjpTaXplQXZhaWxhYmxlKSB7Ci0gICAgICAgICAgICAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICBhdXRvIGljb24gPSBbJl0oKSAtPiBXZWJDb3JlOjpQbGF0Zm9ybUltYWdl UHRyIHsKKyAgICAgICAgICAgICAgICBMb2NrZXIgbG9ja2VyIHsgbV9sb2FkZWRJY29uc0xvY2sg fTsKKyAgICAgICAgICAgICAgICBhdXRvIGl0ID0gbV9sb2FkZWRJY29ucy5maW5kKGljb25VUkwp OworICAgICAgICAgICAgICAgIGlmIChpdCAhPSBtX2xvYWRlZEljb25zLmVuZCgpICYmIGl0LT52 YWx1ZS5maXJzdCkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGljb24gPSBpdC0+dmFsdWUu Zmlyc3Q7CisgICAgICAgICAgICAgICAgICAgIGl0LT52YWx1ZS5zZWNvbmQgPSBNb25vdG9uaWNU aW1lOjpub3coKTsKKyAgICAgICAgICAgICAgICAgICAgc3RhcnRDbGVhckxvYWRlZEljb25zVGlt ZXIoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGljb247CiAgICAgICAgICAgICAgICAg fQogCi0gICAgICAgICAgICAgICAgYXV0byBuYXRpdmVJbWFnZSA9IGltYWdlLT5uYXRpdmVJbWFn ZUZvckN1cnJlbnRGcmFtZSgpOwotICAgICAgICAgICAgICAgIGlmICghbmF0aXZlSW1hZ2UpIHsK LSAgICAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7Ci0gICAgICAg ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg YXV0byBhZGRSZXN1bHQgPSBtX2xvYWRlZEljb25zLnNldChpY29uVVJMLCBzdGQ6Om1ha2VfcGFp cjxQbGF0Zm9ybUltYWdlUHRyLCBNb25vdG9uaWNUaW1lPihudWxscHRyLCBNb25vdG9uaWNUaW1l Ojpub3coKSkpOworICAgICAgICAgICAgICAgIGlmICghaWNvbkRhdGEuaXNFbXB0eSgpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGF1dG8gaW1hZ2UgPSBCaXRtYXBJbWFnZTo6Y3JlYXRlKCk7Cisg ICAgICAgICAgICAgICAgICAgIGlmIChpbWFnZS0+c2V0RGF0YShTaGFyZWRCdWZmZXI6OmNyZWF0 ZShXVEZNb3ZlKGljb25EYXRhKSksIHRydWUpIDwgRW5jb2RlZERhdGFTdGF0dXM6OlNpemVBdmFp bGFibGUpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgICAg ICAgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUuZmlyc3QgPSBuYXRpdmVJbWFnZS0+ cGxhdGZvcm1JbWFnZSgpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBhdXRv IG5hdGl2ZUltYWdlID0gaW1hZ2UtPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CisgICAg ICAgICAgICAgICAgICAgIGlmICghbmF0aXZlSW1hZ2UpCisgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICAgICAgICAgICAgICBhZGRSZXN1bHQuaXRlcmF0 b3ItPnZhbHVlLmZpcnN0ID0gbmF0aXZlSW1hZ2UtPnBsYXRmb3JtSW1hZ2UoKTsKKyAgICAgICAg ICAgICAgICB9CiAKLSAgICAgICAgICAgIGF1dG8gaWNvbiA9IGFkZFJlc3VsdC5pdGVyYXRvci0+ dmFsdWUuZmlyc3Q7Ci0gICAgICAgICAgICBzdGFydENsZWFyTG9hZGVkSWNvbnNUaW1lcigpOwot ICAgICAgICAgICAgbG9ja2VyLnVubG9ja0Vhcmx5KCk7CisgICAgICAgICAgICAgICAgYXV0byBp Y29uID0gYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS5maXJzdDsKKyAgICAgICAgICAgICAgICBz dGFydENsZWFyTG9hZGVkSWNvbnNUaW1lcigpOworICAgICAgICAgICAgICAgIHJldHVybiBpY29u OworICAgICAgICAgICAgfSgpOwogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92 ZShpY29uKSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvSWNvbkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuaAppbmRleCA4MGUxNzhlNjFmNTBmYWZkZjNlYWQ0 ZDI5OGExODgwMWFlMDNjNzE3Li42ZGRkOGFhOGVmNTU2ZWI2ZjQxODMzNWNkZTk2ZmUyNzNlOTZj ZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0 YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJh c2UuaApAQCAtNzEsOCArNzEsOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlNRTGl0ZURhdGFi YXNlIG1fZGI7CiAgICAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gbV9wYWdlVVJMVG9JY29uVVJM TWFwOwogICAgIExvY2sgbV9wYWdlVVJMVG9JY29uVVJMTWFwTG9jazsKLSAgICBIYXNoTWFwPFN0 cmluZywgc3RkOjpwYWlyPFdlYkNvcmU6OlBsYXRmb3JtSW1hZ2VQdHIsIE1vbm90b25pY1RpbWU+ PiBtX2xvYWRlZEljb25zOwotICAgIFVuY2hlY2tlZExvY2sgbV9sb2FkZWRJY29uc0xvY2s7Cisg ICAgSGFzaE1hcDxTdHJpbmcsIHN0ZDo6cGFpcjxXZWJDb3JlOjpQbGF0Zm9ybUltYWdlUHRyLCBN b25vdG9uaWNUaW1lPj4gbV9sb2FkZWRJY29ucyBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fbG9hZGVk SWNvbnNMb2NrKTsKKyAgICBMb2NrIG1fbG9hZGVkSWNvbnNMb2NrOwogCiAgICAgc3RkOjp1bmlx dWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV9pY29uSURGb3JJY29uVVJMU3RhdGVt ZW50OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fc2V0 SWNvbklERm9yUGFnZVVSTFN0YXRlbWVudDsK