11379 2006-10-21 19:37:27 -0700 crash seen in editing tests (in new DeleteButtonController) 2006-10-21 20:04:55 -0700 1 1 1 Unclassified WebKit HTML Editing 420+ Mac OS X 10.4 RESOLVED FIXED P1 Major --- 1 darin darin oldest_to_newest 51364 0 darin 2006-10-21 19:37:27 -0700 I can reproduce a crash every time in the editing layout tests. I have a fix in the works. 51365 1 11180 darin 2006-10-21 19:52:26 -0700 Created attachment 11180 patch that fixes assertion failure, does some related cleanup 51340 2 11180 andersca 2006-10-21 19:56:46 -0700 Comment on attachment 11180 patch that fixes assertion failure, does some related cleanup r=me 51341 3 darin 2006-10-21 20:04:55 -0700 Committed revision 17202. 11180 2006-10-21 19:52:26 -0700 2006-10-21 19:56:46 -0700 patch that fixes assertion failure, does some related cleanup DeleteButtonAssertionFailurePatch.txt text/plain 18013 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzIwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTIgQEAKKzIwMDYtMTAtMjEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzc5CisgICAgICAgICAg YXNzZXJ0aW9uIGZhaWx1cmUgc2VlbiBpbiBlZGl0aW5nIHRlc3RzIChpbiBuZXcgRGVsZXRlQnV0 dG9uQ29udHJvbGxlcikKKworICAgICAgICBJIGNsZWFuZWQgdXAgdGhlIHJlbGF0aW9uc2hpcCBi ZXR3ZWVuIHRoZSBGcmFtZSwgRWRpdG9yLCBFZGl0b3JDbGllbnQsIGFuZAorICAgICAgICBEZWxl dGVCdXR0b25Db250cm9sbGVyIGEgYml0IHdoaWxlIGFsc28gbWFraW5nIHRoZSBzaW1wbGUgY2hh bmdlIHRvIGZpeCB0aGUKKyAgICAgICAgYXNzZXJ0aW9uIGZhaWx1cmUuCisKKyAgICAgICAgKiBi cmlkZ2UvbWFjL0ZyYW1lTWFjLmg6IENoYW5nZSBFZGl0b3JDbGllbnQgcGFyYW1ldGVyIHRvIGEg UGFzc1JlZlB0ciBzaW5jZSB3ZSB0YWtlIG93bmVyc2hpcC4KKyAgICAgICAgKiBicmlkZ2UvbWFj L0ZyYW1lTWFjLm1tOiAoV2ViQ29yZTo6RnJhbWVNYWM6OkZyYW1lTWFjKToKKworICAgICAgICAq IHBhZ2UvRnJhbWUuaDogQ2hhbmdlIEVkaXRvckNsaWVudCBwYXJhbWV0ZXIgdG8gYSBQYXNzUmVm UHRyIHNpbmNlIHdlIHRha2Ugb3duZXJzaGlwLgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OkZyYW1lKTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZTo6YXBwbGllZEVkaXRpbmcpOiBSZW1vdmVkIHVubmVlZGVkIHBhcmFtZXRlciB0byB0 aGUgcmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzCisgICAgICAgIGZ1bmN0aW9uLCBhbmQgbW92ZWQg aXQgdG8gRWRpdG9yIHJhdGhlciB0aGFuIHJpZ2h0IG9uIHRoZSBEZWxldGVCdXR0b25Db250cm9s bGVyLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnVuYXBwbGllZEVkaXRpbmcpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpyZWFwcGxpZWRFZGl0aW5nKTogRGl0dG8uCisgICAg ICAgICogcGFnZS9GcmFtZVByaXZhdGUuaDogKFdlYkNvcmU6OkZyYW1lUHJpdmF0ZTo6RnJhbWVQ cml2YXRlKTogTW9yZSBvZiB0aGUgc2FtZS4KKworICAgICAgICAqIGVkaXRpbmcvRGVsZXRlQnV0 dG9uQ29udHJvbGxlci5oOgorICAgICAgICAqIGVkaXRpbmcvRGVsZXRlQnV0dG9uQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZWxldGVCdXR0b25Db250cm9sbGVyOjpEZWxldGVC dXR0b25Db250cm9sbGVyKTogUmVwbGFjZWQgRWRpdG9yKiB3aXRoIGEgRnJhbWUqLgorICAgICAg ICBUaGUgZ2VuZXJhbCBwYXR0ZXJuIGlzIHRoYXQgd2UgYWx3YXlzIHVzZSB0aGUgRnJhbWUqIGFz IHRoZSBmcmFtZSBpZGVudGlmaWVyLiBTZWUgRnJhbWVUcmVlLAorICAgICAgICBmb3IgZXhhbXBs ZS4KKyAgICAgICAgKFdlYkNvcmU6OmVuY2xvc2luZ1RhYmxlVG9EZWxldGUpOiBBZGRlZC4gSGVs cGVyIGZ1bmN0aW9uIHVzZWQgYnkgdGhlIHJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24KKyAgICAg ICAgZnVuY3Rpb24uIEluY2x1ZGVzIGFuIGFkZGl0aW9uYWwgY2hlY2sgZm9yIHdoZXRoZXIgdGhl IGNvbnRhaW5lciBpcyBjb250ZW50RWRpdGFibGUsIHdoaWNoCisgICAgICAgIHdhcyBtaXNzaW5n IGZyb20gdGhlIG9sZCB2ZXJzaW9uLiBUaGlzIHByZXZlbnRzIHRoZSBhc3NlcnRpb24gZmFpbHVy ZS4KKyAgICAgICAgKFdlYkNvcmU6OkRlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb0No YW5nZWRTZWxlY3Rpb24pOiBSZXdyb3RlIHRvIHVzZSB0aGUgaGVscGVyLgorICAgICAgICAoV2Vi Q29yZTo6RGVsZXRlQnV0dG9uQ29udHJvbGxlcjo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKTog UmVtb3ZlZCB0aGUgdW5uZWNlc3NhcnkKKyAgICAgICAgc2VsZWN0aW9uIHBhcmFtZXRlci4gTm8g bmVlZCB0byBwYXNzIGluIHRoZSBzdGF0ZSBvZiB0aGUgZnJhbWUgc2luY2Ugd2UgY2FuIGdldCBp dCBpZiB3ZSBuZWVkIGl0LgorICAgICAgICAoV2ViQ29yZTo6RGVsZXRlQnV0dG9uQ29udHJvbGxl cjo6c2hvdyk6IFVwZGF0ZWQgdG8gdXNlIGZyYW1lIHBvaW50ZXIgcmF0aGVyIHRoYW4gZWRpdG9y IHBvaW50ZXIuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6IEZpeGVkIGZvcm1hdHRp bmcuIEV2ZW4gdGhlIHRlbXBvcmFyeSBwbGFjZWhvbGRlciBmdW5jdGlvbnMgc2hvdWxkIGJlCisg ICAgICAgIGZvcm1hdHRlZCBvbiBtdWx0aXBsZSBsaW5lcyBhcyB1c3VhbC4KKyAgICAgICAgKFdl YkNvcmU6OkVkaXRvcjo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbik6IEFkZGVkLiBGb3J3YXJk cyB0byB0aGUgZGVsZXRlIGJ1dHRvbiBjb250cm9sbGVyLgorICAgICAgICAoV2ViQ29yZTo6RWRp dG9yOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OkVkaXRvcjo6RWRpdG9yKTogQ2hhbmdlZCBFZGl0b3JDbGllbnQgcGFyYW1ldGVyIHRvIGEgUGFz c1JlZlB0ciBzaW5jZSB3ZSB0YWtlIG93bmVyc2hpcC4KKworICAgICAgICAqIGVkaXRpbmcvRWRp dG9yLmg6IENoYW5nZWQgdGhlIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIgdG8gdXNlIGFuIE93blB0 ciBpbnN0ZWFkIG9mIGJlaW5nCisgICAgICAgIGRlZmluZWQgaW5saW5lIHRvIGRlY291cGxlIHNv IHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBpbmNsdWRlIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIuaC4g VGhhdCB3YXkKKyAgICAgICAgY2hhbmdlcyB0byBEZWxldGVCdXR0b25Db250cm9sbGVyLmggY2F1 c2UgdmVyeSBsaXR0bGUgdG8gcmVjb21waWxlLgorCisgICAgICAgICogZWRpdGluZy9TZWxlY3Rp b25Db250cm9sbGVyLmNwcDogKFdlYkNvcmU6OlNlbGVjdGlvbkNvbnRyb2xsZXI6OnNldFNlbGVj dGlvbik6CisgICAgICAgIFVwZGF0ZWQgdG8gY2FsbCB0aGUgZWRpdG9yIGluc3RlYWQgb2YgdGhl IGRlbGV0ZSBidXR0b24gY29udHJvbGxlciBmb3IgdGhlIHNlbGVjdGlvbiBjaGFuZ2UuCisKIDIw MDYtMTAtMjEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFkYW0uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagkocmV2aXNpb24gMTcxOTgpCisrKyBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTA0NzcsNyArMTA0NzcsNiBAQAogCQkwODY3 RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi8gPSB7CiAJCQlpc2EgPSBQ QlhQcm9qZWN0OwogCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDE0OUMyODQzMDg5MDJCMTEw MDhBOUVGQyAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3QgIldlYkNv cmUiICovOwotCQkJY29tcGF0aWJpbGl0eVZlcnNpb24gPSAiWGNvZGUgMi40IjsKIAkJCWhhc1Nj YW5uZWRGb3JFbmNvZGluZ3MgPSAxOwogCQkJa25vd25SZWdpb25zID0gKAogCQkJCUVuZ2xpc2gs CkBAIC0xMDQ5Miw3ICsxMDQ5MSw2IEBACiAJCQlwcm9kdWN0UmVmR3JvdXAgPSAwMzQ3NjhERkZG MzhBNTA0MTFEQjlDOEIgLyogUHJvZHVjdHMgKi87CiAJCQlwcm9qZWN0RGlyUGF0aCA9ICIiOwog CQkJcHJvamVjdFJvb3QgPSAiIjsKLQkJCXNob3VsZENoZWNrQ29tcGF0aWJpbGl0eSA9IDE7CiAJ CQl0YXJnZXRzID0gKAogCQkJCTkzRjE5OEE1MDgyNDVFNTkwMDFFOUFCQyAvKiBXZWJDb3JlICov LAogCQkJCUREMDQxRkJFMDlEOUREQkUwMDEwQUYyQSAvKiBEZXJpdmVkIFNvdXJjZXMgKi8sCklu ZGV4OiBXZWJDb3JlL2JyaWRnZS9tYWMvRnJhbWVNYWMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2JyaWRnZS9tYWMvRnJhbWVNYWMuaAkocmV2aXNpb24gMTcxOTYpCisrKyBXZWJDb3JlL2JyaWRn ZS9tYWMvRnJhbWVNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDcgKzExNSw3IEBAIGVudW0g U2VsZWN0aW9uRGlyZWN0aW9uIHsKIGNsYXNzIEZyYW1lTWFjIDogcHVibGljIEZyYW1lCiB7CiBw dWJsaWM6Ci0gICAgRnJhbWVNYWMoUGFnZSosIEVsZW1lbnQqLCBFZGl0b3JDbGllbnQqKTsKKyAg ICBGcmFtZU1hYyhQYWdlKiwgRWxlbWVudCosIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50Pik7CiAg ICAgfkZyYW1lTWFjKCk7CiAgICAgCiAgICAgdm9pZCBjbGVhcigpOwpJbmRleDogV2ViQ29yZS9i cmlkZ2UvbWFjL0ZyYW1lTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL21hYy9G cmFtZU1hYy5tbQkocmV2aXNpb24gMTcxOTYpCisrKyBXZWJDb3JlL2JyaWRnZS9tYWMvRnJhbWVN YWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0OCw3ICsxNDgsNyBAQCBzdGF0aWMgU0VMIHNlbGVj dG9yRm9yS2V5RXZlbnQoY29uc3QgUGxhCiAgICAgcmV0dXJuIHNlbGVjdG9yOwogfQogCi1GcmFt ZU1hYzo6RnJhbWVNYWMoUGFnZSogcGFnZSwgRWxlbWVudCogb3duZXJFbGVtZW50LCBFZGl0b3JD bGllbnQqIGNsaWVudCkKK0ZyYW1lTWFjOjpGcmFtZU1hYyhQYWdlKiBwYWdlLCBFbGVtZW50KiBv d25lckVsZW1lbnQsIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50PiBjbGllbnQpCiAgICAgOiBGcmFt ZShwYWdlLCBvd25lckVsZW1lbnQsIGNsaWVudCkKICAgICAsIF9icmlkZ2UobmlsKQogICAgICwg X21vdXNlRG93blZpZXcobmlsKQpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZUJ1dHRvbkNv bnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9EZWxldGVCdXR0b25D b250cm9sbGVyLmNwcAkocmV2aXNpb24gMTcxOTYpCisrKyBXZWJDb3JlL2VkaXRpbmcvRGVsZXRl QnV0dG9uQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDM5ICs1Myw1MyBAQCBj b25zdCBjaGFyKiBjb25zdCBEZWxldGVCdXR0b25Db250cm9sbGVyCiBjb25zdCBjaGFyKiBjb25z dCBEZWxldGVCdXR0b25Db250cm9sbGVyOjpidXR0b25FbGVtZW50SWRlbnRpZmllciA9ICJXZWJL aXQtRWRpdGluZy1EZWxldGUtQnV0dG9uIjsKIGNvbnN0IGNoYXIqIGNvbnN0IERlbGV0ZUJ1dHRv bkNvbnRyb2xsZXI6Om91dGxpbmVFbGVtZW50SWRlbnRpZmllciA9ICJXZWJLaXQtRWRpdGluZy1E ZWxldGUtT3V0bGluZSI7CiAKLURlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OkRlbGV0ZUJ1dHRvbkNv bnRyb2xsZXIoRWRpdG9yKiBlZGl0b3IpCi0gICAgOiBtX2VkaXRvcihlZGl0b3IpCitEZWxldGVC dXR0b25Db250cm9sbGVyOjpEZWxldGVCdXR0b25Db250cm9sbGVyKEZyYW1lKiBmcmFtZSkKKyAg ICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBtX3dhc1N0YXRpY1Bvc2l0aW9uZWQoZmFsc2UpCiAg ICAgLCBtX3dhc0F1dG9aSW5kZXgoZmFsc2UpCiB7CiB9CiAKLXZvaWQgRGVsZXRlQnV0dG9uQ29u dHJvbGxlcjo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb24mIG9sZFNl bGVjdGlvbikKK3N0YXRpYyBIVE1MRWxlbWVudCogZW5jbG9zaW5nVGFibGVUb0RlbGV0ZShjb25z dCBTZWxlY3Rpb24mIHNlbGVjdGlvbikKIHsKLSAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAg ICBOb2RlKiBvbGRUYWJsZU5vZGUgPSAwOwotICAgIE5vZGUqIG5ld1RhYmxlTm9kZSA9IDA7Cisg ICAgaWYgKCFzZWxlY3Rpb24uaXNDb250ZW50RWRpdGFibGUoKSkKKyAgICAgICAgcmV0dXJuIDA7 CiAKLSAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gb2xkU2VsZWN0aW9uLnRvUmFuZ2UoKTsKLSAg ICBpZiAob2xkU2VsZWN0aW9uLmlzQ29udGVudEVkaXRhYmxlKCkgJiYgcmFuZ2UuZ2V0KCkpCi0g ICAgICAgIG9sZFRhYmxlTm9kZSA9IGVuY2xvc2luZ05vZGVXaXRoVGFnKHJhbmdlLT5jb21tb25B bmNlc3RvckNvbnRhaW5lcihlYyksIHRhYmxlVGFnKTsKLSAgICBBU1NFUlQoZWMgPT0gMCk7Cisg ICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IHNlbGVjdGlvbi50b1JhbmdlKCk7CisgICAgaWYgKCFy YW5nZSkKKyAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByYW5nZSA9IG1fZWRpdG9yLT5mcmFtZSgp LT5zZWxlY3Rpb25Db250cm9sbGVyKCktPnRvUmFuZ2UoKTsKLSAgICBpZiAobV9lZGl0b3ItPmZy YW1lKCktPnNlbGVjdGlvbkNvbnRyb2xsZXIoKS0+aXNDb250ZW50RWRpdGFibGUoKSAmJiByYW5n ZS5nZXQoKSkKLSAgICAgICAgbmV3VGFibGVOb2RlID0gZW5jbG9zaW5nTm9kZVdpdGhUYWcocmFu Z2UtPmNvbW1vbkFuY2VzdG9yQ29udGFpbmVyKGVjKSwgdGFibGVUYWcpOworICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOworICAgIE5vZGUqIGNvbnRhaW5lciA9IHJhbmdlLT5jb21tb25BbmNlc3Rv ckNvbnRhaW5lcihlYyk7CisgICAgQVNTRVJUKGNvbnRhaW5lcik7CiAgICAgQVNTRVJUKGVjID09 IDApOwogCi0gICAgaWYgKG9sZFRhYmxlTm9kZSAhPSBuZXdUYWJsZU5vZGUpIHsKLSAgICAgICAg Ly8gSWYgdGhlIGJhc2UgaXMgaW5zaWRlIGFuIGVkaXRhYmxlIHRhYmxlLCBnaXZlIHRoZSB0YWJs ZSBhIGNsb3NlIHdpZGdldC4KLSAgICAgICAgaWYgKG5ld1RhYmxlTm9kZSkKLSAgICAgICAgICAg IHNob3coc3RhdGljX2Nhc3Q8SFRNTEVsZW1lbnQqPihuZXdUYWJsZU5vZGUpKTsKLSAgICAgICAg ZWxzZSBpZiAob2xkVGFibGVOb2RlKQotICAgICAgICAgICAgaGlkZSgpOwotICAgIH0KKyAgICAv LyBUaGUgZW5jbG9zaW5nTm9kZVdpdGhUYWcgZnVuY3Rpb24gb25seSB3b3JrcyBvbiBub2RlIHRo YXQgYXJlIHRoZW1zZWx2ZXMKKyAgICAvLyBlZGl0YWJsZSwgc28gd2UgaGF2ZSB0byBjaGVjayBh Z2FpbiBpbiBjYXNlIHRoZSBzZWxlY3Rpb24gaXMgZWRpdGFibGUKKyAgICAvLyBidXQgaXRzIGNv bW1vbiBhbmNlc3RvciBpcyBub3QuCisgICAgaWYgKCFjb250YWluZXItPmlzQ29udGVudEVkaXRh YmxlKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgTm9kZSogdGFibGUgPSBlbmNsb3NpbmdO b2RlV2l0aFRhZyhjb250YWluZXIsIHRhYmxlVGFnKTsKKyAgICBBU1NFUlQoIXRhYmxlIHx8IHRh YmxlLT5pc0hUTUxFbGVtZW50KCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MRWxlbWVu dCo+KHRhYmxlKTsKIH0KLSAgICAKLXZvaWQgRGVsZXRlQnV0dG9uQ29udHJvbGxlcjo6cmVzcG9u ZFRvQ2hhbmdlZENvbnRlbnRzKGNvbnN0IFNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uKQorCit2 b2lkIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24oY29u c3QgU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24pCit7CisgICAgSFRNTEVsZW1lbnQqIG9sZFRhYmxl ID0gZW5jbG9zaW5nVGFibGVUb0RlbGV0ZShvbGRTZWxlY3Rpb24pOworICAgIEhUTUxFbGVtZW50 KiBuZXdUYWJsZSA9IGVuY2xvc2luZ1RhYmxlVG9EZWxldGUobV9mcmFtZS0+c2VsZWN0aW9uQ29u dHJvbGxlcigpLT5zZWxlY3Rpb24oKSk7CisgICAgaWYgKG9sZFRhYmxlID09IG5ld1RhYmxlKQor ICAgICAgICByZXR1cm47CisKKyAgICAvLyBJZiB0aGUgYmFzZSBpcyBpbnNpZGUgYW4gZWRpdGFi bGUgdGFibGUsIGdpdmUgdGhlIHRhYmxlIGEgY2xvc2Ugd2lkZ2V0LgorICAgIGlmIChuZXdUYWJs ZSkKKyAgICAgICAgc2hvdyhuZXdUYWJsZSk7CisgICAgZWxzZQorICAgICAgICBoaWRlKCk7Cit9 CisKK3ZvaWQgRGVsZXRlQnV0dG9uQ29udHJvbGxlcjo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRz KCkKIHsKICAgICB1cGRhdGVPdXRsaW5lU3R5bGUoKTsKIH0KQEAgLTEwNyw3ICsxMjEsNyBAQCB2 b2lkIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OnNob3coSFRNTEVsCiAgICAgaWYgKCEoZWxlbWVu dC0+cmVuZGVyZXIoKSAmJiBlbGVtZW50LT5yZW5kZXJlcigpLT5pc1JlbmRlckJsb2NrKCkpKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fZWRpdG9yLT5zaG91bGRTaG93RGVsZXRlSW50 ZXJmYWNlKHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4oZWxlbWVudCkpKQorICAgIGlmICghbV9m cmFtZS0+ZWRpdG9yKCktPnNob3VsZFNob3dEZWxldGVJbnRlcmZhY2Uoc3RhdGljX2Nhc3Q8SFRN TEVsZW1lbnQqPihlbGVtZW50KSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZWxlbWVudCA9 IGVsZW1lbnQ7CkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvRGVsZXRlQnV0dG9uQ29udHJvbGxlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9EZWxldGVCdXR0b25Db250cm9sbGVyLmgJ KHJldmlzaW9uIDE3MTk2KQorKysgV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZUJ1dHRvbkNvbnRyb2xs ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsMTQgKzMxLDE0IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNsYXNzIERlbGV0ZUJ1dHRvbjsKLWNsYXNzIEVkaXRvcjsKK2NsYXNzIEZyYW1lOwog Y2xhc3MgSFRNTEVsZW1lbnQ7CiBjbGFzcyBSZW5kZXJPYmplY3Q7CiBjbGFzcyBTZWxlY3Rpb247 CiAKIGNsYXNzIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIgewogcHVibGljOgotICAgIERlbGV0ZUJ1 dHRvbkNvbnRyb2xsZXIoRWRpdG9yKik7CisgICAgRGVsZXRlQnV0dG9uQ29udHJvbGxlcihGcmFt ZSopOwogCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IGNvbnRhaW5lckVsZW1lbnRJZGVu dGlmaWVyOwogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBidXR0b25FbGVtZW50SWRlbnRp ZmllcjsKQEAgLTQ3LDcgKzQ3LDcgQEAgcHVibGljOgogICAgIEhUTUxFbGVtZW50KiB0YXJnZXQo KSBjb25zdCB7IHJldHVybiBtX2VsZW1lbnQuZ2V0KCk7IH07CiAKICAgICB2b2lkIHJlc3BvbmRU b0NoYW5nZWRTZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24pOwotICAgIHZv aWQgcmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKGNvbnN0IFNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0 aW9uKTsKKyAgICB2b2lkIHJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpOwogCiAgICAgdm9pZCBz aG93KEhUTUxFbGVtZW50Kik7CiAgICAgdm9pZCBoaWRlKCk7CkBAIC01Nyw3ICs1Nyw3IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVPdXRsaW5lU3R5bGUoKTsKIAotICAgIEVk aXRvciogbV9lZGl0b3I7CisgICAgRnJhbWUqIG1fZnJhbWU7CiAgICAgUmVmUHRyPEhUTUxFbGVt ZW50PiBtX2VsZW1lbnQ7CiAgICAgUmVmUHRyPEhUTUxFbGVtZW50PiBtX2NvbnRhaW5lckVsZW1l bnQ7CiAgICAgUmVmUHRyPEhUTUxFbGVtZW50PiBtX291dGxpbmVFbGVtZW50OwpJbmRleDogV2Vi Q29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0Vk aXRvci5jcHAJKHJldmlzaW9uIDE3MTk2KQorKysgV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJFZGl0b3IuaCIKIAorI2luY2x1ZGUgIkRlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIuaCIK ICNpbmNsdWRlICJFZGl0b3JDbGllbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUg IkhUTUxFbGVtZW50LmgiCkBAIC0zNSwyNSArMzYsMzEgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogLy8gaW1wbGVtZW50IGFzIHBsYXRmb3JtLXNwZWNpZmljCi1QYXN0ZWJvYXJkIGdlbmVyYWxQ YXN0ZWJvYXJkKCkKK3N0YXRpYyBQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkKCkKIHsKICAg ICByZXR1cm4gMDsKIH0KIAogYm9vbCBFZGl0b3I6OmNhbkNvcHkoKQoteyByZXR1cm4gZmFsc2U7 IH0KK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKIGJvb2wgRWRpdG9yOjpjYW5DdXQoKQoteyBy ZXR1cm4gZmFsc2U7IH0KK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKIGJvb2wgRWRpdG9yOjpj YW5EZWxldGUoKQoteyByZXR1cm4gZmFsc2U7IH0KK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CiAK IGJvb2wgRWRpdG9yOjpjYW5EZWxldGVSYW5nZShSYW5nZSogcmFuZ2UpCiB7CiAgICAgRXhjZXB0 aW9uQ29kZSBlYyA9IDA7Ci0gICAgTm9kZSAqc3RhcnRDb250YWluZXIgPSByYW5nZS0+c3RhcnRD b250YWluZXIoZWMpOwotICAgIE5vZGUgKmVuZENvbnRhaW5lciA9IHJhbmdlLT5lbmRDb250YWlu ZXIoZWMpOworICAgIE5vZGUqIHN0YXJ0Q29udGFpbmVyID0gcmFuZ2UtPnN0YXJ0Q29udGFpbmVy KGVjKTsKKyAgICBOb2RlKiBlbmRDb250YWluZXIgPSByYW5nZS0+ZW5kQ29udGFpbmVyKGVjKTsK ICAgICBpZiAoIXN0YXJ0Q29udGFpbmVyIHx8ICFlbmRDb250YWluZXIpCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAKQEAgLTcxLDI4ICs3OCw0MCBAQCBib29sIEVkaXRvcjo6Y2FuRGVsZXRl UmFuZ2UoUmFuZ2UqIHJhbmdlCiB9CiAKIGJvb2wgRWRpdG9yOjpjYW5QYXN0ZSgpCi17IHJldHVy biBmYWxzZTsgfQoreworICAgIHJldHVybiBmYWxzZTsKK30KIAogYm9vbCBFZGl0b3I6OmNhblNt YXJ0Q29weU9yRGVsZXRlKCkKLXsgcmV0dXJuIGZhbHNlOyB9Cit7CisgICAgcmV0dXJuIGZhbHNl OworfQogCiB2b2lkIEVkaXRvcjo6ZGVsZXRlU2VsZWN0aW9uKCkKLXt9Cit7Cit9CiAKIHZvaWQg RWRpdG9yOjpkZWxldGVTZWxlY3Rpb25XaXRoU21hcnREZWxldGUoYm9vbCBlbmFibGVkKQote30K K3sKK30KIAogYm9vbCBFZGl0b3I6OmlzU2VsZWN0aW9uUmljaGx5RWRpdGFibGUoKQoteyByZXR1 cm4gZmFsc2U7IH0KK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKIHZvaWQgRWRpdG9yOjpwYXN0 ZUFzUGxhaW5UZXh0V2l0aFBhc3RlYm9hcmQoUGFzdGVib2FyZCBwYXN0ZWJvYXJkKQote30KK3sK K30KIAogdm9pZCBFZGl0b3I6OnBhc3RlV2l0aFBhc3RlYm9hcmQoUGFzdGVib2FyZCBwYXN0ZWJv YXJkLCBib29sIGFsbG93UGxhaW5UZXh0KQote30KK3sKK30KIAogUmFuZ2UqIEVkaXRvcjo6c2Vs ZWN0ZWRSYW5nZSgpCi17IHJldHVybiBOVUxMOyB9Cit7CisgICAgcmV0dXJuIDA7Cit9CiAKIGJv b2wgRWRpdG9yOjpzaG91bGREZWxldGVSYW5nZShSYW5nZSogcmFuZ2UpCiB7CkBAIC0xMjUsMjMg KzE0NCwzNCBAQCBib29sIEVkaXRvcjo6dHJ5REhUTUxQYXN0ZSgpCiB9CiAKIHZvaWQgRWRpdG9y Ojp3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChQYXN0ZWJvYXJkIHBhc3RlYm9hcmQpCi17fQor eworfQogCiBib29sIEVkaXRvcjo6c2hvdWxkU2hvd0RlbGV0ZUludGVyZmFjZShIVE1MRWxlbWVu dCogZWxlbWVudCkKIHsKICAgICByZXR1cm4gbV9jbGllbnQtPnNob3VsZFNob3dEZWxldGVJbnRl cmZhY2UoZWxlbWVudCk7CiB9CiAKK3ZvaWQgRWRpdG9yOjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0 aW9uKGNvbnN0IFNlbGVjdGlvbiYgb2xkU2VsZWN0aW9uKQoreworICAgIG1fZGVsZXRlQnV0dG9u Q29udHJvbGxlci0+cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihvbGRTZWxlY3Rpb24pOworfQor Cit2b2lkIEVkaXRvcjo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKCkKK3sKKyAgICBtX2RlbGV0 ZUJ1dHRvbkNvbnRyb2xsZXItPnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpOworfQorCiAvLyA9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQogLy8KIC8vIHB1YmxpYyBlZGl0aW5nIGNvbW1hbmRzCiAvLwog Ly8gPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KIAotRWRpdG9yOjpFZGl0b3IoRnJhbWUqIGZyYW1lLCBF ZGl0b3JDbGllbnQqIGNsaWVudCkKK0VkaXRvcjo6RWRpdG9yKEZyYW1lKiBmcmFtZSwgUGFzc1Jl ZlB0cjxFZGl0b3JDbGllbnQ+IGNsaWVudCkKICAgICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBt X2NsaWVudChjbGllbnQpCi0gICAgLCBtX2RlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIodGhpcykKKyAg ICAsIG1fZGVsZXRlQnV0dG9uQ29udHJvbGxlcihuZXcgRGVsZXRlQnV0dG9uQ29udHJvbGxlcihm cmFtZSkpCiB7IAogfQogCkBAIC0xNjYsNyArMTk2LDYgQEAgdm9pZCBFZGl0b3I6OmN1dCgpCiAK IHZvaWQgRWRpdG9yOjpjb3B5KCkKIHsKLQogICAgIGlmICh0cnlESFRNTENvcHkoKSkKICAgICAg ICAgcmV0dXJuOyAvLyBESFRNTCBkaWQgdGhlIHdob2xlIG9wZXJhdGlvbgogICAgIGlmICghY2Fu Q29weSgpKSB7CkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCShyZXZpc2lvbiAxNzE5NikKKysrIFdlYkNvcmUvZWRp dGluZy9FZGl0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsMjAgKzI2LDI1IEBACiAjaWZuZGVm IEVESVRPUl9ICiAjZGVmaW5lIEVESVRPUl9ICiAKLSNpbmNsdWRlICJEZWxldGVCdXR0b25Db250 cm9sbGVyLmgiCisjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CisjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2Ns YXNzIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI7CiBjbGFzcyBFZGl0b3JDbGllbnQ7CiBjbGFzcyBG cmFtZTsKK2NsYXNzIEhUTUxFbGVtZW50OwogY2xhc3MgUmFuZ2U7CitjbGFzcyBTZWxlY3Rpb247 CiAKIC8vIG1ha2UgcGxhdGZvcm0tc3BlY2lmaWMgYW5kIGltcGxlbWVudCAtIHRoaXMgaXMgdGVt cG9yYXJ5IHBsYWNlaG9sZGVyCiB0eXBlZGVmIGludCBQYXN0ZWJvYXJkOwogCiBjbGFzcyBFZGl0 b3IgewogcHVibGljOgotICAgIEVkaXRvcihGcmFtZSosIEVkaXRvckNsaWVudCopOworICAgIEVk aXRvcihGcmFtZSosIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50Pik7CiAgICAgfkVkaXRvcigpOwog CiAgICAgdm9pZCBjdXQoKTsKQEAgLTQ5LDEzICs1NCwxNiBAQCBwdWJsaWM6CiAKICAgICBib29s IHNob3VsZFNob3dEZWxldGVJbnRlcmZhY2UoSFRNTEVsZW1lbnQqKTsKIAorICAgIHZvaWQgcmVz cG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb24mIG9sZFNlbGVjdGlvbik7Cisg ICAgdm9pZCByZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKTsKKwogICAgIEZyYW1lKiBmcmFtZSgp IGNvbnN0IHsgcmV0dXJuIG1fZnJhbWU7IH0KLSAgICBEZWxldGVCdXR0b25Db250cm9sbGVyKiBk ZWxldGVCdXR0b25Db250cm9sbGVyKCkgeyByZXR1cm4gJm1fZGVsZXRlQnV0dG9uQ29udHJvbGxl cjsgfQorICAgIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIqIGRlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIo KSBjb25zdCB7IHJldHVybiBtX2RlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIuZ2V0KCk7IH0KIAogcHJp dmF0ZToKICAgICBGcmFtZSogbV9mcmFtZTsKICAgICBSZWZQdHI8RWRpdG9yQ2xpZW50PiBtX2Ns aWVudDsKLSAgICBEZWxldGVCdXR0b25Db250cm9sbGVyIG1fZGVsZXRlQnV0dG9uQ29udHJvbGxl cjsKKyAgICBPd25QdHI8RGVsZXRlQnV0dG9uQ29udHJvbGxlcj4gbV9kZWxldGVCdXR0b25Db250 cm9sbGVyOwogCiAgICAgYm9vbCBjYW5Db3B5KCk7CiAgICAgYm9vbCBjYW5DdXQoKTsKSW5kZXg6 IFdlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDE3MTk2KQor KysgV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2VsZWN0 aW9uQ29udHJvbGxlci5oIgogCi0jaW5jbHVkZSAiRGVsZXRlQnV0dG9uQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRWRpdG9yLmgiCiAjaW5jbHVkZSAiRWxl bWVudC5oIgpAQCAtMTIxLDcgKzEyMCw3IEBAIHZvaWQgU2VsZWN0aW9uQ29udHJvbGxlcjo6c2V0 U2VsZWN0aW9uKGMKICAgICBtX2ZyYW1lLT5zZWxlY3RGcmFtZUVsZW1lbnRJblBhcmVudElmRnVs bHlTZWxlY3RlZCgpOwogICAgIG1fZnJhbWUtPm5vdGlmeVJlbmRlcmVyT2ZTZWxlY3Rpb25DaGFu Z2UodXNlclRyaWdnZXJlZCk7CiAgICAgbV9mcmFtZS0+cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlv bihvbGRTZWxlY3Rpb24sIGNsb3NlVHlwaW5nKTsKLSAgICBtX2ZyYW1lLT5lZGl0b3IoKS0+ZGVs ZXRlQnV0dG9uQ29udHJvbGxlcigpLT5yZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKG9sZFNlbGVj dGlvbik7CisgICAgbV9mcmFtZS0+ZWRpdG9yKCktPnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24o b2xkU2VsZWN0aW9uKTsKICAgICBpZiAodXNlclRyaWdnZXJlZCkKICAgICAgICAgbV9mcmFtZS0+ cmV2ZWFsQ2FyZXQoUmVuZGVyTGF5ZXI6OmdBbGlnblRvRWRnZUlmTmVlZGVkKTsKIH0KSW5kZXg6 IFdlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1l LmNwcAkocmV2aXNpb24gMTcxOTYpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNTgsNyArMTU4LDcgQEAgc3RhdGljIGlubGluZSBGcmFtZSogcGFyZW50RnJv bU93bmVyRWxlbQogICAgIHJldHVybiBvd25lckVsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCk7 CiB9CiAKLUZyYW1lOjpGcmFtZShQYWdlKiBwYWdlLCBFbGVtZW50KiBvd25lckVsZW1lbnQsIEVk aXRvckNsaWVudCogY2xpZW50KSAKK0ZyYW1lOjpGcmFtZShQYWdlKiBwYWdlLCBFbGVtZW50KiBv d25lckVsZW1lbnQsIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50PiBjbGllbnQpIAogICAgIDogZChu ZXcgRnJhbWVQcml2YXRlKHBhZ2UsIHBhcmVudEZyb21Pd25lckVsZW1lbnQob3duZXJFbGVtZW50 KSwgdGhpcywgb3duZXJFbGVtZW50LCBjbGllbnQpKQogewogICAgIEF0b21pY1N0cmluZzo6aW5p dCgpOwpAQCAtMjE1Niw3ICsyMTU2LDcgQEAgdm9pZCBGcmFtZTo6YXBwbGllZEVkaXRpbmcoUGFz c1JlZlB0cjxFZAogICAgICAgICByZWdpc3RlckNvbW1hbmRGb3JVbmRvKGNtZCk7CiAgICAgfQog ICAgIHJlc3BvbmRUb0NoYW5nZWRDb250ZW50cyhuZXdTZWxlY3Rpb24pOwotICAgIGVkaXRvcigp LT5kZWxldGVCdXR0b25Db250cm9sbGVyKCktPnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cyhuZXdT ZWxlY3Rpb24pOworICAgIGVkaXRvcigpLT5yZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKTsKIH0K IAogdm9pZCBGcmFtZTo6dW5hcHBsaWVkRWRpdGluZyhQYXNzUmVmUHRyPEVkaXRDb21tYW5kPiBj bWQpCkBAIC0yMTcwLDcgKzIxNzAsNyBAQCB2b2lkIEZyYW1lOjp1bmFwcGxpZWRFZGl0aW5nKFBh c3NSZWZQdHI8CiAgICAgZC0+bV9sYXN0RWRpdENvbW1hbmQgPSAwOwogICAgIHJlZ2lzdGVyQ29t bWFuZEZvclJlZG8oY21kKTsKICAgICByZXNwb25kVG9DaGFuZ2VkQ29udGVudHMobmV3U2VsZWN0 aW9uKTsKLSAgICBlZGl0b3IoKS0+ZGVsZXRlQnV0dG9uQ29udHJvbGxlcigpLT5yZXNwb25kVG9D aGFuZ2VkQ29udGVudHMobmV3U2VsZWN0aW9uKTsKKyAgICBlZGl0b3IoKS0+cmVzcG9uZFRvQ2hh bmdlZENvbnRlbnRzKCk7CiB9CiAKIHZvaWQgRnJhbWU6OnJlYXBwbGllZEVkaXRpbmcoUGFzc1Jl ZlB0cjxFZGl0Q29tbWFuZD4gY21kKQpAQCAtMjE4NCw3ICsyMTg0LDcgQEAgdm9pZCBGcmFtZTo6 cmVhcHBsaWVkRWRpdGluZyhQYXNzUmVmUHRyPAogICAgIGQtPm1fbGFzdEVkaXRDb21tYW5kID0g MDsKICAgICByZWdpc3RlckNvbW1hbmRGb3JVbmRvKGNtZCk7CiAgICAgcmVzcG9uZFRvQ2hhbmdl ZENvbnRlbnRzKG5ld1NlbGVjdGlvbik7Ci0gICAgZWRpdG9yKCktPmRlbGV0ZUJ1dHRvbkNvbnRy b2xsZXIoKS0+cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKG5ld1NlbGVjdGlvbik7CisgICAgZWRp dG9yKCktPnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpOwogfQogCiBDU1NNdXRhYmxlU3R5bGVE ZWNsYXJhdGlvbiAqRnJhbWU6OnR5cGluZ1N0eWxlKCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvcGFn ZS9GcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZS5oCShyZXZpc2lvbiAx NzE5NikKKysrIFdlYkNvcmUvcGFnZS9GcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDQsNyAr MTA0LDcgQEAgY2xhc3MgRnJhbWUgOiBwdWJsaWMgU2hhcmVkPEZyYW1lPiB7CiBwdWJsaWM6CiAg IGVudW0geyBOb1hQb3NGb3JWZXJ0aWNhbEFycm93TmF2aWdhdGlvbiA9IElOVF9NSU4gfTsKIAot ICBGcmFtZShQYWdlKiwgRWxlbWVudCosIEVkaXRvckNsaWVudCopOworICBGcmFtZShQYWdlKiwg RWxlbWVudCosIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50Pik7CiAgIHZpcnR1YWwgfkZyYW1lKCk7 CiAKICAgdmlydHVhbCBib29sIG9wZW5VUkwoY29uc3QgS1VSTCYpOwpJbmRleDogV2ViQ29yZS9w YWdlL0ZyYW1lUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVByaXZh dGUuaAkocmV2aXNpb24gMTcxOTYpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVQcml2YXRlLmgJKHdv cmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJEZWNvZGVyLmgiCiAjaW5j bHVkZSAiRWRpdENvbW1hbmQuaCIKICNpbmNsdWRlICJFZGl0b3IuaCIKKyNpbmNsdWRlICJFZGl0 b3JDbGllbnQuaCIKICNpbmNsdWRlICJGb3JtRGF0YS5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAj aW5jbHVkZSAiRnJhbWVUcmVlLmgiCkBAIC02MSw3ICs2Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAKICAgICBjbGFzcyBGcmFtZVByaXZhdGUgewogICAgIHB1YmxpYzoKLSAgICAgICAg RnJhbWVQcml2YXRlKFBhZ2UqIHBhZ2UsIEZyYW1lKiBwYXJlbnQsIEZyYW1lKiB0aGlzRnJhbWUs IEVsZW1lbnQqIG93bmVyRWxlbWVudCwgRWRpdG9yQ2xpZW50KiBjbGllbnQpCisgICAgICAgIEZy YW1lUHJpdmF0ZShQYWdlKiBwYWdlLCBGcmFtZSogcGFyZW50LCBGcmFtZSogdGhpc0ZyYW1lLCBF bGVtZW50KiBvd25lckVsZW1lbnQsIFBhc3NSZWZQdHI8RWRpdG9yQ2xpZW50PiBjbGllbnQpCiAg ICAgICAgICAgICA6IG1fcGFnZShwYWdlKQogICAgICAgICAgICAgLCBtX3RyZWVOb2RlKHRoaXNG cmFtZSwgcGFyZW50KQogICAgICAgICAgICAgLCBtX293bmVyRWxlbWVudChvd25lckVsZW1lbnQp Cg==