187298 2018-07-03 13:25:24 -0700 Make CallbackMap::invalidate() safe to re-enter 2018-07-03 17:05:47 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue ggaren webkit-bug-importer oldest_to_newest 1438942 0 cdumez 2018-07-03 13:25:24 -0700 Make CallbackMap::invalidate() safe to re-enter. 1438943 1 cdumez 2018-07-03 13:25:38 -0700 <rdar://problem/41057167> 1438948 2 344209 cdumez 2018-07-03 13:39:01 -0700 Created attachment 344209 Patch 1439045 3 344209 ggaren 2018-07-03 16:20:34 -0700 Comment on attachment 344209 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344209&action=review R=me > Source/WebKit/UIProcess/GenericCallback.h:164 > + HashMap<uint64_t, T> map = WTFMove(callbackMap); I would use auto here. 1439052 4 344239 cdumez 2018-07-03 16:26:14 -0700 Created attachment 344239 Patch 1439067 5 344239 commit-queue 2018-07-03 17:05:46 -0700 Comment on attachment 344239 Patch Clearing flags on attachment: 344239 Committed r233488: <https://trac.webkit.org/changeset/233488> 1439069 6 commit-queue 2018-07-03 17:05:47 -0700 All reviewed patches have been landed. Closing bug. 344209 2018-07-03 13:39:01 -0700 2018-07-03 16:26:13 -0700 Patch bug-187298-20180703133900.patch text/plain 6534 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYzZDBmMmZhYmUyZTllMDZi OTBmNGJmNDU3MDY4N2NkMzVmMjRmMmMuLjYyOTc1M2ZhNGVjNTg0YzIxYzk1MDY4OTVkYzFkNTA4 OWUyNjhjNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDctMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIENhbGxiYWNrTWFwOjppbnZh bGlkYXRlKCkgc2FmZSB0byByZS1lbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Mjk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTA1NzE2 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRl IGl0IHNhZmUgdG8gcmUtZW50ZXIgQ2FsbGJhY2tNYXA6OmludmFsaWRhdGUoKSwgR2VuZXJpY0Nh bGxiYWNrOjpwZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUoKSwKKyAgICAgICAgR2VuZXJp Y0NhbGxiYWNrOjppbnZhbGlkYXRlKCkgJiBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAoKSBzaW5jZSB0 aG9zZSBleGVjdXRlIGNsaWVudCBibG9ja3Mgd2hpY2ggbWF5CisgICAgICAgIHJlLWVudGVyIFdl YktpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaDoKKyAgICAgICAg KFdlYktpdDo6R2VuZXJpY0NhbGxiYWNrOjpwZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUp OgorICAgICAgICAoV2ViS2l0OjppbnZhbGlkYXRlQ2FsbGJhY2tNYXApOgorCiAyMDE4LTA3LTAz ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMjMzNDYxLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvR2VuZXJpY0NhbGxiYWNrLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HZW5lcmlj Q2FsbGJhY2suaAppbmRleCBiYWM2ZGNhNGRjMDE4NWM2ZDc2MmZkY2YwOGZhMWQ2MzExYjEwNGMw Li5kMDg0NjAyNWJkMTQ0ZWVlYWNjOTdhYTMwZmM1YTRkZDI5YThmZmRlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaApAQCAtMTA1LDkgKzEwNSw4IEBAIHB1Ymxp YzoKICAgICAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIG1fY2FsbGJhY2sudmFsdWUoKShyZXR1cm5WYWx1ZS4uLiwgRXJyb3I6Ok5vbmUpOwotCi0g ICAgICAgIG1fY2FsbGJhY2sgPSBzdGQ6Om51bGxvcHQ7CisgICAgICAgIGF1dG8gY2FsbGJhY2sg PSBzdGQ6OmV4Y2hhbmdlKG1fY2FsbGJhY2ssIHN0ZDo6bnVsbG9wdCk7CisgICAgICAgIGNhbGxi YWNrLnZhbHVlKCkocmV0dXJuVmFsdWUuLi4sIEVycm9yOjpOb25lKTsKICAgICB9CiAKICAgICB2 b2lkIHBlcmZvcm1DYWxsYmFjaygpCkBAIC0xMjIsOSArMTIxLDggQEAgcHVibGljOgogICAgICAg ICBpZiAoIW1fY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbV9jYWxs YmFjay52YWx1ZSgpKHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX3JlZmVyZW5jZTxUPjo6dHlwZSgpLi4u LCBlcnJvcik7Ci0KLSAgICAgICAgbV9jYWxsYmFjayA9IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAg YXV0byBjYWxsYmFjayA9IHN0ZDo6ZXhjaGFuZ2UobV9jYWxsYmFjaywgc3RkOjpudWxsb3B0KTsK KyAgICAgICAgY2FsbGJhY2sudmFsdWUoKSh0eXBlbmFtZSBzdGQ6OnJlbW92ZV9yZWZlcmVuY2U8 VD46OnR5cGUoKS4uLiwgZXJyb3IpOwogICAgIH0KIAogcHJpdmF0ZToKQEAgLTE2MywxMCArMTYx LDkgQEAgdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8Y29uc3QgU2hhcmVhYmxlQml0bWFwOjpIYW5k bGUmPiBJbWFnZUNhbGxiYWNrOwogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQgaW52YWxpZGF0 ZUNhbGxiYWNrTWFwKEhhc2hNYXA8dWludDY0X3QsIFQ+JiBjYWxsYmFja01hcCwgQ2FsbGJhY2tC YXNlOjpFcnJvciBlcnJvcikKIHsKLSAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogY29weVRvVmVj dG9yKGNhbGxiYWNrTWFwLnZhbHVlcygpKSkKKyAgICBIYXNoTWFwPHVpbnQ2NF90LCBUPiBtYXAg PSBXVEZNb3ZlKGNhbGxiYWNrTWFwKTsKKyAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogbWFwLnZh bHVlcygpKQogICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0ZShlcnJvcik7Ci0KLSAgICBjYWxs YmFja01hcC5jbGVhcigpOwogfQogCiBjbGFzcyBDYWxsYmFja01hcCB7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDZhOWUxOWU1MTc5YjFjZjAw NmUzODYwNjMyNzhmNmE2ZjBjOTZjNS4uZDcxY2M5YjM1NDQ4NWE0YWUxZmEzNDM2NzY1ODI2ZGEz ZmRlMTc3YyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA3LTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgTWFrZSBDYWxsYmFja01hcDo6aW52YWxpZGF0ZSgpIHNhZmUgdG8g cmUtZW50ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NzI5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDEwNTcxNjc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdl LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJDb250ZW50 UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTA3LTAyICBX ZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhIGxl YWsgaW4gQWN0aW9uU2hlZXRUZXN0cy5EaXNtaXNzaW5nQWN0aW9uU2hlZXRTaG91bGROb3REaXNt aXNzUHJlc2VudGluZ1ZpZXdDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0Rp ZFRlcm1pbmF0ZS5tbQppbmRleCA4MDUyNmQxMjEzYzMyNjdkY2NiZjcwNjIwOGU1ZDAyYjZiNDAx YzZiLi40MDUwZWJkMzliZjhlNDE4NzBkYTI0NTE2NDgzOWUzNTkwMzQ4ZmE0IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNz RGlkVGVybWluYXRlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0KQEAgLTQyLDYgKzQyLDggQEAgc3Rh dGljIGJvb2wgc3RhcnRlZExvYWQ7CiBzdGF0aWMgYm9vbCBmaW5pc2hlZExvYWQ7CiBzdGF0aWMg Ym9vbCBzaG91bGRMb2FkQWdhaW5PbkNyYXNoOwogc3RhdGljIGJvb2wgcmVjZWl2ZWRTY3JpcHRN ZXNzYWdlOworc3RhdGljIGJvb2wgY2FsbGVkQWxsQ2FsbGJhY2tzOworc3RhdGljIHVuc2lnbmVk IGNhbGxiYWNrQ291bnQ7CiAKIHN0YXRpYyBOU1N0cmluZyAqdGVzdEhUTUwgPSBAIjxzY3JpcHQ+ d2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ0xP QURFRCcpOzwvc2NyaXB0PiI7CiAKQEAgLTIwNiw0ICsyMDgsNzIgQEAgVEVTVChXS05hdmlnYXRp b24sIEF1dG9tYXRpY1ZpZXdSZWxvYWRBZnRlcldlYlByb2Nlc3NDcmFzaCkKICAgICBFWFBFQ1Rf RkFMU0Uoc3RhcnRlZExvYWQpOwogfQogCitURVNUKFdLTmF2aWdhdGlvbiwgUHJvY2Vzc0NyYXNo RHVyaW5nQ2FsbGJhY2spCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOworCisg ICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tCYXNpY05hdmlnYXRpb25EZWxlZ2F0ZVdpdGhv dXRDcmFzaEhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9u RGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgc3RhcnRlZExvYWQgPSBmYWxzZTsKKyAg ICBmaW5pc2hlZExvYWQgPSBmYWxzZTsKKworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VS TFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNv dXJjZTpAInJpY2gtYW5kLXBsYWluLXRleHQiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJl Y3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CisgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZmaW5pc2hlZExvYWQpOworCisgICAgc3RhcnRlZExvYWQgPSBmYWxzZTsKKyAg ICBmaW5pc2hlZExvYWQgPSBmYWxzZTsKKworICAgIGNhbGxiYWNrQ291bnQgPSAwOworICAgIGNh bGxlZEFsbENhbGxiYWNrcyA9IGZhbHNlOworCisgICAgX19ibG9jayBXS1dlYlZpZXcgKnZpZXcg PSB3ZWJWaWV3LmdldCgpOworICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENv bXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikgewor ICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgKytjYWxsYmFja0NvdW50Owor ICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2KQorICAgICAgICAgICAgY2FsbGVkQWxsQ2Fs bGJhY2tzID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmlu Z1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJy b3IpIHsKKyAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgICsrY2FsbGJhY2tD b3VudDsKKyAgICAgICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKKyAgICAgICAgICAgIGNhbGxl ZEFsbENhbGxiYWNrcyA9IHRydWU7CisgICAgfV07CisgICAgW3dlYlZpZXcgX2dldENvbnRlbnRz QXNTdHJpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJy b3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBbdmll dyBfY2xvc2VdOyAvLyBDYWxsaW5nIF9jbG9zZSB3aWxsIGFsc28gaW52YWxpZGF0ZSBhbGwgY2Fs bGJhY2tzLgorICAgICAgICArK2NhbGxiYWNrQ291bnQ7CisgICAgICAgIGlmIChjYWxsYmFja0Nv dW50ID09IDYpCisgICAgICAgICAgICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0cnVlOworICAgIH1d OworICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVy Ol4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1Rf VFJVRSghIWVycm9yKTsKKyAgICAgICAgKytjYWxsYmFja0NvdW50OworICAgICAgICBpZiAoY2Fs bGJhY2tDb3VudCA9PSA2KQorICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBbd2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9u SGFuZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAg RVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgICsrY2FsbGJhY2tDb3VudDsKKyAgICAgICAg aWYgKGNhbGxiYWNrQ291bnQgPT0gNikKKyAgICAgICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9 IHRydWU7CisgICAgfV07CisgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdXaXRoQ29t cGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9yKSB7Cisg ICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICArK2NhbGxiYWNrQ291bnQ7Cisg ICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCisgICAgICAgICAgICBjYWxsZWRBbGxDYWxs YmFja3MgPSB0cnVlOworICAgIH1dOworCisgICAgLy8gU2ltdWxhdGUgYSBjcmFzaCwgd2hpY2gg c2hvdWxkIGludmFsaWRhdGUgYWxsIHBlbmRpbmcgY2FsbGJhY2tzLgorICAgIFt3ZWJWaWV3IF9r aWxsV2ViQ29udGVudFByb2Nlc3NdOworCisgICAgd2ViVmlldyA9IG51bGxwdHI7CisKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmNhbGxlZEFsbENhbGxiYWNrcyk7CisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6c2xlZXAoMC41KTsKKyAgICBFWFBFQ1RfRVEoNlUsIGNhbGxiYWNrQ291 bnQpOworfQorCiAjZW5kaWYgLy8gV0tfQVBJX0VOQUJMRUQK 344239 2018-07-03 16:26:14 -0700 2018-07-03 17:05:46 -0700 Patch bug-187298-20180703162613.patch text/plain 6497 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGMyNzhjNGViNTkwZjgwZjg0 ZDA2MGRlNmJiZDM5YTM5NTcyNmVkMWEuLjExMDQzNzg5NzgyZDViOGY1NDA3NjE1MjNkYThlOWIx OTQ4ZTE4ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDctMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIENhbGxiYWNrTWFwOjppbnZh bGlkYXRlKCkgc2FmZSB0byByZS1lbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Mjk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTA1NzE2 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KKworICAgICAgICBNYWRl IGl0IHNhZmUgdG8gcmUtZW50ZXIgQ2FsbGJhY2tNYXA6OmludmFsaWRhdGUoKSwgR2VuZXJpY0Nh bGxiYWNrOjpwZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUoKSwKKyAgICAgICAgR2VuZXJp Y0NhbGxiYWNrOjppbnZhbGlkYXRlKCkgJiBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAoKSBzaW5jZSB0 aG9zZSBleGVjdXRlIGNsaWVudCBibG9ja3Mgd2hpY2ggbWF5CisgICAgICAgIHJlLWVudGVyIFdl YktpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaDoKKyAgICAgICAg KFdlYktpdDo6R2VuZXJpY0NhbGxiYWNrOjpwZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUp OgorICAgICAgICAoV2ViS2l0OjppbnZhbGlkYXRlQ2FsbGJhY2tNYXApOgorCiAyMDE4LTA3LTAz ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENs ZWFuIHVwIHNhbmRib3ggd2FybmluZ3MgZm91bmQgZHVyaW5nIFB1YmxpYyBCZXRhCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HZW5lcmljQ2FsbGJhY2suaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0dlbmVyaWNDYWxsYmFjay5oCmluZGV4IGJhYzZkY2E0ZGMwMTg1YzZk NzYyZmRjZjA4ZmExZDYzMTFiMTA0YzAuLmY5MDUzM2UzZjRkY2I5ZmNmMmI5NDJiN2I0ZmVjMTFk MjAxZTIzNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dlbmVyaWNDYWxs YmFjay5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dlbmVyaWNDYWxsYmFjay5oCkBA IC0xMDUsOSArMTA1LDggQEAgcHVibGljOgogICAgICAgICBpZiAoIW1fY2FsbGJhY2spCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbV9jYWxsYmFjay52YWx1ZSgpKHJldHVyblZhbHVl Li4uLCBFcnJvcjo6Tm9uZSk7Ci0KLSAgICAgICAgbV9jYWxsYmFjayA9IHN0ZDo6bnVsbG9wdDsK KyAgICAgICAgYXV0byBjYWxsYmFjayA9IHN0ZDo6ZXhjaGFuZ2UobV9jYWxsYmFjaywgc3RkOjpu dWxsb3B0KTsKKyAgICAgICAgY2FsbGJhY2sudmFsdWUoKShyZXR1cm5WYWx1ZS4uLiwgRXJyb3I6 Ok5vbmUpOwogICAgIH0KIAogICAgIHZvaWQgcGVyZm9ybUNhbGxiYWNrKCkKQEAgLTEyMiw5ICsx MjEsOCBAQCBwdWJsaWM6CiAgICAgICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICBtX2NhbGxiYWNrLnZhbHVlKCkodHlwZW5hbWUgc3RkOjpyZW1vdmVf cmVmZXJlbmNlPFQ+Ojp0eXBlKCkuLi4sIGVycm9yKTsKLQotICAgICAgICBtX2NhbGxiYWNrID0g c3RkOjpudWxsb3B0OworICAgICAgICBhdXRvIGNhbGxiYWNrID0gc3RkOjpleGNoYW5nZShtX2Nh bGxiYWNrLCBzdGQ6Om51bGxvcHQpOworICAgICAgICBjYWxsYmFjay52YWx1ZSgpKHR5cGVuYW1l IHN0ZDo6cmVtb3ZlX3JlZmVyZW5jZTxUPjo6dHlwZSgpLi4uLCBlcnJvcik7CiAgICAgfQogCiBw cml2YXRlOgpAQCAtMTYzLDEwICsxNjEsOSBAQCB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxjb25z dCBTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSY+IEltYWdlQ2FsbGJhY2s7CiB0ZW1wbGF0ZTx0eXBl bmFtZSBUPgogdm9pZCBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAoSGFzaE1hcDx1aW50NjRfdCwgVD4m IGNhbGxiYWNrTWFwLCBDYWxsYmFja0Jhc2U6OkVycm9yIGVycm9yKQogewotICAgIGZvciAoYXV0 byYgY2FsbGJhY2sgOiBjb3B5VG9WZWN0b3IoY2FsbGJhY2tNYXAudmFsdWVzKCkpKQorICAgIGF1 dG8gbWFwID0gV1RGTW92ZShjYWxsYmFja01hcCk7CisgICAgZm9yIChhdXRvJiBjYWxsYmFjayA6 IG1hcC52YWx1ZXMoKSkKICAgICAgICAgY2FsbGJhY2stPmludmFsaWRhdGUoZXJyb3IpOwotCi0g ICAgY2FsbGJhY2tNYXAuY2xlYXIoKTsKIH0KIAogY2xhc3MgQ2FsbGJhY2tNYXAgewpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDMxYzEzYTBhNDY5 ZTY4ZmM5MTEwZjNlYjk4OTFlYzFlNGJlZTI3YmEuLmQyNjg0ZmJiYTY5YzQyOTIxNDlmN2Q4YTYx NzJmZjNlOTAxNzMyYWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNy0wMyAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgQ2FsbGJhY2tNYXA6OmludmFsaWRhdGUoKSBz YWZlIHRvIHJlLWVudGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODcyOTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxMDU3MTY3PgorCisgICAg ICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBj b3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vi Q29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW06CisgICAgICAgIChURVNUKToKKwogMjAxOC0w Ny0wMyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBW aWRlbyBzb21ldGltZXMgZmxpY2tlcnMgd2hlbiBwbGF5aW5nIHRvIEFwcGxlVFYKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nl c3NEaWRUZXJtaW5hdGUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlLm1tCmluZGV4IDgwNTI2ZDEyMTNjMzI2N2Rj Y2JmNzA2MjA4ZTVkMDJiNmI0MDFjNmIuLjQwNTBlYmQzOWJmOGU0MTg3MGRhMjQ1MTY0ODM5ZTM1 OTAzNDhmYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQpA QCAtNDIsNiArNDIsOCBAQCBzdGF0aWMgYm9vbCBzdGFydGVkTG9hZDsKIHN0YXRpYyBib29sIGZp bmlzaGVkTG9hZDsKIHN0YXRpYyBib29sIHNob3VsZExvYWRBZ2Fpbk9uQ3Jhc2g7CiBzdGF0aWMg Ym9vbCByZWNlaXZlZFNjcmlwdE1lc3NhZ2U7CitzdGF0aWMgYm9vbCBjYWxsZWRBbGxDYWxsYmFj a3M7CitzdGF0aWMgdW5zaWduZWQgY2FsbGJhY2tDb3VudDsKIAogc3RhdGljIE5TU3RyaW5nICp0 ZXN0SFRNTCA9IEAiPHNjcmlwdD53aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFu ZGxlci5wb3N0TWVzc2FnZSgnTE9BREVEJyk7PC9zY3JpcHQ+IjsKIApAQCAtMjA2LDQgKzIwOCw3 MiBAQCBURVNUKFdLTmF2aWdhdGlvbiwgQXV0b21hdGljVmlld1JlbG9hZEFmdGVyV2ViUHJvY2Vz c0NyYXNoKQogICAgIEVYUEVDVF9GQUxTRShzdGFydGVkTG9hZCk7CiB9CiAKK1RFU1QoV0tOYXZp Z2F0aW9uLCBQcm9jZXNzQ3Jhc2hEdXJpbmdDYWxsYmFjaykKK3sKKyAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgODAwLCA2MDApXSk7CisKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW0Jhc2ljTmF2 aWdhdGlvbkRlbGVnYXRlV2l0aG91dENyYXNoSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBzdGFy dGVkTG9hZCA9IGZhbHNlOworICAgIGZpbmlzaGVkTG9hZCA9IGZhbHNlOworCisgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1h aW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAicmljaC1hbmQtcGxhaW4tdGV4dCIgd2l0aEV4dGVu c2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZpbmlzaGVkTG9hZCk7CisKKyAgICBzdGFy dGVkTG9hZCA9IGZhbHNlOworICAgIGZpbmlzaGVkTG9hZCA9IGZhbHNlOworCisgICAgY2FsbGJh Y2tDb3VudCA9IDA7CisgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gZmFsc2U7CisKKyAgICBfX2Js b2NrIFdLV2ViVmlldyAqdmlldyA9IHdlYlZpZXcuZ2V0KCk7CisgICAgW3dlYlZpZXcgX2dldENv bnRlbnRzQXNTdHJpbmdXaXRoQ29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMs IE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAg ICArK2NhbGxiYWNrQ291bnQ7CisgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCisgICAg ICAgICAgICBjYWxsZWRBbGxDYWxsYmFja3MgPSB0cnVlOworICAgIH1dOworICAgIFt3ZWJWaWV3 IF9nZXRDb250ZW50c0FzU3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNv bnRlbnRzLCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsK KyAgICAgICAgKytjYWxsYmFja0NvdW50OworICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2 KQorICAgICAgICAgICAgY2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBb d2ViVmlldyBfZ2V0Q29udGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3Ry aW5nICpjb250ZW50cywgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1RSVUUoISFl cnJvcik7CisgICAgICAgIFt2aWV3IF9jbG9zZV07IC8vIENhbGxpbmcgX2Nsb3NlIHdpbGwgYWxz byBpbnZhbGlkYXRlIGFsbCBjYWxsYmFja3MuCisgICAgICAgICsrY2FsbGJhY2tDb3VudDsKKyAg ICAgICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKKyAgICAgICAgICAgIGNhbGxlZEFsbENhbGxi YWNrcyA9IHRydWU7CisgICAgfV07CisgICAgW3dlYlZpZXcgX2dldENvbnRlbnRzQXNTdHJpbmdX aXRoQ29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyAqY29udGVudHMsIE5TRXJyb3IgKmVycm9y KSB7CisgICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICArK2NhbGxiYWNrQ291 bnQ7CisgICAgICAgIGlmIChjYWxsYmFja0NvdW50ID09IDYpCisgICAgICAgICAgICBjYWxsZWRB bGxDYWxsYmFja3MgPSB0cnVlOworICAgIH1dOworICAgIFt3ZWJWaWV3IF9nZXRDb250ZW50c0Fz U3RyaW5nV2l0aENvbXBsZXRpb25IYW5kbGVyOl4oTlNTdHJpbmcgKmNvbnRlbnRzLCBOU0Vycm9y ICplcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgKytjYWxs YmFja0NvdW50OworICAgICAgICBpZiAoY2FsbGJhY2tDb3VudCA9PSA2KQorICAgICAgICAgICAg Y2FsbGVkQWxsQ2FsbGJhY2tzID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBbd2ViVmlldyBfZ2V0Q29u dGVudHNBc1N0cmluZ1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeKE5TU3RyaW5nICpjb250ZW50cywg TlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAg ICsrY2FsbGJhY2tDb3VudDsKKyAgICAgICAgaWYgKGNhbGxiYWNrQ291bnQgPT0gNikKKyAgICAg ICAgICAgIGNhbGxlZEFsbENhbGxiYWNrcyA9IHRydWU7CisgICAgfV07CisKKyAgICAvLyBTaW11 bGF0ZSBhIGNyYXNoLCB3aGljaCBzaG91bGQgaW52YWxpZGF0ZSBhbGwgcGVuZGluZyBjYWxsYmFj a3MuCisgICAgW3dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc107CisKKyAgICB3ZWJWaWV3 ID0gbnVsbHB0cjsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmY2FsbGVkQWxsQ2Fs bGJhY2tzKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzbGVlcCgwLjUpOworICAgIEVYUEVD VF9FUSg2VSwgY2FsbGJhY2tDb3VudCk7Cit9CisKICNlbmRpZiAvLyBXS19BUElfRU5BQkxFRAo=