164780 2016-11-15 11:04:54 -0800 CounterNode::insertAfter and ::removeChild should take references. 2016-11-15 12:12:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1251484 0 zalan 2016-11-15 11:04:54 -0800 instead of pointers and assert on them. 1251487 1 294854 zalan 2016-11-15 11:06:28 -0800 Created attachment 294854 Patch 1251550 2 294854 commit-queue 2016-11-15 12:12:31 -0800 Comment on attachment 294854 Patch Clearing flags on attachment: 294854 Committed r208744: <http://trac.webkit.org/changeset/208744> 1251551 3 commit-queue 2016-11-15 12:12:34 -0800 All reviewed patches have been landed. Closing bug. 294854 2016-11-15 11:06:28 -0800 2016-11-15 12:12:31 -0800 Patch bug-164780-20161115110627.patch text/plain 10587 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU1YjE1M2RjNmEzNmVk ODM5OWNjMTUzOGRmZGY2YjlmOTdkMDMwMi4uN2NjNmVhMzI5ZjVhNWU1ZTI3OGI5YzliNGZmYjMx ODlmNzllMjNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE2LTExLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ291bnRlck5vZGU6Omluc2Vy dEFmdGVyIGFuZCA6OnJlbW92ZUNoaWxkIHNob3VsZCB0YWtlIHJlZmVyZW5jZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ3ODAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVu Y3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9Db3VudGVyTm9kZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb3VudGVyTm9kZTo6aW5zZXJ0QWZ0ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6Q291bnRlck5vZGU6OnJlbW92ZUNoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvQ291bnRl ck5vZGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQ291bnRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjptYWtlQ291bnRlck5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6ZGVzdHJveUNv dW50ZXJOb2RlV2l0aG91dE1hcFJlbW92YWwpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlQ291 bnRlcnMpOgorCisyMDE2LTExLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisK ICAgICAgICAgW011bHRpQ29sXSBSZW5kZXIgdHJlZSBzaG91bGQgYmUgYWxsIGNsZWFuIGJ5IHRo ZSBlbmQgb2YgRnJhbWVWaWV3OjpsYXlvdXQoKS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjgzMwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Nv dW50ZXJOb2RlLmNwcAppbmRleCAxN2FkYjUwZTQwZTc4ZjljMTE4M2NhMmZmOWEwOWZiMjdiMzg1 YWM1Li44YWE0OGJkNjlkODdkNWQ3ZjE5ZTBlMTRiZjVkN2I3MWU5OWRlZTRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5jcHAKQEAgLTIxMSw0NyArMjExLDQ2IEBAIHZv aWQgQ291bnRlck5vZGU6OnJlY291bnQoKQogICAgIH0KIH0KIAotdm9pZCBDb3VudGVyTm9kZTo6 aW5zZXJ0QWZ0ZXIoQ291bnRlck5vZGUqIG5ld0NoaWxkLCBDb3VudGVyTm9kZSogcmVmQ2hpbGQs IGNvbnN0IEF0b21pY1N0cmluZyYgaWRlbnRpZmllcikKK3ZvaWQgQ291bnRlck5vZGU6Omluc2Vy dEFmdGVyKENvdW50ZXJOb2RlJiBuZXdDaGlsZCwgQ291bnRlck5vZGUqIGJlZm9yZUNoaWxkLCBj b25zdCBBdG9taWNTdHJpbmcmIGlkZW50aWZpZXIpCiB7Ci0gICAgQVNTRVJUKG5ld0NoaWxkKTsK LSAgICBBU1NFUlQoIW5ld0NoaWxkLT5tX3BhcmVudCk7Ci0gICAgQVNTRVJUKCFuZXdDaGlsZC0+ bV9wcmV2aW91c1NpYmxpbmcpOwotICAgIEFTU0VSVCghbmV3Q2hpbGQtPm1fbmV4dFNpYmxpbmcp OwotICAgIC8vIElmIHRoZSByZWZDaGlsZCBpcyBub3Qgb3VyIGNoaWxkIHdlIGNhbiBub3QgY29t cGxldGUgdGhlIHJlcXVlc3QuIFRoaXMgaGFyZGVucyBhZ2FpbnN0IGJ1Z3MgaW4gUmVuZGVyQ291 bnRlci4KKyAgICBBU1NFUlQoIW5ld0NoaWxkLm1fcGFyZW50KTsKKyAgICBBU1NFUlQoIW5ld0No aWxkLm1fcHJldmlvdXNTaWJsaW5nKTsKKyAgICBBU1NFUlQoIW5ld0NoaWxkLm1fbmV4dFNpYmxp bmcpOworICAgIC8vIElmIHRoZSBiZWZvcmVDaGlsZCBpcyBub3Qgb3VyIGNoaWxkIHdlIGNhbiBu b3QgY29tcGxldGUgdGhlIHJlcXVlc3QuIFRoaXMgaGFyZGVucyBhZ2FpbnN0IGJ1Z3MgaW4gUmVu ZGVyQ291bnRlci4KICAgICAvLyBXaGVuIHJlbmRlcmVycyBhcmUgcmVwYXJlbnRlZCBpdCBtYXkg cmVxdWVzdCB0aGF0IHdlIGluc2VydCBjb3VudGVyIG5vZGVzIGltcHJvcGVybHkuCi0gICAgaWYg KHJlZkNoaWxkICYmIHJlZkNoaWxkLT5tX3BhcmVudCAhPSB0aGlzKQorICAgIGlmIChiZWZvcmVD aGlsZCAmJiBiZWZvcmVDaGlsZC0+bV9wYXJlbnQgIT0gdGhpcykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgaWYgKG5ld0NoaWxkLT5tX2hhc1Jlc2V0VHlwZSkgewotICAgICAgICB3aGlsZSAobV9s YXN0Q2hpbGQgIT0gcmVmQ2hpbGQpCisgICAgaWYgKG5ld0NoaWxkLm1faGFzUmVzZXRUeXBlKSB7 CisgICAgICAgIHdoaWxlIChtX2xhc3RDaGlsZCAhPSBiZWZvcmVDaGlsZCkKICAgICAgICAgICAg IFJlbmRlckNvdW50ZXI6OmRlc3Ryb3lDb3VudGVyTm9kZShtX2xhc3RDaGlsZC0+b3duZXIoKSwg aWRlbnRpZmllcik7CiAgICAgfQogCiAgICAgQ291bnRlck5vZGUqIG5leHQ7CiAKLSAgICBpZiAo cmVmQ2hpbGQpIHsKLSAgICAgICAgbmV4dCA9IHJlZkNoaWxkLT5tX25leHRTaWJsaW5nOwotICAg ICAgICByZWZDaGlsZC0+bV9uZXh0U2libGluZyA9IG5ld0NoaWxkOworICAgIGlmIChiZWZvcmVD aGlsZCkgeworICAgICAgICBuZXh0ID0gYmVmb3JlQ2hpbGQtPm1fbmV4dFNpYmxpbmc7CisgICAg ICAgIGJlZm9yZUNoaWxkLT5tX25leHRTaWJsaW5nID0gJm5ld0NoaWxkOwogICAgIH0gZWxzZSB7 CiAgICAgICAgIG5leHQgPSBtX2ZpcnN0Q2hpbGQ7Ci0gICAgICAgIG1fZmlyc3RDaGlsZCA9IG5l d0NoaWxkOworICAgICAgICBtX2ZpcnN0Q2hpbGQgPSAmbmV3Q2hpbGQ7CiAgICAgfQogCi0gICAg bmV3Q2hpbGQtPm1fcGFyZW50ID0gdGhpczsKLSAgICBuZXdDaGlsZC0+bV9wcmV2aW91c1NpYmxp bmcgPSByZWZDaGlsZDsKKyAgICBuZXdDaGlsZC5tX3BhcmVudCA9IHRoaXM7CisgICAgbmV3Q2hp bGQubV9wcmV2aW91c1NpYmxpbmcgPSBiZWZvcmVDaGlsZDsKIAogICAgIGlmIChuZXh0KSB7Ci0g ICAgICAgIEFTU0VSVChuZXh0LT5tX3ByZXZpb3VzU2libGluZyA9PSByZWZDaGlsZCk7Ci0gICAg ICAgIG5leHQtPm1fcHJldmlvdXNTaWJsaW5nID0gbmV3Q2hpbGQ7Ci0gICAgICAgIG5ld0NoaWxk LT5tX25leHRTaWJsaW5nID0gbmV4dDsKKyAgICAgICAgQVNTRVJUKG5leHQtPm1fcHJldmlvdXNT aWJsaW5nID09IGJlZm9yZUNoaWxkKTsKKyAgICAgICAgbmV4dC0+bV9wcmV2aW91c1NpYmxpbmcg PSAmbmV3Q2hpbGQ7CisgICAgICAgIG5ld0NoaWxkLm1fbmV4dFNpYmxpbmcgPSBuZXh0OwogICAg IH0gZWxzZSB7Ci0gICAgICAgIEFTU0VSVChtX2xhc3RDaGlsZCA9PSByZWZDaGlsZCk7Ci0gICAg ICAgIG1fbGFzdENoaWxkID0gbmV3Q2hpbGQ7CisgICAgICAgIEFTU0VSVChtX2xhc3RDaGlsZCA9 PSBiZWZvcmVDaGlsZCk7CisgICAgICAgIG1fbGFzdENoaWxkID0gJm5ld0NoaWxkOwogICAgIH0K IAotICAgIGlmICghbmV3Q2hpbGQtPm1fZmlyc3RDaGlsZCB8fCBuZXdDaGlsZC0+bV9oYXNSZXNl dFR5cGUpIHsKLSAgICAgICAgbmV3Q2hpbGQtPm1fY291bnRJblBhcmVudCA9IG5ld0NoaWxkLT5j b21wdXRlQ291bnRJblBhcmVudCgpOwotICAgICAgICBuZXdDaGlsZC0+cmVzZXRUaGlzQW5kRGVz Y2VuZGFudHNSZW5kZXJlcnMoKTsKKyAgICBpZiAoIW5ld0NoaWxkLm1fZmlyc3RDaGlsZCB8fCBu ZXdDaGlsZC5tX2hhc1Jlc2V0VHlwZSkgeworICAgICAgICBuZXdDaGlsZC5tX2NvdW50SW5QYXJl bnQgPSBuZXdDaGlsZC5jb21wdXRlQ291bnRJblBhcmVudCgpOworICAgICAgICBuZXdDaGlsZC5y ZXNldFRoaXNBbmREZXNjZW5kYW50c1JlbmRlcmVycygpOwogICAgICAgICBpZiAobmV4dCkKICAg ICAgICAgICAgIG5leHQtPnJlY291bnQoKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjU5LDE2ICsy NTgsMTYgQEAgdm9pZCBDb3VudGVyTm9kZTo6aW5zZXJ0QWZ0ZXIoQ291bnRlck5vZGUqIG5ld0No aWxkLCBDb3VudGVyTm9kZSogcmVmQ2hpbGQsIGNvbnMKIAogICAgIC8vIFRoZSBjb2RlIGJlbG93 IGhhbmRsZXMgdGhlIGNhc2Ugd2hlbiBhIGZvcm1lcmx5IHJvb3QgaW5jcmVtZW50IGNvdW50ZXIg aXMgbG9vc2luZyBpdHMgcm9vdCBwb3NpdGlvbgogICAgIC8vIGFuZCB0aGVyZWZvcmUgaXRzIGNo aWxkcmVuIGJlY29tZSBuZXh0IHNpYmxpbmdzLgotICAgIENvdW50ZXJOb2RlKiBsYXN0ID0gbmV3 Q2hpbGQtPm1fbGFzdENoaWxkOwotICAgIENvdW50ZXJOb2RlKiBmaXJzdCA9IG5ld0NoaWxkLT5t X2ZpcnN0Q2hpbGQ7CisgICAgQ291bnRlck5vZGUqIGxhc3QgPSBuZXdDaGlsZC5tX2xhc3RDaGls ZDsKKyAgICBDb3VudGVyTm9kZSogZmlyc3QgPSBuZXdDaGlsZC5tX2ZpcnN0Q2hpbGQ7CiAKICAg ICBpZiAoZmlyc3QpIHsKICAgICAgICAgQVNTRVJUKGxhc3QpOwotICAgICAgICBuZXdDaGlsZC0+ bV9uZXh0U2libGluZyA9IGZpcnN0OwotICAgICAgICBpZiAobV9sYXN0Q2hpbGQgPT0gbmV3Q2hp bGQpCisgICAgICAgIG5ld0NoaWxkLm1fbmV4dFNpYmxpbmcgPSBmaXJzdDsKKyAgICAgICAgaWYg KG1fbGFzdENoaWxkID09ICZuZXdDaGlsZCkKICAgICAgICAgICAgIG1fbGFzdENoaWxkID0gbGFz dDsKIAotICAgICAgICBmaXJzdC0+bV9wcmV2aW91c1NpYmxpbmcgPSBuZXdDaGlsZDsKKyAgICAg ICAgZmlyc3QtPm1fcHJldmlvdXNTaWJsaW5nID0gJm5ld0NoaWxkOwogICAgIAogICAgICAgICAv LyBUaGUgY2FzZSB3aGVuIHRoZSBvcmlnaW5hbCBuZXh0IHNpYmxpbmcgb2YgdGhlIGluc2VydGVk IG5vZGUgYmVjb21lcyBhIGNoaWxkIG9mCiAgICAgICAgIC8vIG9uZSBvZiB0aGUgZm9ybWVyIGNo aWxkcmVuIG9mIHRoZSBpbnNlcnRlZCBub2RlIGlzIG5vdCBoYW5kbGVkIGFzIGl0IGlzIGJlbGll dmVkCkBAIC0yODEsNyArMjgwLDcgQEAgdm9pZCBDb3VudGVyTm9kZTo6aW5zZXJ0QWZ0ZXIoQ291 bnRlck5vZGUqIG5ld0NoaWxkLCBDb3VudGVyTm9kZSogcmVmQ2hpbGQsIGNvbnMKICAgICAgICAg Ly8gICAgYXR0YWNoZWQgdG8gcmVuZGVyZXJzIHRoYXQgd2VyZSBhbHJlYWR5IGluIHRoZSBkb2N1 bWVudCdzIHJlbmRlciB0cmVlLgogICAgICAgICBsYXN0LT5tX25leHRTaWJsaW5nID0gbmV4dDsK ICAgICAgICAgaWYgKG5leHQpIHsKLSAgICAgICAgICAgIEFTU0VSVChuZXh0LT5tX3ByZXZpb3Vz U2libGluZyA9PSBuZXdDaGlsZCk7CisgICAgICAgICAgICBBU1NFUlQobmV4dC0+bV9wcmV2aW91 c1NpYmxpbmcgPT0gJm5ld0NoaWxkKTsKICAgICAgICAgICAgIG5leHQtPm1fcHJldmlvdXNTaWJs aW5nID0gbGFzdDsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBtX2xhc3RDaGlsZCA9IGxh c3Q7CkBAIC0yOTEsMzcgKzI5MCwzNiBAQCB2b2lkIENvdW50ZXJOb2RlOjppbnNlcnRBZnRlcihD b3VudGVyTm9kZSogbmV3Q2hpbGQsIENvdW50ZXJOb2RlKiByZWZDaGlsZCwgY29ucwogICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQotICAgIG5ld0NoaWxkLT5tX2ZpcnN0 Q2hpbGQgPSBudWxscHRyOwotICAgIG5ld0NoaWxkLT5tX2xhc3RDaGlsZCA9IG51bGxwdHI7Ci0g ICAgbmV3Q2hpbGQtPm1fY291bnRJblBhcmVudCA9IG5ld0NoaWxkLT5jb21wdXRlQ291bnRJblBh cmVudCgpOwotICAgIG5ld0NoaWxkLT5yZXNldFJlbmRlcmVycygpOworICAgIG5ld0NoaWxkLm1f Zmlyc3RDaGlsZCA9IG51bGxwdHI7CisgICAgbmV3Q2hpbGQubV9sYXN0Q2hpbGQgPSBudWxscHRy OworICAgIG5ld0NoaWxkLm1fY291bnRJblBhcmVudCA9IG5ld0NoaWxkLmNvbXB1dGVDb3VudElu UGFyZW50KCk7CisgICAgbmV3Q2hpbGQucmVzZXRSZW5kZXJlcnMoKTsKICAgICBmaXJzdC0+cmVj b3VudCgpOwogfQogCi12b2lkIENvdW50ZXJOb2RlOjpyZW1vdmVDaGlsZChDb3VudGVyTm9kZSog b2xkQ2hpbGQpCit2b2lkIENvdW50ZXJOb2RlOjpyZW1vdmVDaGlsZChDb3VudGVyTm9kZSYgb2xk Q2hpbGQpCiB7Ci0gICAgQVNTRVJUKG9sZENoaWxkKTsKLSAgICBBU1NFUlQoIW9sZENoaWxkLT5t X2ZpcnN0Q2hpbGQpOwotICAgIEFTU0VSVCghb2xkQ2hpbGQtPm1fbGFzdENoaWxkKTsKKyAgICBB U1NFUlQoIW9sZENoaWxkLm1fZmlyc3RDaGlsZCk7CisgICAgQVNTRVJUKCFvbGRDaGlsZC5tX2xh c3RDaGlsZCk7CiAKLSAgICBDb3VudGVyTm9kZSogbmV4dCA9IG9sZENoaWxkLT5tX25leHRTaWJs aW5nOwotICAgIENvdW50ZXJOb2RlKiBwcmV2aW91cyA9IG9sZENoaWxkLT5tX3ByZXZpb3VzU2li bGluZzsKKyAgICBDb3VudGVyTm9kZSogbmV4dCA9IG9sZENoaWxkLm1fbmV4dFNpYmxpbmc7Cisg ICAgQ291bnRlck5vZGUqIHByZXZpb3VzID0gb2xkQ2hpbGQubV9wcmV2aW91c1NpYmxpbmc7CiAK LSAgICBvbGRDaGlsZC0+bV9uZXh0U2libGluZyA9IG51bGxwdHI7Ci0gICAgb2xkQ2hpbGQtPm1f cHJldmlvdXNTaWJsaW5nID0gbnVsbHB0cjsKLSAgICBvbGRDaGlsZC0+bV9wYXJlbnQgPSBudWxs cHRyOworICAgIG9sZENoaWxkLm1fbmV4dFNpYmxpbmcgPSBudWxscHRyOworICAgIG9sZENoaWxk Lm1fcHJldmlvdXNTaWJsaW5nID0gbnVsbHB0cjsKKyAgICBvbGRDaGlsZC5tX3BhcmVudCA9IG51 bGxwdHI7CiAKICAgICBpZiAocHJldmlvdXMpIAogICAgICAgICBwcmV2aW91cy0+bV9uZXh0U2li bGluZyA9IG5leHQ7CiAgICAgZWxzZSB7Ci0gICAgICAgIEFTU0VSVChtX2ZpcnN0Q2hpbGQgPT0g b2xkQ2hpbGQpOworICAgICAgICBBU1NFUlQobV9maXJzdENoaWxkID09ICZvbGRDaGlsZCk7CiAg ICAgICAgIG1fZmlyc3RDaGlsZCA9IG5leHQ7CiAgICAgfQogCiAgICAgaWYgKG5leHQpCiAgICAg ICAgIG5leHQtPm1fcHJldmlvdXNTaWJsaW5nID0gcHJldmlvdXM7CiAgICAgZWxzZSB7Ci0gICAg ICAgIEFTU0VSVChtX2xhc3RDaGlsZCA9PSBvbGRDaGlsZCk7CisgICAgICAgIEFTU0VSVChtX2xh c3RDaGlsZCA9PSAmb2xkQ2hpbGQpOwogICAgICAgICBtX2xhc3RDaGlsZCA9IHByZXZpb3VzOwog ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2Rl LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuaAppbmRleCBkOTJlZTll ZTg0ODQyYjk1NTE5MzAzODRhMjljNjk4OWViNzIxMDg3Li5mNzNmNzc5Y2RkYmE4YjQzMTc0NTI5 YTdkOGIwNmZmNTgwMDhhMWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv Q291bnRlck5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUu aApAQCAtNjQsMTAgKzY0LDkgQEAgcHVibGljOgogICAgIENvdW50ZXJOb2RlKiBuZXh0SW5QcmVP cmRlcihjb25zdCBDb3VudGVyTm9kZSogc3RheVdpdGhpbiA9IG51bGxwdHIpIGNvbnN0OwogICAg IENvdW50ZXJOb2RlKiBuZXh0SW5QcmVPcmRlckFmdGVyQ2hpbGRyZW4oY29uc3QgQ291bnRlck5v ZGUqIHN0YXlXaXRoaW4gPSBudWxscHRyKSBjb25zdDsKIAotICAgIHZvaWQgaW5zZXJ0QWZ0ZXIo Q291bnRlck5vZGUqIG5ld0NoaWxkLCBDb3VudGVyTm9kZSogYmVmb3JlQ2hpbGQsIGNvbnN0IEF0 b21pY1N0cmluZyYgaWRlbnRpZmllcik7Ci0KKyAgICB2b2lkIGluc2VydEFmdGVyKENvdW50ZXJO b2RlJiBuZXdDaGlsZCwgQ291bnRlck5vZGUqIGJlZm9yZUNoaWxkLCBjb25zdCBBdG9taWNTdHJp bmcmIGlkZW50aWZpZXIpOwogICAgIC8vIGlkZW50aWZpZXIgbXVzdCBtYXRjaCB0aGUgaWRlbnRp ZmllciBvZiB0aGlzIGNvdW50ZXIuCi0gICAgdm9pZCByZW1vdmVDaGlsZChDb3VudGVyTm9kZSop OworICAgIHZvaWQgcmVtb3ZlQ2hpbGQoQ291bnRlck5vZGUmKTsKIAogcHJpdmF0ZToKICAgICBD b3VudGVyTm9kZShSZW5kZXJFbGVtZW50JiwgYm9vbCBpc1Jlc2V0LCBpbnQgdmFsdWUpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCmluZGV4IGNhNTZlN2JjNTEy NTA5MmU3ZWEwN2IzOTUyZGM2ZDc3ZDgxZTU0MjYuLjRmYzA2M2MxYmI2YjQ4N2MxMDYwN2M0Y2M3 NjIzOTdmMDIyZjgzM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJDb3VudGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQ291bnRl ci5jcHAKQEAgLTMwOCw3ICszMDgsNyBAQCBzdGF0aWMgQ291bnRlck5vZGUqIG1ha2VDb3VudGVy Tm9kZShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgQXRvbWljU3RyaW5nJgogICAgIFJl ZlB0cjxDb3VudGVyTm9kZT4gbmV3UHJldmlvdXNTaWJsaW5nOwogICAgIFJlZlB0cjxDb3VudGVy Tm9kZT4gbmV3Tm9kZSA9IENvdW50ZXJOb2RlOjpjcmVhdGUocmVuZGVyZXIsIGlzUmVzZXQsIHZh bHVlKTsKICAgICBpZiAoZmluZFBsYWNlRm9yQ291bnRlcihyZW5kZXJlciwgaWRlbnRpZmllciwg aXNSZXNldCwgbmV3UGFyZW50LCBuZXdQcmV2aW91c1NpYmxpbmcpKQotICAgICAgICBuZXdQYXJl bnQtPmluc2VydEFmdGVyKG5ld05vZGUuZ2V0KCksIG5ld1ByZXZpb3VzU2libGluZy5nZXQoKSwg aWRlbnRpZmllcik7CisgICAgICAgIG5ld1BhcmVudC0+aW5zZXJ0QWZ0ZXIoKm5ld05vZGUsIG5l d1ByZXZpb3VzU2libGluZy5nZXQoKSwgaWRlbnRpZmllcik7CiAgICAgQ291bnRlck1hcCogbm9k ZU1hcDsKICAgICBpZiAocmVuZGVyZXIuaGFzQ291bnRlck5vZGVNYXAoKSkKICAgICAgICAgbm9k ZU1hcCA9IGNvdW50ZXJNYXBzKCkuZ2V0KCZyZW5kZXJlcik7CkBAIC0zMzcsNyArMzM3LDcgQEAg c3RhdGljIENvdW50ZXJOb2RlKiBtYWtlQ291bnRlck5vZGUoUmVuZGVyRWxlbWVudCYgcmVuZGVy ZXIsIGNvbnN0IEF0b21pY1N0cmluZyYKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBp ZiAoc3RheVdpdGhpbiA9PSBwYXJlbnRPclBzZXVkb0hvc3RFbGVtZW50KCpjdXJyZW50UmVuZGVy ZXIpICYmIGN1cnJlbnRDb3VudGVyLT5oYXNSZXNldFR5cGUoKSkKICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICBuZXdOb2RlLT5pbnNlcnRBZnRlcihjdXJyZW50Q291bnRlciwgbmV3Tm9kZS0+ bGFzdENoaWxkKCksIGlkZW50aWZpZXIpOworICAgICAgICBuZXdOb2RlLT5pbnNlcnRBZnRlcigq Y3VycmVudENvdW50ZXIsIG5ld05vZGUtPmxhc3RDaGlsZCgpLCBpZGVudGlmaWVyKTsKICAgICB9 CiAgICAgcmV0dXJuIG5ld05vZGUuZ2V0KCk7CiB9CkBAIC00MzAsMTIgKzQzMCwxMiBAQCBzdGF0 aWMgdm9pZCBkZXN0cm95Q291bnRlck5vZGVXaXRob3V0TWFwUmVtb3ZhbChjb25zdCBBdG9taWNT dHJpbmcmIGlkZW50aWZpZXIsCiAgICAgQ291bnRlck5vZGUqIHByZXZpb3VzOwogICAgIGZvciAo UmVmUHRyPENvdW50ZXJOb2RlPiBjaGlsZCA9IG5vZGUtPmxhc3REZXNjZW5kYW50KCk7IGNoaWxk ICYmIGNoaWxkICE9IG5vZGU7IGNoaWxkID0gcHJldmlvdXMpIHsKICAgICAgICAgcHJldmlvdXMg PSBjaGlsZC0+cHJldmlvdXNJblByZU9yZGVyKCk7Ci0gICAgICAgIGNoaWxkLT5wYXJlbnQoKS0+ cmVtb3ZlQ2hpbGQoY2hpbGQuZ2V0KCkpOworICAgICAgICBjaGlsZC0+cGFyZW50KCktPnJlbW92 ZUNoaWxkKCpjaGlsZCk7CiAgICAgICAgIEFTU0VSVChjb3VudGVyTWFwcygpLmdldCgmY2hpbGQt Pm93bmVyKCkpLT5nZXQoaWRlbnRpZmllcikgPT0gY2hpbGQpOwogICAgICAgICBjb3VudGVyTWFw cygpLmdldCgmY2hpbGQtPm93bmVyKCkpLT5yZW1vdmUoaWRlbnRpZmllcik7CiAgICAgfQogICAg IGlmIChDb3VudGVyTm9kZSogcGFyZW50ID0gbm9kZS0+cGFyZW50KCkpCi0gICAgICAgIHBhcmVu dC0+cmVtb3ZlQ2hpbGQobm9kZSk7CisgICAgICAgIHBhcmVudC0+cmVtb3ZlQ2hpbGQoKm5vZGUp OwogfQogCiB2b2lkIFJlbmRlckNvdW50ZXI6OmRlc3Ryb3lDb3VudGVyTm9kZXMoUmVuZGVyRWxl bWVudCYgb3duZXIpCkBAIC01MjEsOSArNTIxLDkgQEAgc3RhdGljIHZvaWQgdXBkYXRlQ291bnRl cnMoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCiAgICAgICAgIGlmIChuZXdQYXJlbnQgPT0gcGFy ZW50ICYmIG5ld1ByZXZpb3VzU2libGluZyA9PSBub2RlLT5wcmV2aW91c1NpYmxpbmcoKSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAocGFyZW50KQotICAgICAgICAgICAgcGFy ZW50LT5yZW1vdmVDaGlsZChub2RlLmdldCgpKTsKKyAgICAgICAgICAgIHBhcmVudC0+cmVtb3Zl Q2hpbGQoKm5vZGUpOwogICAgICAgICBpZiAobmV3UGFyZW50KQotICAgICAgICAgICAgbmV3UGFy ZW50LT5pbnNlcnRBZnRlcihub2RlLmdldCgpLCBuZXdQcmV2aW91c1NpYmxpbmcuZ2V0KCksIGl0 LT5rZXkpOworICAgICAgICAgICAgbmV3UGFyZW50LT5pbnNlcnRBZnRlcigqbm9kZSwgbmV3UHJl dmlvdXNTaWJsaW5nLmdldCgpLCBpdC0+a2V5KTsKICAgICB9CiB9CiAK