51685 2010-12-28 12:46:54 -0800 [GTK] Clean up usage of NULL in webkitwebframe.cpp 2010-12-28 15:40:55 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 327310 0 mrobinson 2010-12-28 12:46:54 -0800 webkitwebframe.cpp uses NULL in quite a few places instead of 0. This bug tracks that minor cleanup. 327312 1 77571 mrobinson 2010-12-28 12:50:21 -0800 Created attachment 77571 Patch 327314 2 77572 mrobinson 2010-12-28 12:56:16 -0800 Created attachment 77572 Patch which fixes all style issues 327340 3 77572 eric 2010-12-28 13:47:04 -0800 Comment on attachment 77572 Patch which fixes all style issues OK. Is this code supposed to be WebKit style? 327394 4 mrobinson 2010-12-28 14:55:40 -0800 (In reply to comment #3) > (From update of attachment 77572 [details]) > OK. Is this code supposed to be WebKit style? At some point in the past it wasn't, but now it is, I believe. 327409 5 mrobinson 2010-12-28 15:40:37 -0800 Committed r74730: <http://trac.webkit.org/changeset/74730> 77571 2010-12-28 12:50:21 -0800 2010-12-28 12:56:13 -0800 Patch bug-51685-20101228125020.patch text/plain 12591 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZDVlZmQ4MmUzYmY2YTVkZjQ2NGM1YTNiM2FmOWM5MzEzNDFhMWJmYi4uOWE0MzdmZDEz NWU2YWQ2N2I2NWZhYjc0MWFkMjk5NGMxNjM0MDlhNyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAx MC0xMi0yOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xlYW4gdXAg dXNhZ2Ugb2YgTlVMTCBpbiB3ZWJraXR3ZWJmcmFtZS5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNjg1CisKKyAgICAgICAgUmVwbGFjZSBvY2N1 cnJlbmNlcyBvZiBOVUxMIHdpdGggMCwgaW4gd2Via2l0d2ViZnJhbWUuY3BwLiBOb3QgYWxsCisg ICAgICAgIHVzZXMgb2YgTlVMTCBoYXZlIGJlZW4gY2hhbmdlZCwgYXMgY2VydGFpbiBHTGliIGZ1 bmN0aW9ucyByZXF1aXJlCisgICAgICAgIGFuIGV4cGxpY2l0IE5VTEwgYXMgYSBzZW50aW5lbC4K KworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHA6CisgICAgICAgICh3ZWJraXRf d2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZV9mcm9tX2NvcmVfbG9hZGVyKToKKyAgICAgICAgKHdl YmtpdF93ZWJfZnJhbWVfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX25l dyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2dldF90aXRsZSk6CisgICAgICAgICh3ZWJr aXRfd2ViX2ZyYW1lX2dldF91cmkpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRfd2Vi X3ZpZXcpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRfbmFtZSk6CisgICAgICAgICh3 ZWJraXRfd2ViX2ZyYW1lX2dldF9wYXJlbnQpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9s b2FkX3N0cmluZyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfYWx0ZXJuYXRlX3N0 cmluZyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2ZpbmRfZnJhbWUpOgorICAgICAgICAo d2Via2l0X3dlYl9mcmFtZV9nZXRfZ2xvYmFsX2NvbnRleHQpOgorICAgICAgICAod2Via2l0X3dl Yl9mcmFtZV9nZXRfZGF0YV9zb3VyY2UpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRf cHJvdmlzaW9uYWxfZGF0YV9zb3VyY2UpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9wcmlu dF9mdWxsKToKKyAgICAgICAgKHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3NlY3VyaXR5X29yaWdpbik6 CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2dldF9uZXR3b3JrX3Jlc3BvbnNlKToKKwogMjAx MC0xMi0yNyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2ViZnJhbWUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUu Y3BwCmluZGV4IGNhMmI2ODE5MDEzNmM0ZTg3OTgxMzIyYzE4NzhlYjkxYWIxNzBjZDMuLjhkMTk5 NDFmZjFkOTQ1NTA2NDUzMzQ1NDViYWU1OWI4ZmM1YmRlYmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJmcmFtZS5jcHAKQEAgLTE1OCw3ICsxNTgsNyBAQCB2b2lkIHdlYmtpdF93ZWJfZnJhbWVf Y29yZV9mcmFtZV9nb25lKFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKIAogc3RhdGljIFdlYktpdFdl YkRhdGFTb3VyY2UqIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2RhdGFfc291cmNlX2Zyb21fY29yZV9s b2FkZXIoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKLSAgICByZXR1cm4gbG9h ZGVyID8gc3RhdGljX2Nhc3Q8V2ViS2l0OjpEb2N1bWVudExvYWRlcio+KGxvYWRlciktPmRhdGFT b3VyY2UoKSA6IE5VTEw7CisgICAgcmV0dXJuIGxvYWRlciA/IHN0YXRpY19jYXN0PFdlYktpdDo6 RG9jdW1lbnRMb2FkZXIqPihsb2FkZXIpLT5kYXRhU291cmNlKCkgOiAwOwogfQogCiBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKQEAgLTE5MCw4 ICsxOTAsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2luaXQoV2ViS2l0 V2ViRnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNT KGZyYW1lQ2xhc3MpLAogICAgICAgICAgICAgKEdTaWduYWxGbGFncylHX1NJR05BTF9SVU5fTEFT VCwKICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICBOVUxMLAotICAgICAgICAgICAgTlVMTCwK KyAgICAgICAgICAgIDAsCisgICAgICAgICAgICAwLAogICAgICAgICAgICAgZ19jY2xvc3VyZV9t YXJzaGFsX1ZPSURfX1ZPSUQsCiAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMCk7CiAKQEAgLTIw Nyw4ICsyMDcsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2luaXQoV2Vi S2l0V2ViRnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NM QVNTKGZyYW1lQ2xhc3MpLAogICAgICAgICAgICAgKEdTaWduYWxGbGFncylHX1NJR05BTF9SVU5f TEFTVCwKICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICBOVUxMLAotICAgICAgICAgICAgTlVM TCwKKyAgICAgICAgICAgIDAsCisgICAgICAgICAgICAwLAogICAgICAgICAgICAgZ19jY2xvc3Vy ZV9tYXJzaGFsX1ZPSURfX1ZPSUQsCiAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMCk7CiAKQEAg LTIyNSw4ICsyMjUsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2luaXQo V2ViS2l0V2ViRnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAgICAgICAgICAgIEdfVFlQRV9GUk9N X0NMQVNTKGZyYW1lQ2xhc3MpLAogICAgICAgICAgICAgKEdTaWduYWxGbGFncylHX1NJR05BTF9S VU5fTEFTVCwKICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICBOVUxMLAotICAgICAgICAgICAg TlVMTCwKKyAgICAgICAgICAgIDAsCisgICAgICAgICAgICAwLAogICAgICAgICAgICAgZ19jY2xv c3VyZV9tYXJzaGFsX1ZPSURfX0JPT0xFQU4sCiAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMSwK ICAgICAgICAgICAgIEdfVFlQRV9CT09MRUFOKTsKQEAgLTI0NCw4ICsyNDQsOCBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2luaXQoV2ViS2l0V2ViRnJhbWVDbGFzcyogZnJh bWVDbGFzcykKICAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKGZyYW1lQ2xhc3MpLAogICAg ICAgICAgICAgKEdTaWduYWxGbGFncylHX1NJR05BTF9SVU5fTEFTVCwKICAgICAgICAgICAgIDAs Ci0gICAgICAgICAgICBOVUxMLAotICAgICAgICAgICAgTlVMTCwKKyAgICAgICAgICAgIDAsCisg ICAgICAgICAgICAwLAogICAgICAgICAgICAgd2Via2l0X21hcnNoYWxfVk9JRF9fU1RSSU5HLAog ICAgICAgICAgICAgR19UWVBFX05PTkUsIDEsCiAgICAgICAgICAgICBHX1RZUEVfU1RSSU5HKTsK QEAgLTI1NCw4ICsyNTQsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2lu aXQoV2ViS2l0V2ViRnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAgICAgICAgICAgIEdfVFlQRV9G Uk9NX0NMQVNTKGZyYW1lQ2xhc3MpLAogICAgICAgICAgICAgKEdTaWduYWxGbGFncylHX1NJR05B TF9SVU5fTEFTVCwKICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICBOVUxMLAotICAgICAgICAg ICAgTlVMTCwKKyAgICAgICAgICAgIDAsCisgICAgICAgICAgICAwLAogICAgICAgICAgICAgd2Vi a2l0X21hcnNoYWxfVk9JRF9fU1RSSU5HX1NUUklORywKICAgICAgICAgICAgIEdfVFlQRV9OT05F LCAyLAogICAgICAgICAgICAgR19UWVBFX1NUUklORywgR19UWVBFX1NUUklORyk7CkBAIC0yOTAs NyArMjkwLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9jbGFzc19pbml0KFdlYktp dFdlYkZyYW1lQ2xhc3MqIGZyYW1lQ2xhc3MpCiAgICAgICAgICAgICAoR1NpZ25hbEZsYWdzKShH X1NJR05BTF9SVU5fTEFTVCB8IEdfU0lHTkFMX0FDVElPTiksCiAgICAgICAgICAgICAwLAogICAg ICAgICAgICAgZ19zaWduYWxfYWNjdW11bGF0b3JfdHJ1ZV9oYW5kbGVkLAotICAgICAgICAgICAg TlVMTCwKKyAgICAgICAgICAgIDAsCiAgICAgICAgICAgICB3ZWJraXRfbWFyc2hhbF9CT09MRUFO X19WT0lELAogICAgICAgICAgICAgR19UWVBFX0JPT0xFQU4sIDApOwogCkBAIC0zMDgsMjEgKzMw OCwyMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2NsYXNzX2luaXQoV2ViS2l0V2Vi RnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoIm5hbWUiLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJOYW1lIiksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlRoZSBuYW1lIG9m IHRoZSBmcmFtZSIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogICAgIGdf b2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBST1BfVElUTEUsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJ0 aXRsZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIF8oIlRpdGxlIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF8oIlRoZSBkb2N1bWVudCB0aXRsZSBvZiB0aGUgZnJhbWUiKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg TlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgMCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7CiAKICAgICBnX29iamVjdF9jbGFzc19p bnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX1VSSSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoInVyaSIsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlVSSSIpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBf KCJUaGUgY3VycmVudCBVUkkgb2YgdGhlIGNvbnRlbnRzIGRpc3BsYXllZCBieSB0aGUgZnJhbWUi KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgMCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7CiAKICAgICAvKioKQEAgLTM4Nyw2 ICszODcsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2luaXQoV2ViS2l0V2ViRnJh bWUqIGZyYW1lKQogICAgIGZyYW1lLT5wcml2ID0gcHJpdjsKIH0KIAorCiAvKioKICAqIHdlYmtp dF93ZWJfZnJhbWVfbmV3OgogICogQHdlYl92aWV3OiB0aGUgY29udHJvbGxpbmcgI1dlYktpdFdl YlZpZXcKQEAgLTQwMCw3ICs0MDEsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2lu aXQoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICoqLwogV2ViS2l0V2ViRnJhbWUqIHdlYmtpdF93 ZWJfZnJhbWVfbmV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBOVUxMKTsKKyAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIDApOwogCiAgICAgV2Vi S2l0V2ViRnJhbWUqIGZyYW1lID0gV0VCS0lUX1dFQl9GUkFNRShnX29iamVjdF9uZXcoV0VCS0lU X1RZUEVfV0VCX0ZSQU1FLCBOVUxMKSk7CiAgICAgV2ViS2l0V2ViRnJhbWVQcml2YXRlKiBwcml2 ID0gZnJhbWUtPnByaXY7CkBAIC00MTEsNyArNDEyLDcgQEAgV2ViS2l0V2ViRnJhbWUqIHdlYmtp dF93ZWJfZnJhbWVfbmV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgcHJpdi0+Y29yZUZy YW1lID0gRnJhbWU6OmNyZWF0ZSh2aWV3UHJpdi0+Y29yZVBhZ2UsIDAsIGNsaWVudCkuZ2V0KCk7 CiAgICAgcHJpdi0+Y29yZUZyYW1lLT5pbml0KCk7CiAKLSAgICBwcml2LT5vcmlnaW4gPSBOVUxM OworICAgIHByaXYtPm9yaWdpbiA9IDA7CiAKICAgICByZXR1cm4gZnJhbWU7CiB9CkBAIC00MjYs NyArNDI3LDcgQEAgV2ViS2l0V2ViRnJhbWUqIHdlYmtpdF93ZWJfZnJhbWVfbmV3KFdlYktpdFdl YlZpZXcqIHdlYlZpZXcpCiAgKi8KIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX2Zy YW1lX2dldF90aXRsZShXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSksIE5VTEwpOworICAgIGdfcmV0dXJu X3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCAwKTsKIAogICAgIFdlYktp dFdlYkZyYW1lUHJpdmF0ZSogcHJpdiA9IGZyYW1lLT5wcml2OwogICAgIHJldHVybiBwcml2LT50 aXRsZTsKQEAgLTQ0Miw3ICs0NDMsNyBAQCBHX0NPTlNUX1JFVFVSTiBnY2hhciogd2Via2l0X3dl Yl9mcmFtZV9nZXRfdGl0bGUoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICovCiBHX0NPTlNUX1JF VFVSTiBnY2hhciogd2Via2l0X3dlYl9mcmFtZV9nZXRfdXJpKFdlYktpdFdlYkZyYW1lKiBmcmFt ZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1l KSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShm cmFtZSksIDApOwogCiAgICAgV2ViS2l0V2ViRnJhbWVQcml2YXRlKiBwcml2ID0gZnJhbWUtPnBy aXY7CiAgICAgcmV0dXJuIHByaXYtPnVyaTsKQEAgLTQ2MSw3ICs0NjIsNyBAQCBHX0NPTlNUX1JF VFVSTiBnY2hhciogd2Via2l0X3dlYl9mcmFtZV9nZXRfdXJpKFdlYktpdFdlYkZyYW1lKiBmcmFt ZSkKICAqLwogV2ViS2l0V2ViVmlldyogd2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcoV2Vi S2l0V2ViRnJhbWUqIGZyYW1lKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9J U19XRUJfRlJBTUUoZnJhbWUpLCBOVUxMKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJL SVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgMCk7CiAKICAgICBXZWJLaXRXZWJGcmFtZVByaXZhdGUq IHByaXYgPSBmcmFtZS0+cHJpdjsKICAgICByZXR1cm4gcHJpdi0+d2ViVmlldzsKQEAgLTQ3Nyw3 ICs0NzgsNyBAQCBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhX ZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAgKi8KIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRf d2ViX2ZyYW1lX2dldF9uYW1lKFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKIHsKLSAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgTlVMTCk7CisgICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSksIDApOwogCiAgICAg V2ViS2l0V2ViRnJhbWVQcml2YXRlKiBwcml2ID0gZnJhbWUtPnByaXY7CiAKQEAgLTUwMywxMSAr NTA0LDExIEBAIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9uYW1l KFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKICAqLwogV2ViS2l0V2ViRnJhbWUqIHdlYmtpdF93ZWJf ZnJhbWVfZ2V0X3BhcmVudChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgZ19yZXR1cm5f dmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSksIE5VTEwpOworICAgIGdfcmV0 dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCAwKTsKIAogICAgIEZy YW1lKiBjb3JlRnJhbWUgPSBjb3JlKGZyYW1lKTsKICAgICBpZiAoIWNvcmVGcmFtZSkKLSAgICAg ICAgcmV0dXJuIE5VTEw7CisgICAgICAgIHJldHVybiAwOwogCiAgICAgcmV0dXJuIGtpdChjb3Jl RnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpOwogfQpAQCAtNTc0LDcgKzU3NSw3IEBAIHZvaWQgd2Vi a2l0X3dlYl9mcmFtZV9sb2FkX3N0cmluZyhXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdj aGFyKiBjb250ZW50LCBjCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1F KGZyYW1lKSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChjb250ZW50KTsKIAotICAgIHdlYmtpdF93 ZWJfZnJhbWVfbG9hZF9kYXRhKGZyYW1lLCBjb250ZW50LCBjb250ZW50TWltZVR5cGUsIGNvbnRl bnRFbmNvZGluZywgYmFzZVVyaSwgTlVMTCk7CisgICAgd2Via2l0X3dlYl9mcmFtZV9sb2FkX2Rh dGEoZnJhbWUsIGNvbnRlbnQsIGNvbnRlbnRNaW1lVHlwZSwgY29udGVudEVuY29kaW5nLCBiYXNl VXJpLCAwKTsKIH0KIAogLyoqCkBAIC01OTUsNyArNTk2LDcgQEAgdm9pZCB3ZWJraXRfd2ViX2Zy YW1lX2xvYWRfYWx0ZXJuYXRlX3N0cmluZyhXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdj aGFyKgogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSkpOwog ICAgIGdfcmV0dXJuX2lmX2ZhaWwoY29udGVudCk7CiAKLSAgICB3ZWJraXRfd2ViX2ZyYW1lX2xv YWRfZGF0YShmcmFtZSwgY29udGVudCwgTlVMTCwgTlVMTCwgYmFzZVVSTCwgdW5yZWFjaGFibGVV UkwpOworICAgIHdlYmtpdF93ZWJfZnJhbWVfbG9hZF9kYXRhKGZyYW1lLCBjb250ZW50LCAwLCAw LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCk7CiB9CiAKIC8qKgpAQCAtNjc0LDEyICs2NzUsMTIg QEAgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX3JlbG9hZChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAg Ki8KIFdlYktpdFdlYkZyYW1lKiB3ZWJraXRfd2ViX2ZyYW1lX2ZpbmRfZnJhbWUoV2ViS2l0V2Vi RnJhbWUqIGZyYW1lLCBjb25zdCBnY2hhciogbmFtZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZf ZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgTlVMTCk7Ci0gICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwobmFtZSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lT X1dFQl9GUkFNRShmcmFtZSksIDApOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKG5hbWUsIDAp OwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwogICAgIGlmICghY29yZUZy YW1lKQotICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBTdHJp bmcgbmFtZVN0cmluZyA9IFN0cmluZzo6ZnJvbVVURjgobmFtZSk7CiAgICAgcmV0dXJuIGtpdChj b3JlRnJhbWUtPnRyZWUoKS0+ZmluZChBdG9taWNTdHJpbmcobmFtZVN0cmluZykpKTsKQEAgLTY5 NiwxMSArNjk3LDExIEBAIFdlYktpdFdlYkZyYW1lKiB3ZWJraXRfd2ViX2ZyYW1lX2ZpbmRfZnJh bWUoV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBnY2hhcioKICAqLwogSlNHbG9iYWxDb250 ZXh0UmVmIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2dsb2JhbF9jb250ZXh0KFdlYktpdFdlYkZyYW1l KiBmcmFtZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1F KGZyYW1lKSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9G UkFNRShmcmFtZSksIDApOwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwog ICAgIGlmICghY29yZUZyYW1lKQotICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgcmV0dXJu IDA7CiAKICAgICByZXR1cm4gdG9HbG9iYWxSZWYoY29yZUZyYW1lLT5zY3JpcHQoKS0+Z2xvYmFs T2JqZWN0KG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKS0+Z2xvYmFsRXhlYygpKTsKIH0KQEAgLTcx Nyw3ICs3MTgsNyBAQCBKU0dsb2JhbENvbnRleHRSZWYgd2Via2l0X3dlYl9mcmFtZV9nZXRfZ2xv YmFsX2NvbnRleHQoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICovCiBXZWJLaXRXZWJEYXRhU291 cmNlKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZShXZWJLaXRXZWJGcmFtZSogZnJh bWUpCiB7Ci0gICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFt ZSksIE5VTEwpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUo ZnJhbWUpLCAwKTsKIAogICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBjb3JlKGZyYW1lKTsKICAgICBy ZXR1cm4gd2Via2l0X3dlYl9mcmFtZV9nZXRfZGF0YV9zb3VyY2VfZnJvbV9jb3JlX2xvYWRlcihj b3JlRnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKTsKQEAgLTczOSw3ICs3NDAsNyBA QCBXZWJLaXRXZWJEYXRhU291cmNlKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZShX ZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAgKi8KIFdlYktpdFdlYkRhdGFTb3VyY2UqIHdlYmtpdF93 ZWJfZnJhbWVfZ2V0X3Byb3Zpc2lvbmFsX2RhdGFfc291cmNlKFdlYktpdFdlYkZyYW1lKiBmcmFt ZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1l KSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShm cmFtZSksIDApOwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwogICAgIHJl dHVybiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZV9mcm9tX2NvcmVfbG9hZGVyKGNv cmVGcmFtZS0+bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSk7CkBAIC04MDQs NyArODA1LDcgQEAgR3RrUHJpbnRPcGVyYXRpb25SZXN1bHQgd2Via2l0X3dlYl9mcmFtZV9wcmlu dF9mdWxsKFdlYktpdFdlYkZyYW1lKiBmcmFtZSwgR3RrUHIKICAgICBHdGtXaWRnZXQqIHRvcExl dmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3ZWJraXRfd2ViX2ZyYW1l X2dldF93ZWJfdmlldyhmcmFtZSkpKTsKIAogICAgIGlmICghZ3RrX3dpZGdldF9pc190b3BsZXZl bCh0b3BMZXZlbCkpCi0gICAgICAgIHRvcExldmVsID0gTlVMTDsKKyAgICAgICAgdG9wTGV2ZWwg PSAwOwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwogICAgIGlmICghY29y ZUZyYW1lKQpAQCAtOTMzLDcgKzkzNCw3IEBAIFdlYktpdFNlY3VyaXR5T3JpZ2luKiB3ZWJraXRf d2ViX2ZyYW1lX2dldF9zZWN1cml0eV9vcmlnaW4oV2ViS2l0V2ViRnJhbWUqIGZyYW1lCiB7CiAg ICAgV2ViS2l0V2ViRnJhbWVQcml2YXRlKiBwcml2ID0gZnJhbWUtPnByaXY7CiAgICAgaWYgKCFw cml2LT5jb3JlRnJhbWUgfHwgIXByaXYtPmNvcmVGcmFtZS0+ZG9jdW1lbnQoKSB8fCAhcHJpdi0+ Y29yZUZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKQotICAgICAgICByZXR1cm4g TlVMTDsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAocHJpdi0+b3JpZ2luICYmIHByaXYt Pm9yaWdpbi0+cHJpdi0+Y29yZU9yaWdpbi5nZXQoKSA9PSBwcml2LT5jb3JlRnJhbWUtPmRvY3Vt ZW50KCktPnNlY3VyaXR5T3JpZ2luKCkpCiAgICAgICAgIHJldHVybiBwcml2LT5vcmlnaW47CkBA IC05NjIsMTEgKzk2MywxMSBAQCBXZWJLaXROZXR3b3JrUmVzcG9uc2UqIHdlYmtpdF93ZWJfZnJh bWVfZ2V0X25ldHdvcmtfcmVzcG9uc2UoV2ViS2l0V2ViRnJhbWUqIGZyYQogewogICAgIEZyYW1l KiBjb3JlRnJhbWUgPSBjb3JlKGZyYW1lKTsKICAgICBpZiAoIWNvcmVGcmFtZSkKLSAgICAgICAg cmV0dXJuIE5VTEw7CisgICAgICAgIHJldHVybiAwOwogCiAgICAgV2ViQ29yZTo6RG9jdW1lbnRM b2FkZXIqIGxvYWRlciA9IGNvcmVGcmFtZS0+bG9hZGVyKCktPmFjdGl2ZURvY3VtZW50TG9hZGVy KCk7CiAgICAgaWYgKCFsb2FkZXIpCi0gICAgICAgIHJldHVybiBOVUxMOworICAgICAgICByZXR1 cm4gMDsKIAogICAgIHJldHVybiBraXROZXcobG9hZGVyLT5yZXNwb25zZSgpKTsKIH0K 77572 2010-12-28 12:56:16 -0800 2010-12-28 15:40:55 -0800 Patch which fixes all style issues bug-51685-20101228125615.patch text/plain 13928 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZDVlZmQ4MmUzYmY2YTVkZjQ2NGM1YTNiM2FmOWM5MzEzNDFhMWJmYi4uOWE0MzdmZDEz NWU2YWQ2N2I2NWZhYjc0MWFkMjk5NGMxNjM0MDlhNyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAx MC0xMi0yOCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xlYW4gdXAg dXNhZ2Ugb2YgTlVMTCBpbiB3ZWJraXR3ZWJmcmFtZS5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNjg1CisKKyAgICAgICAgUmVwbGFjZSBvY2N1 cnJlbmNlcyBvZiBOVUxMIHdpdGggMCwgaW4gd2Via2l0d2ViZnJhbWUuY3BwLiBOb3QgYWxsCisg ICAgICAgIHVzZXMgb2YgTlVMTCBoYXZlIGJlZW4gY2hhbmdlZCwgYXMgY2VydGFpbiBHTGliIGZ1 bmN0aW9ucyByZXF1aXJlCisgICAgICAgIGFuIGV4cGxpY2l0IE5VTEwgYXMgYSBzZW50aW5lbC4K KworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHA6CisgICAgICAgICh3ZWJraXRf d2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZV9mcm9tX2NvcmVfbG9hZGVyKToKKyAgICAgICAgKHdl YmtpdF93ZWJfZnJhbWVfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX25l dyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2dldF90aXRsZSk6CisgICAgICAgICh3ZWJr aXRfd2ViX2ZyYW1lX2dldF91cmkpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRfd2Vi X3ZpZXcpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRfbmFtZSk6CisgICAgICAgICh3 ZWJraXRfd2ViX2ZyYW1lX2dldF9wYXJlbnQpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9s b2FkX3N0cmluZyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfYWx0ZXJuYXRlX3N0 cmluZyk6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2ZpbmRfZnJhbWUpOgorICAgICAgICAo d2Via2l0X3dlYl9mcmFtZV9nZXRfZ2xvYmFsX2NvbnRleHQpOgorICAgICAgICAod2Via2l0X3dl Yl9mcmFtZV9nZXRfZGF0YV9zb3VyY2UpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9nZXRf cHJvdmlzaW9uYWxfZGF0YV9zb3VyY2UpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9wcmlu dF9mdWxsKToKKyAgICAgICAgKHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3NlY3VyaXR5X29yaWdpbik6 CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX2dldF9uZXR3b3JrX3Jlc3BvbnNlKToKKwogMjAx MC0xMi0yNyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2ViZnJhbWUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUu Y3BwCmluZGV4IGNhMmI2ODE5MDEzNmM0ZTg3OTgxMzIyYzE4NzhlYjkxYWIxNzBjZDMuLmQ4ZDI1 YzA0NjQwZjI4YzE3ZDQ4YWM5Njc3ZDVjZjFiNTkyYWQ3MTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJmcmFtZS5jcHAKQEAgLTUxLDkgKzUxLDkgQEAKICNpbmNsdWRlICJTY3JpcHRDb250cm9s bGVyLmgiCiAjaW5jbHVkZSAiU3Vic3RpdHV0ZURhdGEuaCIKICNpbmNsdWRlICJ3ZWJraXRlbnVt dHlwZXMuaCIKKyNpbmNsdWRlICJ3ZWJraXRtYXJzaGFsLmgiCiAjaW5jbHVkZSAid2Via2l0bmV0 d29ya3JlcXVlc3Rwcml2YXRlLmgiCiAjaW5jbHVkZSAid2Via2l0bmV0d29ya3Jlc3BvbnNlcHJp dmF0ZS5oIgotI2luY2x1ZGUgIndlYmtpdG1hcnNoYWwuaCIKICNpbmNsdWRlICJ3ZWJraXRwcml2 YXRlLmgiCiAjaW5jbHVkZSAid2Via2l0c2VjdXJpdHlvcmlnaW5wcml2YXRlLmgiCiAjaW5jbHVk ZSAid2Via2l0d2ViZnJhbWVwcml2YXRlLmgiCkBAIC0xMTUsMTEgKzExNSwxMSBAQCBzdGF0aWMg Z3VpbnQgd2Via2l0X3dlYl9mcmFtZV9zaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKIAog R19ERUZJTkVfVFlQRShXZWJLaXRXZWJGcmFtZSwgd2Via2l0X3dlYl9mcmFtZSwgR19UWVBFX09C SkVDVCkKIAotc3RhdGljIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9nZXRfcHJvcGVydHkoR09iamVj dCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBHVmFsdWUqIHZhbHVlLCBHUGFyYW1TcGVjKiBwc3Bl YykKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9i amVjdCwgZ3VpbnQgcHJvcGVydHlJZCwgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcGFyYW1T cGVjKQogewogICAgIFdlYktpdFdlYkZyYW1lKiBmcmFtZSA9IFdFQktJVF9XRUJfRlJBTUUob2Jq ZWN0KTsKIAotICAgIHN3aXRjaChwcm9wX2lkKSB7CisgICAgc3dpdGNoIChwcm9wZXJ0eUlkKSB7 CiAgICAgY2FzZSBQUk9QX05BTUU6CiAgICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwg d2Via2l0X3dlYl9mcmFtZV9nZXRfbmFtZShmcmFtZSkpOwogICAgICAgICBicmVhazsKQEAgLTEz OSw3ICsxMzksNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2dldF9wcm9wZXJ0eShH T2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYWx1ZQogICAgICAgICBnX3ZhbHVlX3Nl dF9lbnVtKHZhbHVlLCB3ZWJraXRfd2ViX2ZyYW1lX2dldF92ZXJ0aWNhbF9zY3JvbGxiYXJfcG9s aWN5KGZyYW1lKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6Ci0gICAgICAgIEdfT0JK RUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKKyAg ICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcGVydHlJ ZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQpAQCAtMTU4LDcgKzE1OCw3 IEBAIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9jb3JlX2ZyYW1lX2dvbmUoV2ViS2l0V2ViRnJhbWUq IGZyYW1lKQogCiBzdGF0aWMgV2ViS2l0V2ViRGF0YVNvdXJjZSogd2Via2l0X3dlYl9mcmFtZV9n ZXRfZGF0YV9zb3VyY2VfZnJvbV9jb3JlX2xvYWRlcihXZWJDb3JlOjpEb2N1bWVudExvYWRlciog bG9hZGVyKQogewotICAgIHJldHVybiBsb2FkZXIgPyBzdGF0aWNfY2FzdDxXZWJLaXQ6OkRvY3Vt ZW50TG9hZGVyKj4obG9hZGVyKS0+ZGF0YVNvdXJjZSgpIDogTlVMTDsKKyAgICByZXR1cm4gbG9h ZGVyID8gc3RhdGljX2Nhc3Q8V2ViS2l0OjpEb2N1bWVudExvYWRlcio+KGxvYWRlciktPmRhdGFT b3VyY2UoKSA6IDA7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfZmluYWxpemUo R09iamVjdCogb2JqZWN0KQpAQCAtMTkwLDggKzE5MCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfZnJhbWVfY2xhc3NfaW5pdChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNsYXNzKQogICAg ICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1MoZnJhbWVDbGFzcyksCiAgICAgICAgICAgICAoR1Np Z25hbEZsYWdzKUdfU0lHTkFMX1JVTl9MQVNULAogICAgICAgICAgICAgMCwKLSAgICAgICAgICAg IE5VTEwsCi0gICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgMCwKKyAgICAgICAgICAgIDAs CiAgICAgICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKICAgICAgICAgICAg IEdfVFlQRV9OT05FLCAwKTsKIApAQCAtMjA3LDggKzIwNyw4IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfZnJhbWVfY2xhc3NfaW5pdChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNsYXNzKQog ICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1MoZnJhbWVDbGFzcyksCiAgICAgICAgICAgICAo R1NpZ25hbEZsYWdzKUdfU0lHTkFMX1JVTl9MQVNULAogICAgICAgICAgICAgMCwKLSAgICAgICAg ICAgIE5VTEwsCi0gICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgMCwKKyAgICAgICAgICAg IDAsCiAgICAgICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKICAgICAgICAg ICAgIEdfVFlQRV9OT05FLCAwKTsKIApAQCAtMjI1LDggKzIyNSw4IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF93ZWJfZnJhbWVfY2xhc3NfaW5pdChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNsYXNz KQogICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1MoZnJhbWVDbGFzcyksCiAgICAgICAgICAg ICAoR1NpZ25hbEZsYWdzKUdfU0lHTkFMX1JVTl9MQVNULAogICAgICAgICAgICAgMCwKLSAgICAg ICAgICAgIE5VTEwsCi0gICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgMCwKKyAgICAgICAg ICAgIDAsCiAgICAgICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fQk9PTEVBTiwKICAg ICAgICAgICAgIEdfVFlQRV9OT05FLCAxLAogICAgICAgICAgICAgR19UWVBFX0JPT0xFQU4pOwpA QCAtMjQ0LDggKzI0NCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfY2xhc3NfaW5p dChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNsYXNzKQogICAgICAgICAgICAgR19UWVBFX0ZS T01fQ0xBU1MoZnJhbWVDbGFzcyksCiAgICAgICAgICAgICAoR1NpZ25hbEZsYWdzKUdfU0lHTkFM X1JVTl9MQVNULAogICAgICAgICAgICAgMCwKLSAgICAgICAgICAgIE5VTEwsCi0gICAgICAgICAg ICBOVUxMLAorICAgICAgICAgICAgMCwKKyAgICAgICAgICAgIDAsCiAgICAgICAgICAgICB3ZWJr aXRfbWFyc2hhbF9WT0lEX19TVFJJTkcsCiAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMSwKICAg ICAgICAgICAgIEdfVFlQRV9TVFJJTkcpOwpAQCAtMjU0LDggKzI1NCw4IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfZnJhbWVfY2xhc3NfaW5pdChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNs YXNzKQogICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1MoZnJhbWVDbGFzcyksCiAgICAgICAg ICAgICAoR1NpZ25hbEZsYWdzKUdfU0lHTkFMX1JVTl9MQVNULAogICAgICAgICAgICAgMCwKLSAg ICAgICAgICAgIE5VTEwsCi0gICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgMCwKKyAgICAg ICAgICAgIDAsCiAgICAgICAgICAgICB3ZWJraXRfbWFyc2hhbF9WT0lEX19TVFJJTkdfU1RSSU5H LAogICAgICAgICAgICAgR19UWVBFX05PTkUsIDIsCiAgICAgICAgICAgICBHX1RZUEVfU1RSSU5H LCBHX1RZUEVfU1RSSU5HKTsKQEAgLTI5MCw3ICsyOTAsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX2ZyYW1lX2NsYXNzX2luaXQoV2ViS2l0V2ViRnJhbWVDbGFzcyogZnJhbWVDbGFzcykKICAg ICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNU SU9OKSwKICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICBnX3NpZ25hbF9hY2N1bXVsYXRvcl90 cnVlX2hhbmRsZWQsCi0gICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgMCwKICAgICAgICAg ICAgIHdlYmtpdF9tYXJzaGFsX0JPT0xFQU5fX1ZPSUQsCiAgICAgICAgICAgICBHX1RZUEVfQk9P TEVBTiwgMCk7CiAKQEAgLTMwOCwyMSArMzA4LDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf ZnJhbWVfY2xhc3NfaW5pdChXZWJLaXRXZWJGcmFtZUNsYXNzKiBmcmFtZUNsYXNzKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygibmFtZSIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF8oIk5hbWUiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXygiVGhlIG5hbWUgb2YgdGhlIGZyYW1lIiksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9Q QVJBTV9SRUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShv YmplY3RDbGFzcywgUFJPUF9USVRMRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoInRpdGxlIiwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGl0bGUiKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGhlIGRvY3Vt ZW50IHRpdGxlIG9mIHRoZSBmcmFtZSIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUp KTsKIAogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBS T1BfVVJJLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVj X3N0cmluZygidXJpIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXygiVVJJIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlRoZSBjdXJyZW50IFVSSSBvZiB0aGUgY29udGVu dHMgZGlzcGxheWVkIGJ5IHRoZSBmcmFtZSIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFC TEUpKTsKIAogICAgIC8qKgpAQCAtMzg3LDYgKzM4Nyw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfZnJhbWVfaW5pdChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAgICAgZnJhbWUtPnByaXYgPSBw cml2OwogfQogCisKIC8qKgogICogd2Via2l0X3dlYl9mcmFtZV9uZXc6CiAgKiBAd2ViX3ZpZXc6 IHRoZSBjb250cm9sbGluZyAjV2ViS2l0V2ViVmlldwpAQCAtNDAwLDcgKzQwMSw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfaW5pdChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAgKiov CiBXZWJLaXRXZWJGcmFtZSogd2Via2l0X3dlYl9mcmFtZV9uZXcoV2ViS2l0V2ViVmlldyogd2Vi VmlldykKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2Vi VmlldyksIE5VTEwpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklF Vyh3ZWJWaWV3KSwgMCk7CiAKICAgICBXZWJLaXRXZWJGcmFtZSogZnJhbWUgPSBXRUJLSVRfV0VC X0ZSQU1FKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfRlJBTUUsIE5VTEwpKTsKICAgICBX ZWJLaXRXZWJGcmFtZVByaXZhdGUqIHByaXYgPSBmcmFtZS0+cHJpdjsKQEAgLTQxMSw3ICs0MTIs NyBAQCBXZWJLaXRXZWJGcmFtZSogd2Via2l0X3dlYl9mcmFtZV9uZXcoV2ViS2l0V2ViVmlldyog d2ViVmlldykKICAgICBwcml2LT5jb3JlRnJhbWUgPSBGcmFtZTo6Y3JlYXRlKHZpZXdQcml2LT5j b3JlUGFnZSwgMCwgY2xpZW50KS5nZXQoKTsKICAgICBwcml2LT5jb3JlRnJhbWUtPmluaXQoKTsK IAotICAgIHByaXYtPm9yaWdpbiA9IE5VTEw7CisgICAgcHJpdi0+b3JpZ2luID0gMDsKIAogICAg IHJldHVybiBmcmFtZTsKIH0KQEAgLTQyNiw3ICs0MjcsNyBAQCBXZWJLaXRXZWJGcmFtZSogd2Vi a2l0X3dlYl9mcmFtZV9uZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAqLwogR19DT05TVF9S RVRVUk4gZ2NoYXIqIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3RpdGxlKFdlYktpdFdlYkZyYW1lKiBm cmFtZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZy YW1lKSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFN RShmcmFtZSksIDApOwogCiAgICAgV2ViS2l0V2ViRnJhbWVQcml2YXRlKiBwcml2ID0gZnJhbWUt PnByaXY7CiAgICAgcmV0dXJuIHByaXYtPnRpdGxlOwpAQCAtNDQyLDcgKzQ0Myw3IEBAIEdfQ09O U1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF90aXRsZShXZWJLaXRXZWJGcmFt ZSogZnJhbWUpCiAgKi8KIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX2ZyYW1lX2dl dF91cmkoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWls KFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCBOVUxMKTsKKyAgICBnX3JldHVybl92YWxfaWZf ZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgMCk7CiAKICAgICBXZWJLaXRXZWJGcmFt ZVByaXZhdGUqIHByaXYgPSBmcmFtZS0+cHJpdjsKICAgICByZXR1cm4gcHJpdi0+dXJpOwpAQCAt NDYxLDcgKzQ2Miw3IEBAIEdfQ09OU1RfUkVUVVJOIGdjaGFyKiB3ZWJraXRfd2ViX2ZyYW1lX2dl dF91cmkoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICovCiBXZWJLaXRXZWJWaWV3KiB3ZWJraXRf d2ViX2ZyYW1lX2dldF93ZWJfdmlldyhXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiB7Ci0gICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSksIE5VTEwpOworICAg IGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCAwKTsKIAog ICAgIFdlYktpdFdlYkZyYW1lUHJpdmF0ZSogcHJpdiA9IGZyYW1lLT5wcml2OwogICAgIHJldHVy biBwcml2LT53ZWJWaWV3OwpAQCAtNDc3LDcgKzQ3OCw3IEBAIFdlYktpdFdlYlZpZXcqIHdlYmtp dF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKICAqLwogR19D T05TVF9SRVRVUk4gZ2NoYXIqIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X25hbWUoV2ViS2l0V2ViRnJh bWUqIGZyYW1lKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJB TUUoZnJhbWUpLCBOVUxMKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VC X0ZSQU1FKGZyYW1lKSwgMCk7CiAKICAgICBXZWJLaXRXZWJGcmFtZVByaXZhdGUqIHByaXYgPSBm cmFtZS0+cHJpdjsKIApAQCAtNTAzLDExICs1MDQsMTEgQEAgR19DT05TVF9SRVRVUk4gZ2NoYXIq IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X25hbWUoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICovCiBX ZWJLaXRXZWJGcmFtZSogd2Via2l0X3dlYl9mcmFtZV9nZXRfcGFyZW50KFdlYktpdFdlYkZyYW1l KiBmcmFtZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1F KGZyYW1lKSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9G UkFNRShmcmFtZSksIDApOwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwog ICAgIGlmICghY29yZUZyYW1lKQotICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgcmV0dXJu IDA7CiAKICAgICByZXR1cm4ga2l0KGNvcmVGcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSk7CiB9CkBA IC01NzQsNyArNTc1LDcgQEAgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfc3RyaW5nKFdlYktp dFdlYkZyYW1lKiBmcmFtZSwgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGMKICAgICBnX3JldHVybl9p Zl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpKTsKICAgICBnX3JldHVybl9pZl9mYWls KGNvbnRlbnQpOwogCi0gICAgd2Via2l0X3dlYl9mcmFtZV9sb2FkX2RhdGEoZnJhbWUsIGNvbnRl bnQsIGNvbnRlbnRNaW1lVHlwZSwgY29udGVudEVuY29kaW5nLCBiYXNlVXJpLCBOVUxMKTsKKyAg ICB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfZGF0YShmcmFtZSwgY29udGVudCwgY29udGVudE1pbWVU eXBlLCBjb250ZW50RW5jb2RpbmcsIGJhc2VVcmksIDApOwogfQogCiAvKioKQEAgLTU5NSw3ICs1 OTYsNyBAQCB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfbG9hZF9hbHRlcm5hdGVfc3RyaW5nKFdlYktp dFdlYkZyYW1lKiBmcmFtZSwgY29uc3QgZ2NoYXIqCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJL SVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChjb250ZW50KTsK IAotICAgIHdlYmtpdF93ZWJfZnJhbWVfbG9hZF9kYXRhKGZyYW1lLCBjb250ZW50LCBOVUxMLCBO VUxMLCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCk7CisgICAgd2Via2l0X3dlYl9mcmFtZV9sb2Fk X2RhdGEoZnJhbWUsIGNvbnRlbnQsIDAsIDAsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMKTsKIH0K IAogLyoqCkBAIC02NzQsMTIgKzY3NSwxMiBAQCB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfcmVsb2Fk KFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKICAqLwogV2ViS2l0V2ViRnJhbWUqIHdlYmtpdF93ZWJf ZnJhbWVfZmluZF9mcmFtZShXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdjaGFyKiBuYW1l KQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUp LCBOVUxMKTsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChuYW1lLCBOVUxMKTsKKyAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgMCk7CisgICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwobmFtZSwgMCk7CiAKICAgICBGcmFtZSogY29yZUZyYW1lID0gY29y ZShmcmFtZSk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCi0gICAgICAgIHJldHVybiBOVUxMOworICAg ICAgICByZXR1cm4gMDsKIAogICAgIFN0cmluZyBuYW1lU3RyaW5nID0gU3RyaW5nOjpmcm9tVVRG OChuYW1lKTsKICAgICByZXR1cm4ga2l0KGNvcmVGcmFtZS0+dHJlZSgpLT5maW5kKEF0b21pY1N0 cmluZyhuYW1lU3RyaW5nKSkpOwpAQCAtNjk2LDExICs2OTcsMTEgQEAgV2ViS2l0V2ViRnJhbWUq IHdlYmtpdF93ZWJfZnJhbWVfZmluZF9mcmFtZShXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0 IGdjaGFyKgogICovCiBKU0dsb2JhbENvbnRleHRSZWYgd2Via2l0X3dlYl9mcmFtZV9nZXRfZ2xv YmFsX2NvbnRleHQoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogewotICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCBOVUxMKTsKKyAgICBnX3JldHVybl92 YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgMCk7CiAKICAgICBGcmFtZSog Y29yZUZyYW1lID0gY29yZShmcmFtZSk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCi0gICAgICAgIHJl dHVybiBOVUxMOworICAgICAgICByZXR1cm4gMDsKIAogICAgIHJldHVybiB0b0dsb2JhbFJlZihj b3JlRnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QobWFpblRocmVhZE5vcm1hbFdvcmxkKCkp LT5nbG9iYWxFeGVjKCkpOwogfQpAQCAtNzE3LDcgKzcxOCw3IEBAIEpTR2xvYmFsQ29udGV4dFJl ZiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9nbG9iYWxfY29udGV4dChXZWJLaXRXZWJGcmFtZSogZnJh bWUpCiAgKi8KIFdlYktpdFdlYkRhdGFTb3VyY2UqIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2RhdGFf c291cmNlKFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFp bChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgTlVMTCk7CisgICAgZ19yZXR1cm5fdmFsX2lm X2ZhaWwoV0VCS0lUX0lTX1dFQl9GUkFNRShmcmFtZSksIDApOwogCiAgICAgRnJhbWUqIGNvcmVG cmFtZSA9IGNvcmUoZnJhbWUpOwogICAgIHJldHVybiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9kYXRh X3NvdXJjZV9mcm9tX2NvcmVfbG9hZGVyKGNvcmVGcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9h ZGVyKCkpOwpAQCAtNzM5LDcgKzc0MCw3IEBAIFdlYktpdFdlYkRhdGFTb3VyY2UqIHdlYmtpdF93 ZWJfZnJhbWVfZ2V0X2RhdGFfc291cmNlKFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKICAqLwogV2Vi S2l0V2ViRGF0YVNvdXJjZSogd2Via2l0X3dlYl9mcmFtZV9nZXRfcHJvdmlzaW9uYWxfZGF0YV9z b3VyY2UoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWls KFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpLCBOVUxMKTsKKyAgICBnX3JldHVybl92YWxfaWZf ZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSwgMCk7CiAKICAgICBGcmFtZSogY29yZUZy YW1lID0gY29yZShmcmFtZSk7CiAgICAgcmV0dXJuIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2RhdGFf c291cmNlX2Zyb21fY29yZV9sb2FkZXIoY29yZUZyYW1lLT5sb2FkZXIoKS0+cHJvdmlzaW9uYWxE b2N1bWVudExvYWRlcigpKTsKQEAgLTgwNCw3ICs4MDUsNyBAQCBHdGtQcmludE9wZXJhdGlvblJl c3VsdCB3ZWJraXRfd2ViX2ZyYW1lX3ByaW50X2Z1bGwoV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBH dGtQcgogICAgIEd0a1dpZGdldCogdG9wTGV2ZWwgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChH VEtfV0lER0VUKHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KGZyYW1lKSkpOwogCiAgICAg aWYgKCFndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcExldmVsKSkKLSAgICAgICAgdG9wTGV2ZWwg PSBOVUxMOworICAgICAgICB0b3BMZXZlbCA9IDA7CiAKICAgICBGcmFtZSogY29yZUZyYW1lID0g Y29yZShmcmFtZSk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCkBAIC05MzMsNyArOTM0LDcgQEAgV2Vi S2l0U2VjdXJpdHlPcmlnaW4qIHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3NlY3VyaXR5X29yaWdpbihX ZWJLaXRXZWJGcmFtZSogZnJhbWUKIHsKICAgICBXZWJLaXRXZWJGcmFtZVByaXZhdGUqIHByaXYg PSBmcmFtZS0+cHJpdjsKICAgICBpZiAoIXByaXYtPmNvcmVGcmFtZSB8fCAhcHJpdi0+Y29yZUZy YW1lLT5kb2N1bWVudCgpIHx8ICFwcml2LT5jb3JlRnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCkpCi0gICAgICAgIHJldHVybiBOVUxMOworICAgICAgICByZXR1cm4gMDsKIAogICAg IGlmIChwcml2LT5vcmlnaW4gJiYgcHJpdi0+b3JpZ2luLT5wcml2LT5jb3JlT3JpZ2luLmdldCgp ID09IHByaXYtPmNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSkKICAgICAg ICAgcmV0dXJuIHByaXYtPm9yaWdpbjsKQEAgLTk2MiwxMSArOTYzLDExIEBAIFdlYktpdE5ldHdv cmtSZXNwb25zZSogd2Via2l0X3dlYl9mcmFtZV9nZXRfbmV0d29ya19yZXNwb25zZShXZWJLaXRX ZWJGcmFtZSogZnJhCiB7CiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwogICAg IGlmICghY29yZUZyYW1lKQotICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgcmV0dXJuIDA7 CiAKICAgICBXZWJDb3JlOjpEb2N1bWVudExvYWRlciogbG9hZGVyID0gY29yZUZyYW1lLT5sb2Fk ZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsKICAgICBpZiAoIWxvYWRlcikKLSAgICAgICAg cmV0dXJuIE5VTEw7CisgICAgICAgIHJldHVybiAwOwogCiAgICAgcmV0dXJuIGtpdE5ldyhsb2Fk ZXItPnJlc3BvbnNlKCkpOwogfQo=