161362 2016-08-29 16:57:03 -0700 Stop using m_client to indicate whether an IPC::Connection is valid 2016-08-30 09:37:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1224441 0 andersca 2016-08-29 16:57:03 -0700 Stop using m_client to indicate whether an IPC::Connection is valid 1224443 1 287351 andersca 2016-08-29 16:58:03 -0700 Created attachment 287351 Patch 1224586 2 andersca 2016-08-30 09:37:40 -0700 Committed r205183: <http://trac.webkit.org/changeset/205183> 287351 2016-08-29 16:58:03 -0700 2016-08-30 05:58:33 -0700 Patch bug-161362-20160829165554.patch text/plain 9734 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGVmZGNlZjU0NWVkYjZi NDA2YzkxNGZhNTRhZjMxMWE3YTJlYzQ4OS4uYjE0NGQ2M2IwNjlkYWNkMmFkOWIxOTY2MjkyMDNh MDkwMzc5OWU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE2LTA4LTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcCB1c2luZyBt X2NsaWVudCB0byBpbmRpY2F0ZSB3aGV0aGVyIGFuIElQQzo6Q29ubmVjdGlvbiBpcyB2YWxpZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxMzYyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCwg YWRkIGFuIHN0ZDo6YXRvbWljPGJvb2w+IHNvIHdlIGNhbiByZWxpYWJseSBjaGVjayB0aGUgc3Rh dGUgZnJvbSBvdGhlciB0aHJlYWRzLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL0Nvbm5lY3Rp b24uY3BwOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpDb25uZWN0aW9uKToKKyAgICAgICAg KElQQzo6Q29ubmVjdGlvbjo6aW52YWxpZGF0ZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246 OmNvbm5lY3Rpb25EaWRDbG9zZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OmRpc3BhdGNo U3luY01lc3NhZ2UpOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpkaXNwYXRjaERpZFJlY2Vp dmVJbnZhbGlkTWVzc2FnZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OmRpc3BhdGNoTWVz c2FnZSk6CisgICAgICAgICogUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaDoKKyAgICAgICAgKElQ Qzo6Q29ubmVjdGlvbjo6Y2xpZW50KToKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6aXNWYWxp ZCk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OndhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0 ZWx5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6c3RhcnRVcGRh dGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5OjpzdG9w VXBkYXRpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6 c2V0RW5hYmxlSGlnaEFjY3VyYWN5KToKKworMjAxNi0wOC0yOSAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEdldCByaWQgb2YgQ2hpbGRQcm9jZXNzUHJv eHk6OmZyb21Db25uZWN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjEzNTcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v SVBDL0Nvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rp b24uY3BwCmluZGV4IGIzNjExYzJjOWZkY2U5MzBjZTZmYWRmNTMwZmFlNTI4ZGViNDFkN2EuLjZk MjMzMzg1NzI3NjA4ZGJlMThiM2JmYzM3YWRhOTc0ZWZiYWQ2MDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5jcHAKQEAgLTIxNCw3ICsyMTQsNyBAQCBSZWY8Q29u bmVjdGlvbj4gQ29ubmVjdGlvbjo6Y3JlYXRlQ2xpZW50Q29ubmVjdGlvbihJZGVudGlmaWVyIGlk ZW50aWZpZXIsIENsaWVudAogfQogCiBDb25uZWN0aW9uOjpDb25uZWN0aW9uKElkZW50aWZpZXIg aWRlbnRpZmllciwgYm9vbCBpc1NlcnZlciwgQ2xpZW50JiBjbGllbnQpCi0gICAgOiBtX2NsaWVu dCgmY2xpZW50KQorICAgIDogbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9pc1NlcnZlcihpc1Nl cnZlcikKICAgICAsIG1fc3luY1JlcXVlc3RJRCgwKQogICAgICwgbV9vbmx5U2VuZE1lc3NhZ2Vz QXNEaXNwYXRjaFdoZW5XYWl0aW5nRm9yU3luY1JlcGx5V2hlblByb2Nlc3NpbmdTdWNoQU1lc3Nh Z2UoZmFsc2UpCkBAIC0zMTUsMTIgKzMxNSwxNCBAQCB2b2lkIENvbm5lY3Rpb246OnNldERpZENs b3NlT25Db25uZWN0aW9uV29ya1F1ZXVlQ2FsbGJhY2soRGlkQ2xvc2VPbkNvbm5lY3Rpb25Xbwog CiB2b2lkIENvbm5lY3Rpb246OmludmFsaWRhdGUoKQogeworICAgIEFTU0VSVChSdW5Mb29wOjpp c01haW4oKSk7CisKICAgICBpZiAoIWlzVmFsaWQoKSkgewogICAgICAgICAvLyBTb21lb25lIGFs cmVhZHkgY2FsbGVkIGludmFsaWRhdGUoKS4KICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAK LSAgICBtX2NsaWVudCA9IG51bGxwdHI7CisgICAgbV9pc1ZhbGlkID0gZmFsc2U7CiAKICAgICBt X2Nvbm5lY3Rpb25RdWV1ZS0+ZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KV0oKSBtdXRhYmxlIHsKICAgICAgICAgcHJvdGVjdGVkVGhpcy0+cGxhdGZvcm1JbnZhbGlkYXRl KCk7CkBAIC03MjIsMTcgKzcyNCwxNSBAQCB2b2lkIENvbm5lY3Rpb246OmNvbm5lY3Rpb25EaWRD bG9zZSgpCiAKICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKV0oKSBtdXRhYmxlIHsKICAgICAgICAgLy8gSWYgdGhlIGNvbm5lY3Rpb24g aGFzIGJlZW4gZXhwbGljaXRseSBpbnZhbGlkYXRlZCBiZWZvcmUgZGlzcGF0Y2hDb25uZWN0aW9u RGlkQ2xvc2Ugd2FzIGNhbGxlZCwKLSAgICAgICAgLy8gdGhlbiB0aGUgY2xpZW50IHdpbGwgYmUg bnVsbCBoZXJlLgotICAgICAgICBpZiAoIXByb3RlY3RlZFRoaXMtPm1fY2xpZW50KQorICAgICAg ICAvLyB0aGVuIHRoZSB0aGUgY29ubmVjdGlvbiB3aWxsIGJlIGludmFsaWQgaGVyZS4KKyAgICAg ICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5pc1ZhbGlkKCkpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgLy8gQmVjYXVzZSB3ZSBkZWZpbmUgYSBjb25uZWN0aW9uIGFzIGJlaW5nICJ2YWxp ZCIgYmFzZWQgb24gd2hldGVyIGl0IGhhcyBhIG51bGwgY2xpZW50LCB3ZSBudWxsIG91dAotICAg ICAgICAvLyB0aGUgY2xpZW50IGJlZm9yZSBjYWxsaW5nIGRpZENsb3NlIGhlcmUuIE90aGVyd2lz ZSwgc2VuZFN5bmMgd2lsbCB0cnkgdG8gc2VuZCBhIG1lc3NhZ2UgdG8gdGhlIGNvbm5lY3Rpb24g YW5kCi0gICAgICAgIC8vIHdpbGwgdGhlbiB3YWl0IGluZGVmaW5pdGVseSBmb3IgYSByZXBseS4K LSAgICAgICAgQ2xpZW50KiBjbGllbnQgPSBwcm90ZWN0ZWRUaGlzLT5tX2NsaWVudDsKLSAgICAg ICAgcHJvdGVjdGVkVGhpcy0+bV9jbGllbnQgPSBudWxscHRyOworICAgICAgICAvLyBTZXQgbV9p c1ZhbGlkIHRvIGZhbHNlIGJlZm9yZSBjYWxsaW5nIGRpZENsb3NlLCBvdGhlcndpc2UsIHNlbmRT eW5jIHdpbGwgdHJ5IHRvIHNlbmQgYSBtZXNzYWdlCisgICAgICAgIC8vIHRvIHRoZSBjb25uZWN0 aW9uIGFuZCB3aWxsIHRoZW4gd2FpdCBpbmRlZmluaXRlbHkgZm9yIGEgcmVwbHkuCisgICAgICAg IHByb3RlY3RlZFRoaXMtPm1faXNWYWxpZCA9IGZhbHNlOwogCi0gICAgICAgIGNsaWVudC0+ZGlk Q2xvc2UocHJvdGVjdGVkVGhpcy5nZXQoKSk7CisgICAgICAgIHByb3RlY3RlZFRoaXMtPm1fY2xp ZW50LmRpZENsb3NlKHByb3RlY3RlZFRoaXMuZ2V0KCkpOwogICAgIH0pOwogfQogCkBAIC03ODYs NyArNzg2LDcgQEAgdm9pZCBDb25uZWN0aW9uOjpkaXNwYXRjaFN5bmNNZXNzYWdlKERlY29kZXIm IGRlY29kZXIpCiAgICAgICAgIFN5bmNNZXNzYWdlU3RhdGU6OnNpbmdsZXRvbigpLmRpc3BhdGNo TWVzc2FnZXMobnVsbHB0cik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gSGFuZCBvZmYgYm90 aCB0aGUgZGVjb2RlciBhbmQgZW5jb2RlciB0byB0aGUgY2xpZW50LgotICAgICAgICBtX2NsaWVu dC0+ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKCp0aGlzLCBkZWNvZGVyLCByZXBseUVuY29kZXIpOwor ICAgICAgICBtX2NsaWVudC5kaWRSZWNlaXZlU3luY01lc3NhZ2UoKnRoaXMsIGRlY29kZXIsIHJl cGx5RW5jb2Rlcik7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IElmIHRoZSBtZXNzYWdlIHdhcyBp bnZhbGlkLCB3ZSBzaG91bGQgc2VuZCBiYWNrIGEgU3luY01lc3NhZ2VFcnJvci4KQEAgLTgwMCwx MCArODAwLDEwIEBAIHZvaWQgQ29ubmVjdGlvbjo6ZGlzcGF0Y2hEaWRSZWNlaXZlSW52YWxpZE1l c3NhZ2UoY29uc3QgQ1N0cmluZyYgbWVzc2FnZVJlY2VpdmVyCiB7CiAgICAgQVNTRVJUKFJ1bkxv b3A6OmlzTWFpbigpKTsKIAotICAgIGlmICghbV9jbGllbnQpCisgICAgaWYgKCFpc1ZhbGlkKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlSW52YWxpZE1lc3Nh Z2UoKnRoaXMsIFN0cmluZ1JlZmVyZW5jZShtZXNzYWdlUmVjZWl2ZXJOYW1lU3RyaW5nLmRhdGEo KSwgbWVzc2FnZVJlY2VpdmVyTmFtZVN0cmluZy5sZW5ndGgoKSksIFN0cmluZ1JlZmVyZW5jZSht ZXNzYWdlTmFtZVN0cmluZy5kYXRhKCksIG1lc3NhZ2VOYW1lU3RyaW5nLmxlbmd0aCgpKSk7Cisg ICAgbV9jbGllbnQuZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKCp0aGlzLCBTdHJpbmdSZWZlcmVu Y2UobWVzc2FnZVJlY2VpdmVyTmFtZVN0cmluZy5kYXRhKCksIG1lc3NhZ2VSZWNlaXZlck5hbWVT dHJpbmcubGVuZ3RoKCkpLCBTdHJpbmdSZWZlcmVuY2UobWVzc2FnZU5hbWVTdHJpbmcuZGF0YSgp LCBtZXNzYWdlTmFtZVN0cmluZy5sZW5ndGgoKSkpOwogfQogCiB2b2lkIENvbm5lY3Rpb246OmRp ZEZhaWxUb1NlbmRTeW5jTWVzc2FnZSgpCkBAIC04MjgsMTcgKzgyOCwxNyBAQCB2b2lkIENvbm5l Y3Rpb246OmVucXVldWVJbmNvbWluZ01lc3NhZ2Uoc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IGlu Y29taW5nTWVzc2FnZQogCiB2b2lkIENvbm5lY3Rpb246OmRpc3BhdGNoTWVzc2FnZShEZWNvZGVy JiBkZWNvZGVyKQogewotICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlTWVzc2FnZSgqdGhpcywgZGVj b2Rlcik7CisgICAgbV9jbGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2UoKnRoaXMsIGRlY29kZXIpOwog fQogCiB2b2lkIENvbm5lY3Rpb246OmRpc3BhdGNoTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8RGVj b2Rlcj4gbWVzc2FnZSkKIHsKLSAgICBpZiAoIW1fY2xpZW50KQorICAgIGlmICghaXNWYWxpZCgp KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobWVzc2FnZS0+c2hvdWxkVXNlRnVsbHlTeW5j aHJvbm91c01vZGVGb3JUZXN0aW5nKCkpIHsKICAgICAgICAgaWYgKCFtX2Z1bGx5U3luY2hyb25v dXNNb2RlSXNBbGxvd2VkRm9yVGVzdGluZykgewotICAgICAgICAgICAgbV9jbGllbnQtPmRpZFJl Y2VpdmVJbnZhbGlkTWVzc2FnZSgqdGhpcywgbWVzc2FnZS0+bWVzc2FnZVJlY2VpdmVyTmFtZSgp LCBtZXNzYWdlLT5tZXNzYWdlTmFtZSgpKTsKKyAgICAgICAgICAgIG1fY2xpZW50LmRpZFJlY2Vp dmVJbnZhbGlkTWVzc2FnZSgqdGhpcywgbWVzc2FnZS0+bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt ZXNzYWdlLT5tZXNzYWdlTmFtZSgpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog ICAgICAgICBtX2luRGlzcGF0Y2hNZXNzYWdlTWFya2VkVG9Vc2VGdWxseVN5bmNocm9ub3VzTW9k ZUZvclRlc3RpbmcrKzsKQEAgLTg2OCw4ICs4NjgsOCBAQCB2b2lkIENvbm5lY3Rpb246OmRpc3Bh dGNoTWVzc2FnZShzdGQ6OnVuaXF1ZV9wdHI8RGVjb2Rlcj4gbWVzc2FnZSkKICAgICBpZiAobWVz c2FnZS0+c2hvdWxkVXNlRnVsbHlTeW5jaHJvbm91c01vZGVGb3JUZXN0aW5nKCkpCiAgICAgICAg IG1faW5EaXNwYXRjaE1lc3NhZ2VNYXJrZWRUb1VzZUZ1bGx5U3luY2hyb25vdXNNb2RlRm9yVGVz dGluZy0tOwogCi0gICAgaWYgKG1fZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlICYmIG1fY2xpZW50 KQotICAgICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKCp0aGlzLCBtZXNz YWdlLT5tZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1lc3NhZ2UtPm1lc3NhZ2VOYW1lKCkpOworICAg IGlmIChtX2RpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZSAmJiBpc1ZhbGlkKCkpCisgICAgICAgIG1f Y2xpZW50LmRpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZSgqdGhpcywgbWVzc2FnZS0+bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtZXNzYWdlLT5tZXNzYWdlTmFtZSgpKTsKIAogICAgIG1fZGlkUmVjZWl2 ZUludmFsaWRNZXNzYWdlID0gb2xkRGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaCBiL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKaW5kZXggNmYyYWViZWIzYjlkM2EzOWEx MDE4ZGVmYTBlODNmZTk4YjkzOTZlYS4uMjA3ZjkwNTgxNDIxY2RjMTVlYjFlYjk2OWMzNmYwNTMz ZjFkYTE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCkBAIC0x MzcsNyArMTM3LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8Q29ubmVjdGlvbj4gY3JlYXRl Q2xpZW50Q29ubmVjdGlvbihJZGVudGlmaWVyLCBDbGllbnQmKTsKICAgICB+Q29ubmVjdGlvbigp OwogCi0gICAgQ2xpZW50KiBjbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQorICAg IENsaWVudCYgY2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQ7IH0KIAogI2lmIFBMQVRG T1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8PSAxMDEwMDAKICAg ICB2b2lkIHNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMoKTsKQEAgLTE4 Niw3ICsxODYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB0ZXJtaW5hdGVTb29uKGRvdWJsZSBpbnRl cnZhbEluU2Vjb25kcyk7CiAjZW5kaWYKIAotICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0 dXJuIG1fY2xpZW50OyB9CisgICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9pc1Zh bGlkOyB9CiAKICNpZiBIQVZFKFFPU19DTEFTU0VTKQogICAgIHZvaWQgc2V0U2hvdWxkQm9vc3RN YWluVGhyZWFkT25TeW5jTWVzc2FnZShib29sIGIpIHsgbV9zaG91bGRCb29zdE1haW5UaHJlYWRP blN5bmNNZXNzYWdlID0gYjsgfQpAQCAtMjM3LDggKzIzNyw5IEBAIHByaXZhdGU6CiAKICAgICBz dGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzIHRpbWVvdXRSZXNwZWN0aW5nSWdub3JlVGltZW91dHNG b3JUZXN0aW5nKHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMpIGNvbnN0OwogICAgIAotICAgIENs aWVudCogbV9jbGllbnQ7CisgICAgQ2xpZW50JiBtX2NsaWVudDsKICAgICBib29sIG1faXNTZXJ2 ZXI7CisgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9pc1ZhbGlkIHsgdHJ1ZSB9OwogICAgIHN0ZDo6 YXRvbWljPHVpbnQ2NF90PiBtX3N5bmNSZXF1ZXN0SUQ7CiAKICAgICBib29sIG1fb25seVNlbmRN ZXNzYWdlc0FzRGlzcGF0Y2hXaGVuV2FpdGluZ0ZvclN5bmNSZXBseVdoZW5Qcm9jZXNzaW5nU3Vj aEFNZXNzYWdlOwpAQCAtMzY1LDcgKzM2Niw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wg Q29ubmVjdGlvbjo6d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHkodWludDY0X3QgZGVzCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEFTU0VSVChkZWNvZGVyLT5kZXN0aW5hdGlvbklE KCkgPT0gZGVzdGluYXRpb25JRCk7Ci0gICAgbV9jbGllbnQtPmRpZFJlY2VpdmVNZXNzYWdlKCp0 aGlzLCAqZGVjb2Rlcik7CisgICAgbV9jbGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2UoKnRoaXMsICpk ZWNvZGVyKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eS5jcHAKaW5kZXggNzQwYmU0 NjliOTczZDU1M2UzYTcwOGVjMzU5YzZmYjlhYThlYTZlOS4uN2UxOGFjNWRhMWEwOTg4N2U0ZWYy ZjBmMDExZDUzNzJlNDk4ODMyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3BwCkBAIC0xMDYsNyArMTA2LDcgQEAg dm9pZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6cmVzZXRQZXJtaXNzaW9ucygpCiB2b2lk IFdlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5OjpzdGFydFVwZGF0aW5nKElQQzo6Q29ubmVjdGlv biYgY29ubmVjdGlvbikKIHsKICAgICBib29sIHdhc1VwZGF0aW5nID0gaXNVcGRhdGluZygpOwot ICAgIG1fdXBkYXRlUmVxdWVzdGVycy5hZGQoY29ubmVjdGlvbi5jbGllbnQoKSk7CisgICAgbV91 cGRhdGVSZXF1ZXN0ZXJzLmFkZCgmY29ubmVjdGlvbi5jbGllbnQoKSk7CiAgICAgaWYgKCF3YXNV cGRhdGluZykgewogICAgICAgICBtX3Byb3ZpZGVyLnNldEVuYWJsZUhpZ2hBY2N1cmFjeSh0aGlz LCBpc0hpZ2hBY2N1cmFjeUVuYWJsZWQoKSk7CiAgICAgICAgIG1fcHJvdmlkZXIuc3RhcnRVcGRh dGluZyh0aGlzKTsKQEAgLTExNSw3ICsxMTUsNyBAQCB2b2lkIFdlYkdlb2xvY2F0aW9uTWFuYWdl clByb3h5OjpzdGFydFVwZGF0aW5nKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikKIAogdm9p ZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6c3RvcFVwZGF0aW5nKElQQzo6Q29ubmVjdGlv biYgY29ubmVjdGlvbikKIHsKLSAgICByZW1vdmVSZXF1ZXN0ZXIoY29ubmVjdGlvbi5jbGllbnQo KSk7CisgICAgcmVtb3ZlUmVxdWVzdGVyKCZjb25uZWN0aW9uLmNsaWVudCgpKTsKIH0KIAogdm9p ZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6cmVtb3ZlUmVxdWVzdGVyKGNvbnN0IElQQzo6 Q29ubmVjdGlvbjo6Q2xpZW50KiBjbGllbnQpCkBAIC0xNDAsOSArMTQwLDkgQEAgdm9pZCBXZWJH ZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6c2V0RW5hYmxlSGlnaEFjY3VyYWN5KElQQzo6Q29ubmVj dGlvbiYgY29ubmVjdGkKICAgICBib29sIGhpZ2hBY2N1cmFjeVdhc0VuYWJsZWQgPSBpc0hpZ2hB Y2N1cmFjeUVuYWJsZWQoKTsKIAogICAgIGlmIChlbmFibGVkKQotICAgICAgICBtX2hpZ2hBY2N1 cmFjeVJlcXVlc3RlcnMuYWRkKGNvbm5lY3Rpb24uY2xpZW50KCkpOworICAgICAgICBtX2hpZ2hB Y2N1cmFjeVJlcXVlc3RlcnMuYWRkKCZjb25uZWN0aW9uLmNsaWVudCgpKTsKICAgICBlbHNlCi0g ICAgICAgIG1faGlnaEFjY3VyYWN5UmVxdWVzdGVycy5yZW1vdmUoY29ubmVjdGlvbi5jbGllbnQo KSk7CisgICAgICAgIG1faGlnaEFjY3VyYWN5UmVxdWVzdGVycy5yZW1vdmUoJmNvbm5lY3Rpb24u Y2xpZW50KCkpOwogCiAgICAgYm9vbCBoaWdoQWNjdXJhY3lTaG91bGRCZUVuYWJsZWQgPSBpc0hp Z2hBY2N1cmFjeUVuYWJsZWQoKTsKICAgICBpZiAoaXNVcGRhdGluZygpICYmIGhpZ2hBY2N1cmFj eVdhc0VuYWJsZWQgIT0gaGlnaEFjY3VyYWN5U2hvdWxkQmVFbmFibGVkKQo=