170905 2017-04-17 09:46:47 -0700 [GLIB] Define priorities also for async network IO tasks 2017-04-18 00:57:26 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply commit-queue zan oldest_to_newest 1297925 0 cgarcia 2017-04-17 09:46:47 -0700 We are using G_PRIORITY_DEFAULT for most of them. Now that we changed the default dispatch priority to G_PRIORITY_HIGH_IDLE in the GTK+ port, we should use the same for network IO tasks to ensure that tasks dispatched by the run loop to cancel a network load, can actually cancel the load before it finishes. 1297929 1 307273 cgarcia 2017-04-17 09:53:39 -0700 Created attachment 307273 Patch 1298214 2 307273 commit-queue 2017-04-18 00:57:25 -0700 Comment on attachment 307273 Patch Clearing flags on attachment: 307273 Committed r215455: <http://trac.webkit.org/changeset/215455> 1298215 3 commit-queue 2017-04-18 00:57:26 -0700 All reviewed patches have been landed. Closing bug. 307273 2017-04-17 09:53:39 -0700 2017-04-18 00:57:25 -0700 Patch wk-network-priorities.diff text/plain 17474 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggOTRmMDc4NGQ4YzkuLjkwZGNhN2VlZjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3 LTA0LTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR0xJQl0gRGVmaW5lIHByaW9yaXRpZXMgYWxzbyBmb3IgYXN5bmMgbmV0d29yayBJTyB0 YXNrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcw OTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IEFzeW5jSU9OZXR3b3JrLCBEaXNrQ2FjaGVSZWFkIGFuZCBEaXNrQ2FjaGVXcml0ZSBwcmlvcml0 aWVzLgorCisgICAgICAgICogd3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5Lmg6CisKIDIw MTctMDQtMTEgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdIFVzZSB0aGUgRGlzcGxheVJlZnJlc2hNb25pdG9yIGZhY2lsaXRpZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5LmggYi9Tb3VyY2Uv V1RGL3d0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5oCmluZGV4IGExZGRlMTNkZDI4Li44 ZDI0N2MzMWU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZ2xpYi9SdW5Mb29wU291cmNl UHJpb3JpdHkuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0 eS5oCkBAIC02OCw3ICs2OCwxNiBAQCBlbnVtIFJ1bkxvb3BTb3VyY2VQcmlvcml0eSB7CiAgICAg RGlzcGxheVJlZnJlc2hNb25pdG9yVGltZXIgPSAtMTAwLAogCiAgICAgLy8gUmVuZGVyaW5nIHRp bWVyIGluIHRoZSBtYWluIHRocmVhZCB3aGVuIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGlzIG5v dCB1c2VkLgotICAgIE5vbkFjY2VsZXJhdGVkRHJhd2luZ1RpbWVyID0gMTAwCisgICAgTm9uQWNj ZWxlcmF0ZWREcmF3aW5nVGltZXIgPSAxMDAsCisKKyAgICAvLyBBc3luYyBJTyBuZXR3b3JrIGNh bGxiYWNrcy4KKyAgICBBc3luY0lPTmV0d29yayA9IDEwMCwKKworICAgIC8vIERpc2sgY2FjaGUg cmVhZCBjYWxsYmFja3MuCisgICAgRGlza0NhY2hlUmVhZCA9IDEwMCwKKworICAgIC8vIERpc2sg Y2FjaGUgd3JpdGUgY2FsbGJhY2tzLgorICAgIERpc2tDYWNoZVdyaXRlID0gMjAwLAogfTsKIAog fSAvLyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFhOTRmZDgxMGQuLjMxZmU5ODc4ZDY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTctMDQtMTcgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHTElCXSBEZWZpbmUgcHJp b3JpdGllcyBhbHNvIGZvciBhc3luYyBuZXR3b3JrIElPIHRhc2tzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA5MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVkaXJlY3RTa2lwQ2Fs bGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6c2VuZFJlcXVlc3RDYWxsYmFjayk6CisgICAgICAg IChXZWJDb3JlOjpjb250aW51ZUFmdGVyRGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdl YkNvcmU6OnJlYWRDYWxsYmFjayk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Nv Y2tldFN0cmVhbUhhbmRsZUltcGxTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0 cmVhbUhhbmRsZUltcGw6OmNvbm5lY3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJl YW1IYW5kbGVJbXBsOjpyZWFkQnl0ZXMpOgorCiAyMDE3LTA0LTEyICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBDcmFzaCBhdCBXZWJD b3JlOjpSZXNvdXJjZUhhbmRsZTo6Y2xlYXJDbGllbnQoKSB3aGVuIHN0cmVhbWluZyBsaXZlIHZp ZGVvIGZyb20gZGFpbHltb3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggOWQ2ZDVjNDA3 NzQuLmRiNjhkN2I3NDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNTgsNiArNTgsNyBA QAogI2VuZGlmCiAjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW5jbHVkZSA8d3RmL2ds aWIvR1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpA QCAtMzgyLDcgKzM4Myw3IEBAIHN0YXRpYyB2b2lkIHJlZGlyZWN0U2tpcENhbGxiYWNrKEdPYmpl Y3QqLCBHQXN5bmNSZXN1bHQqIGFzeW5jUmVzdWx0LCBncG9pbnRlciBkCiAgICAgfQogCiAgICAg aWYgKGJ5dGVzU2tpcHBlZCA+IDApIHsKLSAgICAgICAgZ19pbnB1dF9zdHJlYW1fc2tpcF9hc3lu YyhkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBnRGVmYXVsdFJlYWRCdWZmZXJTaXplLCBHX1BSSU9S SVRZX0RFRkFVTFQsCisgICAgICAgIGdfaW5wdXRfc3RyZWFtX3NraXBfYXN5bmMoZC0+bV9pbnB1 dFN0cmVhbS5nZXQoKSwgZ0RlZmF1bHRSZWFkQnVmZmVyU2l6ZSwgUnVuTG9vcFNvdXJjZVByaW9y aXR5OjpBc3luY0lPTmV0d29yaywKICAgICAgICAgICAgIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCks IHJlZGlyZWN0U2tpcENhbGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAg ICAgfQpAQCAtNTEzLDcgKzUxNCw3IEBAIHN0YXRpYyB2b2lkIHNlbmRSZXF1ZXN0Q2FsbGJhY2so R09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciBkYXRhKQogCiAgICAgICAg IGlmIChTT1VQX1NUQVRVU19JU19SRURJUkVDVElPTihzb3VwTWVzc2FnZS0+c3RhdHVzX2NvZGUp ICYmIHNob3VsZFJlZGlyZWN0KGhhbmRsZS5nZXQoKSkpIHsKICAgICAgICAgICAgIGQtPm1faW5w dXRTdHJlYW0gPSBpbnB1dFN0cmVhbTsKLSAgICAgICAgICAgIGdfaW5wdXRfc3RyZWFtX3NraXBf YXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgZ0RlZmF1bHRSZWFkQnVmZmVyU2l6ZSwgR19Q UklPUklUWV9ERUZBVUxULAorICAgICAgICAgICAgZ19pbnB1dF9zdHJlYW1fc2tpcF9hc3luYyhk LT5tX2lucHV0U3RyZWFtLmdldCgpLCBnRGVmYXVsdFJlYWRCdWZmZXJTaXplLCBSdW5Mb29wU291 cmNlUHJpb3JpdHk6OkFzeW5jSU9OZXR3b3JrLAogICAgICAgICAgICAgICAgIGQtPm1fY2FuY2Vs bGFibGUuZ2V0KCksIHJlZGlyZWN0U2tpcENhbGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC01NTEsNyArNTUyLDcgQEAgc3RhdGljIHZvaWQg Y29udGludWVBZnRlckRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQog CiAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsK ICAgICBpZiAoZC0+bV9zb3VwTWVzc2FnZSAmJiBkLT5tX211bHRpcGFydElucHV0U3RyZWFtICYm ICFkLT5tX2lucHV0U3RyZWFtKSB7Ci0gICAgICAgIHNvdXBfbXVsdGlwYXJ0X2lucHV0X3N0cmVh bV9uZXh0X3BhcnRfYXN5bmMoZC0+bV9tdWx0aXBhcnRJbnB1dFN0cmVhbS5nZXQoKSwgR19QUklP UklUWV9ERUZBVUxULAorICAgICAgICBzb3VwX211bHRpcGFydF9pbnB1dF9zdHJlYW1fbmV4dF9w YXJ0X2FzeW5jKGQtPm1fbXVsdGlwYXJ0SW5wdXRTdHJlYW0uZ2V0KCksIFJ1bkxvb3BTb3VyY2VQ cmlvcml0eTo6QXN5bmNJT05ldHdvcmssCiAgICAgICAgICAgICBkLT5tX2NhbmNlbGxhYmxlLmdl dCgpLCBuZXh0TXVsdGlwYXJ0UmVzcG9uc2VQYXJ0Q2FsbGJhY2ssIGhhbmRsZSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC01NTksNyArNTYwLDcgQEAgc3RhdGljIHZvaWQgY29udGludWVB ZnRlckRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQogICAgIEFTU0VS VChkLT5tX2lucHV0U3RyZWFtKTsKICAgICBoYW5kbGUtPmVuc3VyZVJlYWRCdWZmZXIoKTsKICAg ICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGNvbnN0 X2Nhc3Q8Y2hhcio+KGQtPm1fc291cEJ1ZmZlci0+ZGF0YSksIGQtPm1fc291cEJ1ZmZlci0+bGVu Z3RoLAotICAgICAgICBHX1BSSU9SSVRZX0RFRkFVTFQsIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCks IHJlYWRDYWxsYmFjaywgaGFuZGxlKTsKKyAgICAgICAgUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpB c3luY0lPTmV0d29yaywgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgcmVhZENhbGxiYWNrLCBoYW5k bGUpOwogfQogCiAjaWYgRU5BQkxFKFdFQl9USU1JTkcpCkBAIC0xMDA0LDcgKzEwMDUsNyBAQCBz dGF0aWMgdm9pZCByZWFkQ2FsbGJhY2soR09iamVjdCosIEdBc3luY1Jlc3VsdCogYXN5bmNSZXN1 bHQsIGdwb2ludGVyIGRhdGEpCiAgICAgICAgIC8vIElmIHRoaXMgaXMgYSBtdWx0aXBhcnQgbWVz c2FnZSwgd2UnbGwgbG9vayBmb3IgYW5vdGhlciBwYXJ0LgogICAgICAgICBpZiAoZC0+bV9zb3Vw TWVzc2FnZSAmJiBkLT5tX211bHRpcGFydElucHV0U3RyZWFtKSB7CiAgICAgICAgICAgICBkLT5t X2lucHV0U3RyZWFtLmNsZWFyKCk7Ci0gICAgICAgICAgICBzb3VwX211bHRpcGFydF9pbnB1dF9z dHJlYW1fbmV4dF9wYXJ0X2FzeW5jKGQtPm1fbXVsdGlwYXJ0SW5wdXRTdHJlYW0uZ2V0KCksIEdf UFJJT1JJVFlfREVGQVVMVCwKKyAgICAgICAgICAgIHNvdXBfbXVsdGlwYXJ0X2lucHV0X3N0cmVh bV9uZXh0X3BhcnRfYXN5bmMoZC0+bV9tdWx0aXBhcnRJbnB1dFN0cmVhbS5nZXQoKSwgUnVuTG9v cFNvdXJjZVByaW9yaXR5OjpBc3luY0lPTmV0d29yaywKICAgICAgICAgICAgICAgICBkLT5tX2Nh bmNlbGxhYmxlLmdldCgpLCBuZXh0TXVsdGlwYXJ0UmVzcG9uc2VQYXJ0Q2FsbGJhY2ssIGhhbmRs ZS5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTEwMzUsNyArMTAz Niw3IEBAIHN0YXRpYyB2b2lkIHJlYWRDYWxsYmFjayhHT2JqZWN0KiwgR0FzeW5jUmVzdWx0KiBh c3luY1Jlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKICAgICB9CiAKICAgICBoYW5kbGUtPmVuc3VyZVJl YWRCdWZmZXIoKTsKLSAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJl YW0uZ2V0KCksIGNvbnN0X2Nhc3Q8Y2hhcio+KGQtPm1fc291cEJ1ZmZlci0+ZGF0YSksIGQtPm1f c291cEJ1ZmZlci0+bGVuZ3RoLCBHX1BSSU9SSVRZX0RFRkFVTFQsCisgICAgZ19pbnB1dF9zdHJl YW1fcmVhZF9hc3luYyhkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBjb25zdF9jYXN0PGNoYXIqPihk LT5tX3NvdXBCdWZmZXItPmRhdGEpLCBkLT5tX3NvdXBCdWZmZXItPmxlbmd0aCwgUnVuTG9vcFNv dXJjZVByaW9yaXR5OjpBc3luY0lPTmV0d29yaywKICAgICAgICAgZC0+bV9jYW5jZWxsYWJsZS5n ZXQoKSwgcmVhZENhbGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlSW1wbFNv dXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVh bUhhbmRsZUltcGxTb3VwLmNwcAppbmRleCA1OTczMjAxMGU3Mi4uZTg1OTRlOTQzYzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRTdHJlYW1I YW5kbGVJbXBsU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL1NvY2tldFN0cmVhbUhhbmRsZUltcGxTb3VwLmNwcApAQCAtNDMsNiArNDMsNyBAQAogI2lu Y2x1ZGUgPGdsaWIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL2ds aWIvR1VuaXF1ZVB0ci5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0 eS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2RlZmluZSBSRUFEX0JVRkZF Ul9TSVpFIDEwMjQKQEAgLTEwOSw3ICsxMTAsNyBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZUlt cGw6OmNvbm5lY3RlZChHUmVmUHRyPEdTb2NrZXRDb25uZWN0aW9uPiYmIHNvY2tldENvbm5lYwog ICAgIG1fcmVhZEJ1ZmZlciA9IHN0ZDo6bWFrZV91bmlxdWU8Y2hhcltdPihSRUFEX0JVRkZFUl9T SVpFKTsKIAogICAgIFJlZlB0cjxTb2NrZXRTdHJlYW1IYW5kbGVJbXBsPiBwcm90ZWN0ZWRUaGlz KHRoaXMpOwotICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMobV9pbnB1dFN0cmVhbS5nZXQo KSwgbV9yZWFkQnVmZmVyLmdldCgpLCBSRUFEX0JVRkZFUl9TSVpFLCBHX1BSSU9SSVRZX0RFRkFV TFQsIG1fY2FuY2VsbGFibGUuZ2V0KCksCisgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyht X2lucHV0U3RyZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIuZ2V0KCksIFJFQURfQlVGRkVSX1NJWkUs IFJ1bkxvb3BTb3VyY2VQcmlvcml0eTo6QXN5bmNJT05ldHdvcmssIG1fY2FuY2VsbGFibGUuZ2V0 KCksCiAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4ocmVhZFJl YWR5Q2FsbGJhY2spLCBwcm90ZWN0ZWRUaGlzLmxlYWtSZWYoKSk7CiAKICAgICBtX3N0YXRlID0g T3BlbjsKQEAgLTE1Miw3ICsxNTMsNyBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZUltcGw6OnJl YWRCeXRlcyhnc3NpemUgYnl0ZXNSZWFkKQogICAgICAgICBtX2NsaWVudC5kaWRSZWNlaXZlU29j a2V0U3RyZWFtRGF0YSgqdGhpcywgbV9yZWFkQnVmZmVyLmdldCgpLCBzdGF0aWNfY2FzdDxzaXpl X3Q+KGJ5dGVzUmVhZCkpOwogCiAgICAgaWYgKG1faW5wdXRTdHJlYW0pIHsKLSAgICAgICAgZ19p bnB1dF9zdHJlYW1fcmVhZF9hc3luYyhtX2lucHV0U3RyZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIu Z2V0KCksIFJFQURfQlVGRkVSX1NJWkUsIEdfUFJJT1JJVFlfREVGQVVMVCwgbV9jYW5jZWxsYWJs ZS5nZXQoKSwKKyAgICAgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhtX2lucHV0U3RyZWFt LmdldCgpLCBtX3JlYWRCdWZmZXIuZ2V0KCksIFJFQURfQlVGRkVSX1NJWkUsIFJ1bkxvb3BTb3Vy Y2VQcmlvcml0eTo6QXN5bmNJT05ldHdvcmssIG1fY2FuY2VsbGFibGUuZ2V0KCksCiAgICAgICAg ICAgICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlYWRSZWFkeUNhbGxi YWNrKSwgcHJvdGVjdGVkVGhpcy5sZWFrUmVmKCkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5 YzlkNWVlMGZjZi4uODM1MDNkZjJhNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAx Ny0wNC0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0dMSUJdIERlZmluZSBwcmlvcml0aWVzIGFsc28gZm9yIGFzeW5jIG5ldHdvcmsgSU8g dGFza3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MDkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlSU9DaGFubmVsU291cC5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6aW5wdXRTdHJlYW1SZWFkUmVhZHlDYWxsYmFjayk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6SU9DaGFubmVsOjpyZWFkKToKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpvdXRwdXRTdHJlYW1Xcml0ZVJlYWR5Q2FsbGJhY2sp OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OklPQ2hhbm5lbDo6d3JpdGUpOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya0RhdGFUYXNrU291cC5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OnNraXBJbnB1dFN0cmVhbUZvclJlZGly ZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrU291cDo6cmVhZCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OnJlcXVlc3ROZXh0UGFydCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OndyaXRlRG93bmxvYWQpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tTb3VwOjpkaWRGaW5pc2hEb3dubG9hZCk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6Cisg ICAgICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKToKKyAgICAgICAgKHdl YmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoKToKKwogMjAxNy0wNC0xMSAgWmFuIERvYmVy c2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXNlIHRoZSBEaXNw bGF5UmVmcmVzaE1vbml0b3IgZmFjaWxpdGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlSU9DaGFubmVsU291cC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVJT0NoYW5uZWxTb3Vw LmNwcAppbmRleCBlZjdiYTg5OTgyMC4uMzZkMWE2ZTJhN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUlPQ2hhbm5lbFNvdXAuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUlP Q2hhbm5lbFNvdXAuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8d3RmL01haW5UaHJl YWQuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlx dWVQdHIuaD4KKyNpbmNsdWRlIDx3dGYvZ2xpYi9SdW5Mb29wU291cmNlUHJpb3JpdHkuaD4KIAog bmFtZXNwYWNlIFdlYktpdCB7CiBuYW1lc3BhY2UgTmV0d29ya0NhY2hlIHsKQEAgLTE0OCw3ICsx NDksNyBAQCBzdGF0aWMgdm9pZCBpbnB1dFN0cmVhbVJlYWRSZWFkeUNhbGxiYWNrKEdJbnB1dFN0 cmVhbSogc3RyZWFtLCBHQXN5bmNSZXN1bHQqIHJlcwogICAgIHNpemVfdCBieXRlc1RvUmVhZCA9 IHN0ZDo6bWluKHBlbmRpbmdCeXRlc1RvUmVhZCwgYXN5bmNEYXRhLT5idWZmZXItPmxlbmd0aCk7 CiAgICAgLy8gVXNlIGEgbG9jYWwgdmFyaWFibGUgZm9yIHRoZSBkYXRhIGJ1ZmZlciB0byBwYXNz IGl0IHRvIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMoKSwgYmVjYXVzZSBSZWFkQXN5bmNEYXRh IGlzIHJlbGVhc2VkLgogICAgIGF1dG8gZGF0YSA9IGNvbnN0X2Nhc3Q8Y2hhcio+KGFzeW5jRGF0 YS0+YnVmZmVyLT5kYXRhKTsKLSAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKHN0cmVhbSwg ZGF0YSwgYnl0ZXNUb1JlYWQsIEdfUFJJT1JJVFlfREVGQVVMVCwgbnVsbHB0ciwKKyAgICBnX2lu cHV0X3N0cmVhbV9yZWFkX2FzeW5jKHN0cmVhbSwgZGF0YSwgYnl0ZXNUb1JlYWQsIFJ1bkxvb3BT b3VyY2VQcmlvcml0eTo6RGlza0NhY2hlUmVhZCwgbnVsbHB0ciwKICAgICAgICAgcmVpbnRlcnBy ZXRfY2FzdDxHQXN5bmNSZWFkeUNhbGxiYWNrPihpbnB1dFN0cmVhbVJlYWRSZWFkeUNhbGxiYWNr KSwgYXN5bmNEYXRhLnJlbGVhc2UoKSk7CiB9CiAKQEAgLTE3NCw3ICsxNzUsNyBAQCB2b2lkIElP Q2hhbm5lbDo6cmVhZChzaXplX3Qgb2Zmc2V0LCBzaXplX3Qgc2l6ZSwgV29ya1F1ZXVlKiBxdWV1 ZSwgc3RkOjpmdW5jdGlvbgogICAgIFJlYWRBc3luY0RhdGEqIGFzeW5jRGF0YSA9IG5ldyBSZWFk QXN5bmNEYXRhIHsgdGhpcywgYnVmZmVyLmdldCgpLCBxdWV1ZSwgc2l6ZSwgY29tcGxldGlvbkhh bmRsZXIsIHsgfSB9OwogCiAgICAgLy8gRklYTUU6IGltcGxlbWVudCBvZmZzZXQuCi0gICAgZ19p bnB1dF9zdHJlYW1fcmVhZF9hc3luYyhtX2lucHV0U3RyZWFtLmdldCgpLCBjb25zdF9jYXN0PGNo YXIqPihidWZmZXItPmRhdGEpLCBidWZmZXJTaXplLCBHX1BSSU9SSVRZX0RFRkFVTFQsIG51bGxw dHIsCisgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhtX2lucHV0U3RyZWFtLmdldCgpLCBj b25zdF9jYXN0PGNoYXIqPihidWZmZXItPmRhdGEpLCBidWZmZXJTaXplLCBSdW5Mb29wU291cmNl UHJpb3JpdHk6OkRpc2tDYWNoZVJlYWQsIG51bGxwdHIsCiAgICAgICAgIHJlaW50ZXJwcmV0X2Nh c3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4oaW5wdXRTdHJlYW1SZWFkUmVhZHlDYWxsYmFjayksIGFz eW5jRGF0YSk7CiB9CiAKQEAgLTI1MSw3ICsyNTIsNyBAQCBzdGF0aWMgdm9pZCBvdXRwdXRTdHJl YW1Xcml0ZVJlYWR5Q2FsbGJhY2soR091dHB1dFN0cmVhbSogc3RyZWFtLCBHQXN5bmNSZXN1bHQq CiAgICAgYXN5bmNEYXRhLT5idWZmZXIgPSBhZG9wdEdSZWYoc291cF9idWZmZXJfbmV3X3N1YmJ1 ZmZlcihhc3luY0RhdGEtPmJ1ZmZlci5nZXQoKSwgYnl0ZXNXcml0dGVuLCBwZW5kaW5nQnl0ZXNU b1dyaXRlKSk7CiAgICAgLy8gVXNlIGEgbG9jYWwgdmFyaWFibGUgZm9yIHRoZSBkYXRhIGJ1ZmZl ciB0byBwYXNzIGl0IHRvIGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hc3luYygpLCBiZWNhdXNlIFdy aXRlQXN5bmNEYXRhIGlzIHJlbGVhc2VkLgogICAgIGF1dG8gZGF0YSA9IGFzeW5jRGF0YS0+YnVm ZmVyLT5kYXRhOwotICAgIGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hc3luYyhzdHJlYW0sIGRhdGEs IHBlbmRpbmdCeXRlc1RvV3JpdGUsIEdfUFJJT1JJVFlfREVGQVVMVF9JRExFLCBudWxscHRyLAor ICAgIGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hc3luYyhzdHJlYW0sIGRhdGEsIHBlbmRpbmdCeXRl c1RvV3JpdGUsIFJ1bkxvb3BTb3VyY2VQcmlvcml0eTo6RGlza0NhY2hlV3JpdGUsIG51bGxwdHIs CiAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4ob3V0cHV0U3Ry ZWFtV3JpdGVSZWFkeUNhbGxiYWNrKSwgYXN5bmNEYXRhLnJlbGVhc2UoKSk7CiB9CiAKQEAgLTI3 NSw3ICsyNzYsNyBAQCB2b2lkIElPQ2hhbm5lbDo6d3JpdGUoc2l6ZV90IG9mZnNldCwgY29uc3Qg RGF0YSYgZGF0YSwgV29ya1F1ZXVlKiBxdWV1ZSwgc3RkOjpmdQogCiAgICAgV3JpdGVBc3luY0Rh dGEqIGFzeW5jRGF0YSA9IG5ldyBXcml0ZUFzeW5jRGF0YSB7IHRoaXMsIGRhdGEuc291cEJ1ZmZl cigpLCBxdWV1ZSwgY29tcGxldGlvbkhhbmRsZXIgfTsKICAgICAvLyBGSVhNRTogaW1wbGVtZW50 IG9mZnNldC4KLSAgICBnX291dHB1dF9zdHJlYW1fd3JpdGVfYXN5bmMoc3RyZWFtLCBhc3luY0Rh dGEtPmJ1ZmZlci0+ZGF0YSwgZGF0YS5zaXplKCksIEdfUFJJT1JJVFlfREVGQVVMVF9JRExFLCBu dWxscHRyLAorICAgIGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hc3luYyhzdHJlYW0sIGFzeW5jRGF0 YS0+YnVmZmVyLT5kYXRhLCBkYXRhLnNpemUoKSwgUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpEaXNr Q2FjaGVXcml0ZSwgbnVsbHB0ciwKICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHQXN5bmNSZWFk eUNhbGxiYWNrPihvdXRwdXRTdHJlYW1Xcml0ZVJlYWR5Q2FsbGJhY2spLCBhc3luY0RhdGEpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdv cmtEYXRhVGFza1NvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9O ZXR3b3JrRGF0YVRhc2tTb3VwLmNwcAppbmRleCA5MGJlMjNkZjM5MC4uY2FlY2M3NDhlNGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya0RhdGFU YXNrU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3 b3JrRGF0YVRhc2tTb3VwLmNwcApAQCAtNDEsNiArNDEsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUv U2hhcmVkQnVmZmVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb3VwTmV0d29ya1Nlc3Npb24uaD4K ICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BT b3VyY2VQcmlvcml0eS5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNTc3LDcg KzU3OCw3IEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrU291cDo6c2tpcElucHV0U3RyZWFtRm9yUmVk aXJlY3Rpb24oKQogewogICAgIEFTU0VSVChtX2lucHV0U3RyZWFtKTsKICAgICBSZWZQdHI8TmV0 d29ya0RhdGFUYXNrU291cD4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKLSAgICBnX2lucHV0X3N0cmVh bV9za2lwX2FzeW5jKG1faW5wdXRTdHJlYW0uZ2V0KCksIGdEZWZhdWx0UmVhZEJ1ZmZlclNpemUs IEdfUFJJT1JJVFlfREVGQVVMVCwgbV9jYW5jZWxsYWJsZS5nZXQoKSwKKyAgICBnX2lucHV0X3N0 cmVhbV9za2lwX2FzeW5jKG1faW5wdXRTdHJlYW0uZ2V0KCksIGdEZWZhdWx0UmVhZEJ1ZmZlclNp emUsIFJ1bkxvb3BTb3VyY2VQcmlvcml0eTo6QXN5bmNJT05ldHdvcmssIG1fY2FuY2VsbGFibGUu Z2V0KCksCiAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4oc2tp cElucHV0U3RyZWFtRm9yUmVkaXJlY3Rpb25DYWxsYmFjayksIHByb3RlY3RlZFRoaXMubGVha1Jl ZigpKTsKIH0KIApAQCAtNzMyLDcgKzczMyw3IEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrU291cDo6 cmVhZCgpCiAgICAgUmVmUHRyPE5ldHdvcmtEYXRhVGFza1NvdXA+IHByb3RlY3RlZFRoaXModGhp cyk7CiAgICAgQVNTRVJUKG1faW5wdXRTdHJlYW0pOwogICAgIG1fcmVhZEJ1ZmZlci5ncm93KGdE ZWZhdWx0UmVhZEJ1ZmZlclNpemUpOwotICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMobV9p bnB1dFN0cmVhbS5nZXQoKSwgbV9yZWFkQnVmZmVyLmRhdGEoKSwgbV9yZWFkQnVmZmVyLnNpemUo KSwgR19QUklPUklUWV9ERUZBVUxULCBtX2NhbmNlbGxhYmxlLmdldCgpLAorICAgIGdfaW5wdXRf c3RyZWFtX3JlYWRfYXN5bmMobV9pbnB1dFN0cmVhbS5nZXQoKSwgbV9yZWFkQnVmZmVyLmRhdGEo KSwgbV9yZWFkQnVmZmVyLnNpemUoKSwgUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpBc3luY0lPTmV0 d29yaywgbV9jYW5jZWxsYWJsZS5nZXQoKSwKICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHQXN5 bmNSZWFkeUNhbGxiYWNrPihyZWFkQ2FsbGJhY2spLCBwcm90ZWN0ZWRUaGlzLmxlYWtSZWYoKSk7 CiB9CiAKQEAgLTc5OSw3ICs4MDAsNyBAQCB2b2lkIE5ldHdvcmtEYXRhVGFza1NvdXA6OnJlcXVl c3ROZXh0UGFydCgpCiAgICAgUmVmUHRyPE5ldHdvcmtEYXRhVGFza1NvdXA+IHByb3RlY3RlZFRo aXModGhpcyk7CiAgICAgQVNTRVJUKG1fbXVsdGlwYXJ0SW5wdXRTdHJlYW0pOwogICAgIEFTU0VS VCghbV9pbnB1dFN0cmVhbSk7Ci0gICAgc291cF9tdWx0aXBhcnRfaW5wdXRfc3RyZWFtX25leHRf cGFydF9hc3luYyhtX211bHRpcGFydElucHV0U3RyZWFtLmdldCgpLCBHX1BSSU9SSVRZX0RFRkFV TFQsIG1fY2FuY2VsbGFibGUuZ2V0KCksCisgICAgc291cF9tdWx0aXBhcnRfaW5wdXRfc3RyZWFt X25leHRfcGFydF9hc3luYyhtX211bHRpcGFydElucHV0U3RyZWFtLmdldCgpLCBSdW5Mb29wU291 cmNlUHJpb3JpdHk6OkFzeW5jSU9OZXR3b3JrLCBtX2NhbmNlbGxhYmxlLmdldCgpLAogICAgICAg ICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHJlcXVlc3ROZXh0UGFydENh bGxiYWNrKSwgcHJvdGVjdGVkVGhpcy5sZWFrUmVmKCkpOwogfQogCkBAIC05MzYsNyArOTM3LDcg QEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tTb3VwOjp3cml0ZURvd25sb2FkKCkKIHsKICAgICBSZWZQ dHI8TmV0d29ya0RhdGFUYXNrU291cD4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKICNpZiBHTElCX0NI RUNLX1ZFUlNJT04oMiwgNDQsIDApCi0gICAgZ19vdXRwdXRfc3RyZWFtX3dyaXRlX2FsbF9hc3lu YyhtX2Rvd25sb2FkT3V0cHV0U3RyZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIuZGF0YSgpLCBtX3Jl YWRCdWZmZXIuc2l6ZSgpLCBHX1BSSU9SSVRZX0RFRkFVTFQsIG1fY2FuY2VsbGFibGUuZ2V0KCks CisgICAgZ19vdXRwdXRfc3RyZWFtX3dyaXRlX2FsbF9hc3luYyhtX2Rvd25sb2FkT3V0cHV0U3Ry ZWFtLmdldCgpLCBtX3JlYWRCdWZmZXIuZGF0YSgpLCBtX3JlYWRCdWZmZXIuc2l6ZSgpLCBSdW5M b29wU291cmNlUHJpb3JpdHk6OkFzeW5jSU9OZXR3b3JrLCBtX2NhbmNlbGxhYmxlLmdldCgpLAog ICAgICAgICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5Q2FsbGJhY2s+KHdyaXRlRG93bmxv YWRDYWxsYmFjayksIHByb3RlY3RlZFRoaXMubGVha1JlZigpKTsKICNlbHNlCiAgICAgR1JlZlB0 cjxHVGFzaz4gd3JpdGVUYXNrID0gYWRvcHRHUmVmKGdfdGFza19uZXcobV9kb3dubG9hZE91dHB1 dFN0cmVhbS5nZXQoKSwgbV9jYW5jZWxsYWJsZS5nZXQoKSwKQEAgLTk5MCw3ICs5OTEsNyBAQCB2 b2lkIE5ldHdvcmtEYXRhVGFza1NvdXA6OmRpZEZpbmlzaERvd25sb2FkKCkKICAgICBDU3RyaW5n IHVyaSA9IG1fcmVzcG9uc2UudXJsKCkuc3RyaW5nKCkudXRmOCgpOwogICAgIGdfZmlsZV9pbmZv X3NldF9hdHRyaWJ1dGVfc3RyaW5nKGluZm8uZ2V0KCksICJtZXRhZGF0YTo6ZG93bmxvYWQtdXJp IiwgdXJpLmRhdGEoKSk7CiAgICAgZ19maWxlX2luZm9fc2V0X2F0dHJpYnV0ZV9zdHJpbmcoaW5m by5nZXQoKSwgInhhdHRyOjp4ZGcub3JpZ2luLnVybCIsIHVyaS5kYXRhKCkpOwotICAgIGdfZmls ZV9zZXRfYXR0cmlidXRlc19hc3luYyhtX2Rvd25sb2FkRGVzdGluYXRpb25GaWxlLmdldCgpLCBp bmZvLmdldCgpLCBHX0ZJTEVfUVVFUllfSU5GT19OT05FLCBHX1BSSU9SSVRZX0RFRkFVTFQsIG51 bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOworICAgIGdfZmlsZV9zZXRfYXR0cmlidXRlc19hc3lu YyhtX2Rvd25sb2FkRGVzdGluYXRpb25GaWxlLmdldCgpLCBpbmZvLmdldCgpLCBHX0ZJTEVfUVVF UllfSU5GT19OT05FLCBSdW5Mb29wU291cmNlUHJpb3JpdHk6OkFzeW5jSU9OZXR3b3JrLCBudWxs cHRyLCBudWxscHRyLCBudWxscHRyKTsKIAogICAgIGNsZWFyUmVxdWVzdCgpOwogICAgIGF1dG8q IGRvd25sb2FkID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmRvd25sb2FkTWFuYWdlcigp LmRvd25sb2FkKG1fcGVuZGluZ0Rvd25sb2FkSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVxdWVzdC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmNwcAppbmRl eCA5MTk0N2MyZGU4OS4uZjk0MmYzYTUyZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCkBAIC0z MCw2ICszMCw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CiAjaW5jbHVk ZSA8bGlic291cC9zb3VwLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgorI2luY2x1 ZGUgPHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0 L0NTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTIwNyw3ICsyMDgsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKEdJbnB1dFN0 cmVhbSogaW5wdXRTdHJlYW0sIEdBc3luYwogICAgIH0KIAogICAgIHByaXYtPmJ5dGVzUmVhZCAr PSBieXRlc1JlYWQ7Ci0gICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhpbnB1dFN0cmVhbSwg cHJpdi0+cmVhZEJ1ZmZlciwgZ1JlYWRCdWZmZXJTaXplLCBHX1BSSU9SSVRZX0RFRkFVTFQsIHBy aXYtPmNhbmNlbGxhYmxlLmdldCgpLAorICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMoaW5w dXRTdHJlYW0sIHByaXYtPnJlYWRCdWZmZXIsIGdSZWFkQnVmZmVyU2l6ZSwgUnVuTG9vcFNvdXJj ZVByaW9yaXR5OjpBc3luY0lPTmV0d29yaywgcHJpdi0+Y2FuY2VsbGFibGUuZ2V0KCksCiAgICAg ICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4od2Via2l0VVJJU2NoZW1l UmVxdWVzdFJlYWRDYWxsYmFjayksIGdfb2JqZWN0X3JlZihyZXF1ZXN0LmdldCgpKSk7CiB9CiAK QEAgLTIzMiw3ICsyMzMsNyBAQCB2b2lkIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNo KFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqIHJlcXVlc3QsIEdJbnB1dFN0cgogICAgIHJlcXVlc3Qt PnByaXYtPmNhbmNlbGxhYmxlID0gYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOwogICAg IHJlcXVlc3QtPnByaXYtPmJ5dGVzUmVhZCA9IDA7CiAgICAgcmVxdWVzdC0+cHJpdi0+bWltZVR5 cGUgPSBtaW1lVHlwZTsKLSAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGlucHV0U3RyZWFt LCByZXF1ZXN0LT5wcml2LT5yZWFkQnVmZmVyLCBnUmVhZEJ1ZmZlclNpemUsIEdfUFJJT1JJVFlf REVGQVVMVCwgcmVxdWVzdC0+cHJpdi0+Y2FuY2VsbGFibGUuZ2V0KCksCisgICAgZ19pbnB1dF9z dHJlYW1fcmVhZF9hc3luYyhpbnB1dFN0cmVhbSwgcmVxdWVzdC0+cHJpdi0+cmVhZEJ1ZmZlciwg Z1JlYWRCdWZmZXJTaXplLCBSdW5Mb29wU291cmNlUHJpb3JpdHk6OkFzeW5jSU9OZXR3b3JrLCBy ZXF1ZXN0LT5wcml2LT5jYW5jZWxsYWJsZS5nZXQoKSwKICAgICAgICAgcmVpbnRlcnByZXRfY2Fz dDxHQXN5bmNSZWFkeUNhbGxiYWNrPih3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNr KSwgZ19vYmplY3RfcmVmKHJlcXVlc3QpKTsKIH0KIAo=