229731 2021-08-31 13:38:04 -0700 Use after move in ServiceWorkerThreadProxy 2021-08-31 16:12:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney cdumez darin webkit-bug-importer oldest_to_newest 1789056 0 katherine_cheney 2021-08-31 13:38:04 -0700 Use after move in ServiceWorkerThreadProxy 1789059 1 436936 katherine_cheney 2021-08-31 13:39:03 -0700 Created attachment 436936 Patch 1789060 2 436936 cdumez 2021-08-31 13:40:25 -0700 Comment on attachment 436936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436936&action=review > Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h:107 > + std::optional<LastNavigationWasAppInitiated> m_lastNavigationWasAppInitiated; Seems very unfortunate to have to add a new data member for something that is only used in the constructor. 1789064 3 436936 cdumez 2021-08-31 13:46:14 -0700 Comment on attachment 436936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436936&action=review > Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp:122 > + setLastNavigationWasAppInitiated(m_lastNavigationWasAppInitiated == LastNavigationWasAppInitiated::Yes); Maybe the call site (WebSWContextManagerConnection::installServiceWorker()), could store data.lastNavigationWasAppInitiated before calling ServiceWorkerThreadProxy::create() and then call setLastNavigationWasAppInitiated() on the ServiceWorkerThreadProxy object? 1789065 4 436936 darin 2021-08-31 13:47:19 -0700 Comment on attachment 436936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436936&action=review > Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h:107 > + std::optional<LastNavigationWasAppInitiated> m_lastNavigationWasAppInitiated; Not good to store this value for the lifetime of the object just to convey its value from the start to the end of the constructor function. Another model would be to use a lambda for this purpose. Something ike this: , m_document([this, &data] { auto& document = *m_page->mainFrame().document(); if (data.lastNavigationWasAppInitiated) { if (auto loader = document.loader()) loader->setLastNavigationWasAppInitiated(data.lastNavigationWasAppInitiated == LastNavigationWasAppInitiated::Yes); } return document; }) Or could use a named function. 1789091 5 436946 katherine_cheney 2021-08-31 14:23:36 -0700 Created attachment 436946 Patch 1789094 6 katherine_cheney 2021-08-31 14:26:11 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 436936 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=436936&action=review > > > Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h:107 > > + std::optional<LastNavigationWasAppInitiated> m_lastNavigationWasAppInitiated; > > Not good to store this value for the lifetime of the object just to convey > its value from the start to the end of the constructor function. > > Another model would be to use a lambda for this purpose. Something ike this: > > , m_document([this, &data] { > auto& document = *m_page->mainFrame().document(); > if (data.lastNavigationWasAppInitiated) { > if (auto loader = document.loader()) > > loader->setLastNavigationWasAppInitiated(data.lastNavigationWasAppInitiated > == LastNavigationWasAppInitiated::Yes); > } > return document; > }) > > Or could use a named function. I ended up going with Chris's suggestion because it avoids some code duplication by using ServiceWorkerThreadProxy::setLastNavigationWasAppInitiated(). 1789142 7 ews-feeder 2021-08-31 16:11:01 -0700 Committed r281831 (241164@main): <https://commits.webkit.org/241164@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436946. 1789144 8 webkit-bug-importer 2021-08-31 16:12:24 -0700 <rdar://problem/82601336> 436936 2021-08-31 13:39:03 -0700 2021-08-31 14:23:34 -0700 Patch bug-229731-20210831133902.patch text/plain 4636 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI3ZDJiNTE5N2IzZGE5 ZGI1M2ZlNjE5ZGMxNGQ5NDFmMzQxM2UwNi4uZmQ5ODFlZTIzYzA4NmZmYTllY2U4MmNhMTVhMWE2 M2MxYzE5ZTAzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA4LTMxICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhZnRl ciBtb3ZlIGluIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWhhdmlvciBjb3ZlcmVk IGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQv U2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VX b3JrZXJUaHJlYWRQcm94eTo6U2VydmljZVdvcmtlclRocmVhZFByb3h5KToKKyAgICAgICAgKiB3 b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuaDoKKwogMjAy MS0wOC0zMCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg c3R1YnMgZm9yIFBlcm1pc3Npb25zIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eS5jcHAKaW5kZXggOTA2OTNkYTJkMTFjMDAyYjk1MTU3NGM1NzQ2ZTkyNDNiMzA4Y2FjMy4uZjI3 MGI3MGRmMTBlYjUwMDI4ZDE0NDQxZDc1YjRiZjdhN2JlZmFlMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNl V29ya2VyVGhyZWFkUHJveHkuY3BwCkBAIC05OSw2ICs5OSw3IEBAIFNlcnZpY2VXb3JrZXJUaHJl YWRQcm94eTo6U2VydmljZVdvcmtlclRocmVhZFByb3h5KFBhZ2VDb25maWd1cmF0aW9uJiYgcGFn ZUNvbmZpCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAgLCBtX3JlbW90ZURlYnVn Z2FibGUobWFrZVVuaXF1ZTxTZXJ2aWNlV29ya2VyRGVidWdnYWJsZT4oKnRoaXMsIGRhdGEpKQog I2VuZGlmCisgICAgLCBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKGRhdGEubGFzdE5h dmlnYXRpb25XYXNBcHBJbml0aWF0ZWQpCiAgICAgLCBtX3NlcnZpY2VXb3JrZXJUaHJlYWQoU2Vy dmljZVdvcmtlclRocmVhZDo6Y3JlYXRlKFdURk1vdmUoZGF0YSksIFdURk1vdmUodXNlckFnZW50 KSwgbV9kb2N1bWVudC0+c2V0dGluZ3NWYWx1ZXMoKSwgKnRoaXMsICp0aGlzLCBpZGJDb25uZWN0 aW9uUHJveHkobV9kb2N1bWVudCksIG1fZG9jdW1lbnQtPnNvY2tldFByb3ZpZGVyKCkpKQogICAg ICwgbV9jYWNoZVN0b3JhZ2VQcm92aWRlcihjYWNoZVN0b3JhZ2VQcm92aWRlcikKICAgICAsIG1f aW5zcGVjdG9yUHJveHkoKnRoaXMpCkBAIC0xMTcsOCArMTE4LDggQEAgU2VydmljZVdvcmtlclRo cmVhZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkoUGFnZUNvbmZpZ3VyYXRpb24mJiBw YWdlQ29uZmkKICAgICBtX3JlbW90ZURlYnVnZ2FibGUtPmluaXQoKTsKICNlbmRpZgogCi0gICAg aWYgKGRhdGEubGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQpCi0gICAgICAgIHNldExhc3RO YXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkKGRhdGEubGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0 ZWQgPT0gTGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQ6Olllcyk7CisgICAgaWYgKG1fbGFz dE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQpCisgICAgICAgIHNldExhc3ROYXZpZ2F0aW9uV2Fz QXBwSW5pdGlhdGVkKG1fbGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQgPT0gTGFzdE5hdmln YXRpb25XYXNBcHBJbml0aWF0ZWQ6Olllcyk7CiB9CiAKIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eTo6flNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuaCBiL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQ cm94eS5oCmluZGV4IDJjNWEyODkyOGZhZTAwYTQ4ZmU4ZGFiOTY4YTg5OTdmYzNkYWVjYzcuLjZk ZDgxZDc1ZDYyYjkzMmViOWFlOTYzOGZiODQ2ZTc3YzIxMzc5NjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VX b3JrZXJUaHJlYWRQcm94eS5oCkBAIC0xMDQsNiArMTA0LDcgQEAgcHJpdmF0ZToKICNpZiBFTkFC TEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U2VydmljZVdvcmtlckRl YnVnZ2FibGU+IG1fcmVtb3RlRGVidWdnYWJsZTsKICNlbmRpZgorICAgIHN0ZDo6b3B0aW9uYWw8 TGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQ+IG1fbGFzdE5hdmlnYXRpb25XYXNBcHBJbml0 aWF0ZWQ7CiAgICAgUmVmPFNlcnZpY2VXb3JrZXJUaHJlYWQ+IG1fc2VydmljZVdvcmtlclRocmVh ZDsKICAgICBDYWNoZVN0b3JhZ2VQcm92aWRlciYgbV9jYWNoZVN0b3JhZ2VQcm92aWRlcjsKICAg ICBSZWZQdHI8Q2FjaGVTdG9yYWdlQ29ubmVjdGlvbj4gbV9jYWNoZVN0b3JhZ2VDb25uZWN0aW9u OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDk1 ODU1MTM0NGYwYzJlYzZkZGYwZmE5MGMxODgzY2EyMTA5MTg0ZTguLjM5MmQxYjhmNzI1ZWI4MjZl YWVlMGUyODBhMGY2NmQ3MzNiMTFhYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOC0zMSAgS2F0ZSBDaGVu ZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgYWZ0ZXIgbW92 ZSBpbiBTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTczMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoaWxlIHRyeWluZyB0byB0ZXN0IHRoYXQgdGhpcyBjaGFu Z2UgZGlkIG5vdCBjYXVzZSByZWdyZXNzaW9ucywKKyAgICAgICAgSSBmb3VuZCBhIGJ1ZyBpbiB0 aGUgdGVzdCBjb2RlIGZyb20gdGhlIG1hc3MgcmVuYW1pbmcgdGhhdCBoYXBwZW5lZAorICAgICAg ICBhIGZldyB3ZWVrcyBhZ28uIFRoaXMgcGF0Y2ggZml4ZXMgdGhhdC4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQXBwUHJpdmFjeVJlcG9ydC5tbToKKwogMjAy MS0wOC0zMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAg ZXdzIG1pZ2h0IG1hcmsgYnVpbGQgYXMgc3VjY2Vzc2Z1bCBpZiBKU0MgdGVzdHMgZmFpbCB0byBy dW4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQXBw UHJpdmFjeVJlcG9ydC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev QXBwUHJpdmFjeVJlcG9ydC5tbQppbmRleCBkMDlmMGEyMjVmNDQ1OWRiYzNlODQ3ZTEwYzA0YTdk NjBkOGNlNTQ3Li43ODUyZjRjZTUyNjMzYzdiNGI3MzFhZjcyOTIyMDE1OGJmODNjMGY3IDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0FwcFByaXZhY3lS ZXBvcnQubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9BcHBQ cml2YWN5UmVwb3J0Lm1tCkBAIC02MDIsNyArNjAyLDcgQEAgc2VsZi5hZGRFdmVudExpc3RlbmVy KCdtZXNzYWdlJywgYXN5bmMgKGV2ZW50KSA9PiB7CiAKIGFzeW5jIGZ1bmN0aW9uIHF1ZXJ5QXBw UHJpdmFjeVJlcG9ydFZhbHVlKGV2ZW50LCBoYXZlU2VudEluaXRpYWxNZXNzYWdlKQogewotICAg IHZhciByZXN1bHQgPSBhd2FpdCBpbnRlcm5hbHMubGFzdE5hdmlnYXRpb25XYXNBcHBQcml2YWN5 UmVwb3J0KCk7CisgICAgdmFyIHJlc3VsdCA9IGF3YWl0IGludGVybmFscy5sYXN0TmF2aWdhdGlv bldhc0FwcEluaXRpYXRlZCgpOwogICAgIGlmIChyZXN1bHQpIHsKICAgICAgICAgaWYgKGV2ZW50 LmRhdGEgPT0gIkZJUlNUIikgewogICAgICAgICAgICAgZXZlbnQuc291cmNlLnBvc3RNZXNzYWdl KCdhcHAgaW5pdGlhdGVkJyk7Cg== 436946 2021-08-31 14:23:36 -0700 2021-08-31 16:11:02 -0700 Patch bug-229731-20210831142335.patch text/plain 5087 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI3ZDJiNTE5N2IzZGE5 ZGI1M2ZlNjE5ZGMxNGQ5NDFmMzQxM2UwNi4uNzlmMDkwYjg0Mjk1ODllZWExMTZjYzUyMTM2MDEx NjAxNmFmYmVjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA4LTMxICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhZnRl ciBtb3ZlIGluIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtl clRocmVhZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkpOgorCiAyMDIxLTA4LTMwICBT aWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdHVicyBmb3Ig UGVybWlzc2lvbnMgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYwOGIyMjhmNTFjYWJhNzc0NmFiNGE4ZmJiYTdj MDk2OTM4NDlmYTMuLjViNzVmZjVmZjFhOTcyNTk0YWYzYjczOWMxZjRhNzYyNGRhODQ4MDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDgtMzEgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGFmdGVyIG1vdmUgaW4gU2Vydmlj ZVdvcmtlclRocmVhZFByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjk3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u OjppbnN0YWxsU2VydmljZVdvcmtlcik6CisKIDIwMjEtMDgtMzAgIFNpaHVpIExpdSAgPHNpaHVp X2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN0dWJzIGZvciBQZXJtaXNzaW9ucyBBUEkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZp Y2VXb3JrZXJUaHJlYWRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uv Y29udGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwCmluZGV4IDkwNjkzZGEyZDExYzAw MmI5NTE1NzRjNTc0NmU5MjQzYjMwOGNhYzMuLjc2MjFiMmUwMWFjZTMzN2Y1NTkwZmIwNDJjZDUy NmE4NjY5MGQxYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9j b250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcApAQCAt MTE2LDkgKzExNiw2IEBAIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6U2VydmljZVdvcmtlclRo cmVhZFByb3h5KFBhZ2VDb25maWd1cmF0aW9uJiYgcGFnZUNvbmZpCiAgICAgbV9yZW1vdGVEZWJ1 Z2dhYmxlLT5zZXRSZW1vdGVEZWJ1Z2dpbmdBbGxvd2VkKHRydWUpOwogICAgIG1fcmVtb3RlRGVi dWdnYWJsZS0+aW5pdCgpOwogI2VuZGlmCi0KLSAgICBpZiAoZGF0YS5sYXN0TmF2aWdhdGlvbldh c0FwcEluaXRpYXRlZCkKLSAgICAgICAgc2V0TGFzdE5hdmlnYXRpb25XYXNBcHBJbml0aWF0ZWQo ZGF0YS5sYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCA9PSBMYXN0TmF2aWdhdGlvbldhc0Fw cEluaXRpYXRlZDo6WWVzKTsKIH0KIAogU2VydmljZVdvcmtlclRocmVhZFByb3h5Ojp+U2Vydmlj ZVdvcmtlclRocmVhZFByb3h5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcApp bmRleCA0YTgzNDA4MmQ2MTA1NmZiNjQ3NGM5OTY0NDRhYTQxNGI0ZDk2NTVlLi5iNTQ0MDM5YjQ3 OWQ4MmJkOGJmMTE0OTY3N2RiNTkwZWY0NjhmZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uY3BwCkBAIC0xNjEsNyArMTYxLDEzIEBAIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdl ckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2aWNlV29ya2VyKFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0 CiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgYXV0byBzZXJ2aWNlV29ya2VySWRlbnRp ZmllciA9IGRhdGEuc2VydmljZVdvcmtlcklkZW50aWZpZXI7CiAjZW5kaWYKKyAgICAKKyAgICBh dXRvIGxhc3ROYXZpZ2F0aW9uV2FzQXBwSW5pdGlhdGVkID0gZGF0YS5sYXN0TmF2aWdhdGlvbldh c0FwcEluaXRpYXRlZDsKICAgICBhdXRvIHNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eSA9IFNlcnZp Y2VXb3JrZXJUaHJlYWRQcm94eTo6Y3JlYXRlKFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pLCBX VEZNb3ZlKGRhdGEpLCBXVEZNb3ZlKGVmZmVjdGl2ZVVzZXJBZ2VudCksIFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLmNhY2hlU3RvcmFnZVByb3ZpZGVyKCksIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5 KTsKKworICAgIGlmIChsYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCkKKyAgICAgICAgc2Vy dmljZVdvcmtlclRocmVhZFByb3h5LT5zZXRMYXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZChs YXN0TmF2aWdhdGlvbldhc0FwcEluaXRpYXRlZCA9PSBXZWJDb3JlOjpMYXN0TmF2aWdhdGlvbldh c0FwcEluaXRpYXRlZDo6WWVzKTsKKwogICAgIFNXQ29udGV4dE1hbmFnZXI6OnNpbmdsZXRvbigp LnJlZ2lzdGVyU2VydmljZVdvcmtlclRocmVhZEZvckluc3RhbGwoV1RGTW92ZShzZXJ2aWNlV29y a2VyVGhyZWFkUHJveHkpKTsKIAogICAgIFJFTEVBU0VfTE9HKFNlcnZpY2VXb3JrZXIsICJDcmVh dGVkIHNlcnZpY2Ugd29ya2VyICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgUElEICVpIiwgc2Vydmlj ZVdvcmtlcklkZW50aWZpZXIudG9VSW50NjQoKSwgZ2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5NTg1NTEz NDRmMGMyZWM2ZGRmMGZhOTBjMTg4M2NhMjEwOTE4NGU4Li4zOTJkMWI4ZjcyNWViODI2ZWFlZTBl MjgwYTBmNjZkNzMzYjExYWIwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDgtMzEgIEthdGUgQ2hlbmV5ICA8 a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGFmdGVyIG1vdmUgaW4g U2VydmljZVdvcmtlclRocmVhZFByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjk3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXaGlsZSB0cnlpbmcgdG8gdGVzdCB0aGF0IHRoaXMgY2hhbmdlIGRp ZCBub3QgY2F1c2UgcmVncmVzc2lvbnMsCisgICAgICAgIEkgZm91bmQgYSBidWcgaW4gdGhlIHRl c3QgY29kZSBmcm9tIHRoZSBtYXNzIHJlbmFtaW5nIHRoYXQgaGFwcGVuZWQKKyAgICAgICAgYSBm ZXcgd2Vla3MgYWdvLiBUaGlzIHBhdGNoIGZpeGVzIHRoYXQuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0FwcFByaXZhY3lSZXBvcnQubW06CisKIDIwMjEtMDgt MzAgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIGV3cyBt aWdodCBtYXJrIGJ1aWxkIGFzIHN1Y2Nlc3NmdWwgaWYgSlNDIHRlc3RzIGZhaWwgdG8gcnVuCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0FwcFByaXZh Y3lSZXBvcnQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0FwcFBy aXZhY3lSZXBvcnQubW0KaW5kZXggZDA5ZjBhMjI1ZjQ0NTlkYmMzZTg0N2UxMGMwNGE3ZDYwZDhj ZTU0Ny4uNzg1MmY0Y2U1MjYzM2M3YjRiNzMxYWY3MjkyMjAxNThiZjgzYzBmNyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9BcHBQcml2YWN5UmVwb3J0 Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQXBwUHJpdmFj eVJlcG9ydC5tbQpAQCAtNjAyLDcgKzYwMiw3IEBAIHNlbGYuYWRkRXZlbnRMaXN0ZW5lcignbWVz c2FnZScsIGFzeW5jIChldmVudCkgPT4gewogCiBhc3luYyBmdW5jdGlvbiBxdWVyeUFwcFByaXZh Y3lSZXBvcnRWYWx1ZShldmVudCwgaGF2ZVNlbnRJbml0aWFsTWVzc2FnZSkKIHsKLSAgICB2YXIg cmVzdWx0ID0gYXdhaXQgaW50ZXJuYWxzLmxhc3ROYXZpZ2F0aW9uV2FzQXBwUHJpdmFjeVJlcG9y dCgpOworICAgIHZhciByZXN1bHQgPSBhd2FpdCBpbnRlcm5hbHMubGFzdE5hdmlnYXRpb25XYXNB cHBJbml0aWF0ZWQoKTsKICAgICBpZiAocmVzdWx0KSB7CiAgICAgICAgIGlmIChldmVudC5kYXRh ID09ICJGSVJTVCIpIHsKICAgICAgICAgICAgIGV2ZW50LnNvdXJjZS5wb3N0TWVzc2FnZSgnYXBw IGluaXRpYXRlZCcpOwo=