122499 2013-10-08 01:22:39 -0700 [Mac] Eliminate use of deleteAllValues in ProxyInstance 2013-10-08 07:55:27 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 73757 1 darin darin andersca commit-queue oldest_to_newest 937451 0 darin 2013-10-08 01:22:39 -0700 Eliminate use of deleteAllValues in ProxyInstance 937452 1 213675 darin 2013-10-08 01:25:14 -0700 Created attachment 213675 Patch 937511 2 213675 commit-queue 2013-10-08 07:55:26 -0700 Comment on attachment 213675 Patch Clearing flags on attachment: 213675 Committed r157101: <http://trac.webkit.org/changeset/157101> 937512 3 commit-queue 2013-10-08 07:55:27 -0700 All reviewed patches have been landed. Closing bug. 213675 2013-10-08 01:25:14 -0700 2013-10-08 07:55:26 -0700 Patch bug-122499-20131008012513.patch text/plain 9419 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggOTliMzQ2OGRm NmE0NDEwZDI5ZDI4MjM1YTk1NzA3ZDM3YzUwMmQ1Mi4uNjZiMWIwMGQwYTgwYjY3Njk4ZmM5MTRk MDI2NzA1YTdlNmM1NDNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEz LTEwLTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBFbGltaW5h dGUgdXNlIG9mIGRlbGV0ZUFsbFZhbHVlcyBpbiBQcm94eUluc3RhbmNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0OTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL1Byb3h5 SW5zdGFuY2UuaDogVXNlIHVuaXF1ZV9wdHIgZm9yIG1hcCB2YWx1ZXMgaW4gbV9maWVsZHMgYW5k IG1fbWV0aG9kcy4KKworICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL1Byb3h5SW5zdGFuY2UubW06 CisgICAgICAgIChXZWJLaXQ6OlByb3h5SW5zdGFuY2U6On5Qcm94eUluc3RhbmNlKTogUmVtb3Zl ZCBjYWxscyB0byBkZWxldGVBbGxWYWx1ZXMuCisgICAgICAgIChXZWJLaXQ6OlByb3h5SW5zdGFu Y2U6Om1ldGhvZE5hbWVkKTogVXNlIG1ha2VfdW5pcXVlIGFuZCBnZXQgdG8gZGVhbCB3aXRoIG1h cCBlbnRyaWVzCisgICAgICAgIHRoYXQgYXJlIHVuaXF1ZV9wdHIuIEFsc28gZml4ZWQgYSBidWcg d2hlcmUgdGhpcyB3b3VsZCBkbyBhbiBleHBlbnNpdmUgbm8tb3AgaWYgdGhlIG1hcAorICAgICAg ICBhbHJlYWR5IGhhZCBhbiBlbnRyeSB3aXRoIGEgbnVsbCBpbiBpdC4gV2Ugd291bGQgY2FsbCB0 aGUgcGx1Zy1pbiwgYnV0IGV2ZW50dWFsbHkKKyAgICAgICAgaXNOZXdFbnRyeSB3b3VsZCBiZSBm YWxzZSBzbyB3ZSB3b3VsZCByZXR1cm4gbnVsbC4KKyAgICAgICAgKFdlYktpdDo6UHJveHlJbnN0 YW5jZTo6ZmllbGROYW1lZCk6IFVzZSBtYWtlX3VuaXF1ZSBhbmQgZ2V0IHRvIGRlYWwgd2l0aCBt YXAgZW50cmllcworICAgICAgICB0aGF0IGFyZSB1bmlxdWVfcHRyLgorCisyMDEzLTEwLTA4ICBE YXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKwogICAgICAgICBDaGFuZ2UgTmV0c2NhcGVQ bHVnaW5JbnN0YW5jZVByb3h5OjptX3JlcGxpZXMgdG8gdXNlIHVuaXF1ZV9wdHIgaW5zdGVhZCBv ZiBkZWxldGVBbGxWYWx1ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMjQ5MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5z L0hvc3RlZC9Qcm94eUluc3RhbmNlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3Rl ZC9Qcm94eUluc3RhbmNlLmgKaW5kZXggZjNlNTMyZThkMWZlOGFlNGM4NDdmZWZiM2RlMzlkZjkx YzYxZGM1OS4uMDgwZjllMTMyYzkzNDA3ZWFmNDU3YWZkYjY0MWUzZjRlMzkzZjYwNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvUHJveHlJbnN0YW5jZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1Byb3h5SW5zdGFuY2UuaApAQCAt MTAwLDggKzEwMCw4IEBAIHByaXZhdGU6CiAKICAgICBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHkqIG1faW5zdGFuY2VQcm94eTsKICAgICB1aW50MzJfdCBtX29iamVjdElEOwotICAgIEhhc2hN YXA8UmVmUHRyPFN0cmluZ0ltcGw+LCBKU0M6OkJpbmRpbmdzOjpGaWVsZCo+IG1fZmllbGRzOwot ICAgIEhhc2hNYXA8UmVmUHRyPFN0cmluZ0ltcGw+LCBKU0M6OkJpbmRpbmdzOjpNZXRob2QqPiBt X21ldGhvZHM7CisgICAgSGFzaE1hcDxSZWZQdHI8U3RyaW5nSW1wbD4sIHN0ZDo6dW5pcXVlX3B0 cjxKU0M6OkJpbmRpbmdzOjpGaWVsZD4+IG1fZmllbGRzOworICAgIEhhc2hNYXA8UmVmUHRyPFN0 cmluZ0ltcGw+LCBzdGQ6OnVuaXF1ZV9wdHI8SlNDOjpCaW5kaW5nczo6TWV0aG9kPj4gbV9tZXRo b2RzOwogfTsKICAgICAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMv SG9zdGVkL1Byb3h5SW5zdGFuY2UubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3Rl ZC9Qcm94eUluc3RhbmNlLm1tCmluZGV4IGRlMzc1NGZlMmRmM2E3MTJjNTg4OGRkYmY2MDZmYjhi ZDQ3YzkyYjcuLjZlNjAxNDk5ZGNjYjI5ZGRlNWE0OTkxMjVjZWQzMTc1ZGNkZDcyYTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1Byb3h5SW5zdGFuY2UubW0K KysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvUHJveHlJbnN0YW5jZS5tbQpA QCAtMTIwLDkgKzEyMCw2IEBAIFByb3h5SW5zdGFuY2U6OlByb3h5SW5zdGFuY2UoUGFzc1JlZlB0 cjxSb290T2JqZWN0PiByb290T2JqZWN0LCBOZXRzY2FwZVBsdWdpbkluCiAKIFByb3h5SW5zdGFu Y2U6On5Qcm94eUluc3RhbmNlKCkKIHsKLSAgICBkZWxldGVBbGxWYWx1ZXMobV9maWVsZHMpOwot ICAgIGRlbGV0ZUFsbFZhbHVlcyhtX21ldGhvZHMpOwotCiAgICAgaWYgKCFtX2luc3RhbmNlUHJv eHkpCiAgICAgICAgIHJldHVybjsKICAgICAKQEAgLTIzNyw5ICsyMzQsNyBAQCBib29sIFByb3h5 SW5zdGFuY2U6OnN1cHBvcnRzSW52b2tlRGVmYXVsdE1ldGhvZCgpIGNvbnN0CiAgICAgCiAgICAg dWludDMyX3QgcmVxdWVzdElEID0gbV9pbnN0YW5jZVByb3h5LT5uZXh0UmVxdWVzdElEKCk7CiAg ICAgCi0gICAgaWYgKF9XS1BITlBPYmplY3RIYXNJbnZva2VEZWZhdWx0TWV0aG9kKG1faW5zdGFu Y2VQcm94eS0+aG9zdFByb3h5KCktPnBvcnQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9pbnN0YW5jZVByb3h5LT5wbHVnaW5JRCgpLCByZXF1ZXN0SUQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fb2JqZWN0SUQp ICE9IEtFUk5fU1VDQ0VTUykKKyAgICBpZiAoX1dLUEhOUE9iamVjdEhhc0ludm9rZURlZmF1bHRN ZXRob2QobV9pbnN0YW5jZVByb3h5LT5ob3N0UHJveHkoKS0+cG9ydCgpLCBtX2luc3RhbmNlUHJv eHktPnBsdWdpbklEKCksIHJlcXVlc3RJRCwgbV9vYmplY3RJRCkgIT0gS0VSTl9TVUNDRVNTKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCiAgICAgYXV0byByZXBseSA9IHdhaXRGb3JSZXBs eTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4ocmVxdWVzdElEKTsK QEAgLTI1OCw5ICsyNTMsNyBAQCBib29sIFByb3h5SW5zdGFuY2U6OnN1cHBvcnRzQ29uc3RydWN0 KCkgY29uc3QKICAgICAKICAgICB1aW50MzJfdCByZXF1ZXN0SUQgPSBtX2luc3RhbmNlUHJveHkt Pm5leHRSZXF1ZXN0SUQoKTsKICAgICAKLSAgICBpZiAoX1dLUEhOUE9iamVjdEhhc0NvbnN0cnVj dE1ldGhvZChtX2luc3RhbmNlUHJveHktPmhvc3RQcm94eSgpLT5wb3J0KCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9pbnN0YW5jZVByb3h5LT5wbHVnaW5JRCgp LCByZXF1ZXN0SUQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9v YmplY3RJRCkgIT0gS0VSTl9TVUNDRVNTKQorICAgIGlmIChfV0tQSE5QT2JqZWN0SGFzQ29uc3Ry dWN0TWV0aG9kKG1faW5zdGFuY2VQcm94eS0+aG9zdFByb3h5KCktPnBvcnQoKSwgbV9pbnN0YW5j ZVByb3h5LT5wbHVnaW5JRCgpLCByZXF1ZXN0SUQsIG1fb2JqZWN0SUQpICE9IEtFUk5fU1VDQ0VT UykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIGF1dG8gcmVwbHkgPSB3YWl0Rm9y UmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+KHJlcXVlc3RJ RCk7CkBAIC0zNDgsMTcgKzM0MSwxMyBAQCBNZXRob2QqIFByb3h5SW5zdGFuY2U6Om1ldGhvZE5h bWVkKFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCiAgICAgCiAgICAgLy8gSWYgd2UgYWxyZWFk eSBoYXZlIGFuIGVudHJ5IGluIHRoZSBtYXAsIHVzZSBpdC4KICAgICBhdXRvIGV4aXN0aW5nTWFw RW50cnkgPSBtX21ldGhvZHMuZmluZChuYW1lLmltcGwoKSk7Ci0gICAgaWYgKGV4aXN0aW5nTWFw RW50cnkgIT0gbV9tZXRob2RzLmVuZCgpKSB7Ci0gICAgICAgIGlmIChleGlzdGluZ01hcEVudHJ5 LT52YWx1ZSkKLSAgICAgICAgICAgIHJldHVybiBleGlzdGluZ01hcEVudHJ5LT52YWx1ZTsKLSAg ICB9CisgICAgaWYgKGV4aXN0aW5nTWFwRW50cnkgIT0gbV9tZXRob2RzLmVuZCgpKQorICAgICAg ICByZXR1cm4gZXhpc3RpbmdNYXBFbnRyeS0+dmFsdWUuZ2V0KCk7CiAgICAgCiAgICAgdWludDY0 X3QgbWV0aG9kTmFtZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KF9OUE5fR2V0U3RyaW5n SWRlbnRpZmllcihuYW1lLmFzY2lpKCkuZGF0YSgpKSk7CiAgICAgdWludDMyX3QgcmVxdWVzdElE ID0gbV9pbnN0YW5jZVByb3h5LT5uZXh0UmVxdWVzdElEKCk7CiAgICAgCi0gICAgaWYgKF9XS1BI TlBPYmplY3RIYXNNZXRob2QobV9pbnN0YW5jZVByb3h5LT5ob3N0UHJveHkoKS0+cG9ydCgpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1faW5zdGFuY2VQcm94eS0+cGx1Z2luSUQo KSwgcmVxdWVzdElELAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fb2JqZWN0SUQs IG1ldGhvZE5hbWUpICE9IEtFUk5fU1VDQ0VTUykKKyAgICBpZiAoX1dLUEhOUE9iamVjdEhhc01l dGhvZChtX2luc3RhbmNlUHJveHktPmhvc3RQcm94eSgpLT5wb3J0KCksIG1faW5zdGFuY2VQcm94 eS0+cGx1Z2luSUQoKSwgcmVxdWVzdElELCBtX29iamVjdElELCBtZXRob2ROYW1lKSAhPSBLRVJO X1NVQ0NFU1MpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIAogICAgIGF1dG8gcmVwbHkg PSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+ KHJlcXVlc3RJRCk7CkBAIC0zNzEsOSArMzYwLDkgQEAgTWV0aG9kKiBQcm94eUluc3RhbmNlOjpt ZXRob2ROYW1lZChQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQogICAgIC8vIEFkZCBhIG5ldyBl bnRyeSB0byB0aGUgbWFwIHVubGVzcyBhbiBlbnRyeSB3YXMgYWRkZWQgd2hpbGUgd2Ugd2VyZSBp biB3YWl0Rm9yUmVwbHkuCiAgICAgYXV0byBtYXBBZGRSZXN1bHQgPSBtX21ldGhvZHMuYWRkKG5h bWUuaW1wbCgpLCBudWxscHRyKTsKICAgICBpZiAobWFwQWRkUmVzdWx0LmlzTmV3RW50cnkgJiYg cmVwbHktPm1fcmVzdWx0KQotICAgICAgICBtYXBBZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0g bmV3IFByb3h5TWV0aG9kKG1ldGhvZE5hbWUpOworICAgICAgICBtYXBBZGRSZXN1bHQuaXRlcmF0 b3ItPnZhbHVlID0gc3RkOjptYWtlX3VuaXF1ZTxQcm94eU1ldGhvZD4obWV0aG9kTmFtZSk7CiAK LSAgICByZXR1cm4gbWFwQWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsKKyAgICByZXR1cm4gbWFw QWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIAogRmllbGQqIFByb3h5SW5zdGFu Y2U6OmZpZWxkTmFtZWQoUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKQEAgLTM4OCwxNCArMzc3 LDEyIEBAIEZpZWxkKiBQcm94eUluc3RhbmNlOjpmaWVsZE5hbWVkKFByb3BlcnR5TmFtZSBwcm9w ZXJ0eU5hbWUpCiAgICAgLy8gSWYgd2UgYWxyZWFkeSBoYXZlIGFuIGVudHJ5IGluIHRoZSBtYXAs IHVzZSBpdC4KICAgICBhdXRvIGV4aXN0aW5nTWFwRW50cnkgPSBtX2ZpZWxkcy5maW5kKG5hbWUu aW1wbCgpKTsKICAgICBpZiAoZXhpc3RpbmdNYXBFbnRyeSAhPSBtX2ZpZWxkcy5lbmQoKSkKLSAg ICAgICAgcmV0dXJuIGV4aXN0aW5nTWFwRW50cnktPnZhbHVlOworICAgICAgICByZXR1cm4gZXhp c3RpbmdNYXBFbnRyeS0+dmFsdWUuZ2V0KCk7CiAgICAgCiAgICAgdWludDY0X3QgaWRlbnRpZmll ciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KF9OUE5fR2V0U3RyaW5nSWRlbnRpZmllcihu YW1lLmFzY2lpKCkuZGF0YSgpKSk7CiAgICAgdWludDMyX3QgcmVxdWVzdElEID0gbV9pbnN0YW5j ZVByb3h5LT5uZXh0UmVxdWVzdElEKCk7CiAgICAgCi0gICAgaWYgKF9XS1BITlBPYmplY3RIYXNQ cm9wZXJ0eShtX2luc3RhbmNlUHJveHktPmhvc3RQcm94eSgpLT5wb3J0KCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtX2luc3RhbmNlUHJveHktPnBsdWdpbklEKCksIHJlcXVl c3RJRCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fb2JqZWN0SUQsIGlkZW50 aWZpZXIpICE9IEtFUk5fU1VDQ0VTUykKKyAgICBpZiAoX1dLUEhOUE9iamVjdEhhc1Byb3BlcnR5 KG1faW5zdGFuY2VQcm94eS0+aG9zdFByb3h5KCktPnBvcnQoKSwgbV9pbnN0YW5jZVByb3h5LT5w bHVnaW5JRCgpLCByZXF1ZXN0SUQsIG1fb2JqZWN0SUQsIGlkZW50aWZpZXIpICE9IEtFUk5fU1VD Q0VTUykKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgCiAgICAgYXV0byByZXBseSA9IHdh aXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4ocmVx dWVzdElEKTsKQEAgLTQwOCw4ICszOTUsOCBAQCBGaWVsZCogUHJveHlJbnN0YW5jZTo6ZmllbGRO YW1lZChQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQogICAgIC8vIEFkZCBhIG5ldyBlbnRyeSB0 byB0aGUgbWFwIHVubGVzcyBhbiBlbnRyeSB3YXMgYWRkZWQgd2hpbGUgd2Ugd2VyZSBpbiB3YWl0 Rm9yUmVwbHkuCiAgICAgYXV0byBtYXBBZGRSZXN1bHQgPSBtX2ZpZWxkcy5hZGQobmFtZS5pbXBs KCksIG51bGxwdHIpOwogICAgIGlmIChtYXBBZGRSZXN1bHQuaXNOZXdFbnRyeSAmJiByZXBseS0+ bV9yZXN1bHQpCi0gICAgICAgIG1hcEFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSBuZXcgUHJv eHlGaWVsZChpZGVudGlmaWVyKTsKLSAgICByZXR1cm4gbWFwQWRkUmVzdWx0Lml0ZXJhdG9yLT52 YWx1ZTsKKyAgICAgICAgbWFwQWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IHN0ZDo6bWFrZV91 bmlxdWU8UHJveHlGaWVsZD4oaWRlbnRpZmllcik7CisgICAgcmV0dXJuIG1hcEFkZFJlc3VsdC5p dGVyYXRvci0+dmFsdWUuZ2V0KCk7CiB9CiAKIEpTQzo6SlNWYWx1ZSBQcm94eUluc3RhbmNlOjpm aWVsZFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgRmllbGQqIGZpZWxkKSBjb25zdApAQCAt NDIwLDkgKzQwNyw3IEBAIEpTQzo6SlNWYWx1ZSBQcm94eUluc3RhbmNlOjpmaWVsZFZhbHVlKEV4 ZWNTdGF0ZSogZXhlYywgY29uc3QgRmllbGQqIGZpZWxkKSBjb25zCiAgICAgdWludDY0X3Qgc2Vy dmVySWRlbnRpZmllciA9IHN0YXRpY19jYXN0PGNvbnN0IFByb3h5RmllbGQqPihmaWVsZCktPnNl cnZlcklkZW50aWZpZXIoKTsKICAgICB1aW50MzJfdCByZXF1ZXN0SUQgPSBtX2luc3RhbmNlUHJv eHktPm5leHRSZXF1ZXN0SUQoKTsKICAgICAKLSAgICBpZiAoX1dLUEhOUE9iamVjdEdldFByb3Bl cnR5KG1faW5zdGFuY2VQcm94eS0+aG9zdFByb3h5KCktPnBvcnQoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1faW5zdGFuY2VQcm94eS0+cGx1Z2luSUQoKSwgcmVxdWVzdElE LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9vYmplY3RJRCwgc2VydmVySWRl bnRpZmllcikgIT0gS0VSTl9TVUNDRVNTKQorICAgIGlmIChfV0tQSE5QT2JqZWN0R2V0UHJvcGVy dHkobV9pbnN0YW5jZVByb3h5LT5ob3N0UHJveHkoKS0+cG9ydCgpLCBtX2luc3RhbmNlUHJveHkt PnBsdWdpbklEKCksIHJlcXVlc3RJRCwgbV9vYmplY3RJRCwgc2VydmVySWRlbnRpZmllcikgIT0g S0VSTl9TVUNDRVNTKQogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICAKICAgICBh dXRvIHJlcGx5ID0gd2FpdEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9v bGVhbkFuZERhdGFSZXBseT4ocmVxdWVzdElEKTsKQEAgLTQ0Niw5ICs0MzEsNyBAQCB2b2lkIFBy b3h5SW5zdGFuY2U6OnNldEZpZWxkVmFsdWUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBGaWVsZCog ZmllbGQsIEpTVmFsdWUgdgogCiAgICAgbV9pbnN0YW5jZVByb3h5LT5tYXJzaGFsVmFsdWUoZXhl YywgdmFsdWUsIHZhbHVlRGF0YSwgdmFsdWVMZW5ndGgpOwogICAgIG1faW5zdGFuY2VQcm94eS0+ cmV0YWluTG9jYWxPYmplY3QodmFsdWUpOwotICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBfV0tQSE5Q T2JqZWN0U2V0UHJvcGVydHkobV9pbnN0YW5jZVByb3h5LT5ob3N0UHJveHkoKS0+cG9ydCgpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9pbnN0YW5j ZVByb3h5LT5wbHVnaW5JRCgpLCByZXF1ZXN0SUQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtX29iamVjdElELCBzZXJ2ZXJJZGVudGlmaWVyLCB2YWx1 ZURhdGEsIHZhbHVlTGVuZ3RoKTsKKyAgICBrZXJuX3JldHVybl90IGtyID0gX1dLUEhOUE9iamVj dFNldFByb3BlcnR5KG1faW5zdGFuY2VQcm94eS0+aG9zdFByb3h5KCktPnBvcnQoKSwgbV9pbnN0 YW5jZVByb3h5LT5wbHVnaW5JRCgpLCByZXF1ZXN0SUQsIG1fb2JqZWN0SUQsIHNlcnZlcklkZW50 aWZpZXIsIHZhbHVlRGF0YSwgdmFsdWVMZW5ndGgpOwogICAgIG1pZ19kZWFsbG9jYXRlKHJlaW50 ZXJwcmV0X2Nhc3Q8dm1fYWRkcmVzc190Pih2YWx1ZURhdGEpLCB2YWx1ZUxlbmd0aCk7CiAgICAg aWYgKG1faW5zdGFuY2VQcm94eSkKICAgICAgICAgbV9pbnN0YW5jZVByb3h5LT5yZWxlYXNlTG9j YWxPYmplY3QodmFsdWUpOwpAQCAtNDY0LDEyICs0NDcsMTAgQEAgdm9pZCBQcm94eUluc3RhbmNl OjppbnZhbGlkYXRlKCkKICAgICBBU1NFUlQobV9pbnN0YW5jZVByb3h5KTsKICAgICAKICAgICBp ZiAoTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqIGhvc3RQcm94eSA9IG1faW5zdGFuY2VQcm94eS0+ aG9zdFByb3h5KCkpCi0gICAgICAgIF9XS1BITlBPYmplY3RSZWxlYXNlKGhvc3RQcm94eS0+cG9y dCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2luc3RhbmNlUHJveHktPnBsdWdp bklEKCksIG1fb2JqZWN0SUQpOworICAgICAgICBfV0tQSE5QT2JqZWN0UmVsZWFzZShob3N0UHJv eHktPnBvcnQoKSwgbV9pbnN0YW5jZVByb3h5LT5wbHVnaW5JRCgpLCBtX29iamVjdElEKTsKICAg ICBtX2luc3RhbmNlUHJveHkgPSBudWxscHRyOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IAogI2VuZGlmIC8vIFVTRShQTFVHSU5fSE9TVF9QUk9DRVNTKSAmJiBFTkFCTEUoTkVUU0NBUEVf UExVR0lOX0FQSSkKLQo=