51939 2011-01-05 11:26:02 -0800 More work on spelling 2011-01-05 11:41:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 329686 0 andersca 2011-01-05 11:26:02 -0800 More work on spelling 329689 1 78021 andersca 2011-01-05 11:31:57 -0800 Created attachment 78021 Patch 329690 2 andersca 2011-01-05 11:41:10 -0800 Committed r75086: <http://trac.webkit.org/changeset/75086> 78021 2011-01-05 11:31:57 -0800 2011-01-05 11:39:38 -0800 Patch bug-51939-20110105113156.patch text/plain 18153 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTA4NSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNzcgQEAKKzIwMTEtMDEtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNb3JlIHdvcmsgb24gc3BlbGxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUxOTM5CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW06CisgICAgICAgICgtW1dLVmlldyB2YWxpZGF0ZVVzZXJJbnRlcmZhY2VJdGVtOl0pOgor ICAgICAgICBIYW5kbGUgY2hhbmdlU3BlbGxpbmc6IGFzIHdlbGwuCisKKyAgICAgICAgKC1bV0tW aWV3IHNob3dHdWVzc1BhbmVsOl0pOgorICAgICAgICBTaG93IG9yIGhpZGUgdGhlIGd1ZXNzIHBh bmVsLgorCisgICAgICAgICgtW1dLVmlldyBjaGVja1NwZWxsaW5nOl0pOgorICAgICAgICBQYXNz IGZhbHNlIHRvIGFkdmFuY2VUb05leHRNaXNzcGVsbGluZy4KKworICAgICAgICAoLVtXS1ZpZXcg Y2hhbmdlU3BlbGxpbmc6XSk6CisgICAgICAgIENhbGwgY2hhbmdlU3BlbGxpbmdUb1dvcmQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvVGV4dENoZWNrZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdl UHJveHkpOgorICAgICAgICBJbml0aWFsaXplIG1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVz c2FnZUNvdW50LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29udGV4dE1lbnVJ dGVtU2VsZWN0ZWQpOgorICAgICAgICBIYW5kbGUgc21hcnQgdG9nZ2xlcyBkaXJlY3RseSBpbiB0 aGUgVUkgcHJvY2Vzcywga2VlcCB0cmFjayBvZiB3aGV0aGVyCisgICAgICAgIHdlJ3JlIGFza2Vk IHRvIGxlYXJuIG9yIGlnbm9yZSBhIHdvcmQuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjphZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmcpOgorICAgICAgICBQYXNzIHRoZSBib29sZWFu IHRocm91Z2guCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjaGFuZ2VTcGVsbGlu Z1RvV29yZCk6CisgICAgICAgIFNlbmQgYSBDaGFuZ2VTcGVsbGluZ1RvV29yZCBtZXNzYWdlLgor CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bGVhcm5Xb3JkKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjppZ25vcmVXb3JkKToKKyAgICAgICAgQ2hlY2sgdGhhdCB3ZSBk byBoYXZlIGEgcGVuZGluZyBsZWFybiBvciBpZ25vcmUgd29yZCBtZXNzYWdlLiBDYWxsIHRocm91 Z2ggdG8KKyAgICAgICAgdGhlIHRleHQgY2hlY2tlci4KKworICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnByb2Nlc3NEaWRDcmFzaCk6CisgICAgICAgIFJlc2V0IHRoZSBtX3BlbmRpbmdM ZWFybk9ySWdub3JlV29yZE1lc3NhZ2VDb3VudCB2YXJpYWJsZS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluOgorICAgICAgICBBZGQgbmV3IG1lc3NhZ2VzLgorCisgICAgICAgICogVUlQcm9j ZXNzL21hYy9UZXh0Q2hlY2tlck1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6VGV4dENoZWNrZXI6 OmxlYXJuV29yZCk6CisgICAgICAgIChXZWJLaXQ6OlRleHRDaGVja2VyOjppZ25vcmVXb3JkKToK KyAgICAgICAgSW1wbGVtZW50IGluIHRlcm1zIG9mIE5TU3BlbGxDaGVja2VyLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJFZGl0b3JDbGllbnQ6Omlnbm9yZVdvcmRJblNwZWxsRG9jdW1lbnQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJFZGl0b3JDbGllbnQ6OmxlYXJuV29yZCk6CisgICAgICAgIFNl bmQgSWdub3JlV29yZCBhbmQgTGVhcm5Xb3JkIG1lc3NhZ2VzLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRWRpdG9yQ2xpZW50TWFjLm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJFZGl0b3JDbGllbnQ6OnRvZ2dsZUF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9u KToKKyAgICAgICAgKFdlYktpdDo6V2ViRWRpdG9yQ2xpZW50Ojp0b2dnbGVBdXRvbWF0aWNMaW5r RGV0ZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRWRpdG9yQ2xpZW50Ojp0b2dnbGVBdXRv bWF0aWNEYXNoU3Vic3RpdHV0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRWRpdG9yQ2xpZW50 Ojp0b2dnbGVBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnQpOgorICAgICAgICBBZGQgYXNzZXJ0aW9u cy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKToKKyAgICAgICAgUGFz cyB0aGUgYm9vbCBhbG9uZyB0byB0aGUgRWRpdG9yLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmNoYW5nZVNwZWxsaW5nVG9Xb3JkKToKKyAgICAgICAgUmVwbGFjZSB0aGUgc2VsZWN0ZWQg dGV4dC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu OgorICAgICAgICBBZGQgbmV3IENoYW5nZVNwZWxsaW5nVG9Xb3JkIG1lc3NhZ2UgYW5kIGFkZCBh IGJvb2xlYW4gdG8gQWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nLgorCiAyMDExLTAxLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1RleHRDaGVja2VyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvVGV4dENoZWNrZXIuaAkocmV2aXNpb24gNzUw NzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9UZXh0Q2hlY2tlci5oCSh3b3JraW5nIGNvcHkpCkBA IC01NCw2ICs1NCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgVmVjdG9yPFdlYkNvcmU6OlRleHRD aGVja2luZ1Jlc3VsdD4gY2hlY2tUZXh0T2ZQYXJhZ3JhcGgoaW50NjRfdCBzcGVsbERvY3VtZW50 VGFnLCBjb25zdCBVQ2hhciogdGV4dCwgaW50IGxlbmd0aCwgdWludDY0X3QgY2hlY2tpbmdUeXBl cyk7CiAgICAgc3RhdGljIHZvaWQgdXBkYXRlU3BlbGxpbmdVSVdpdGhNaXNzcGVsbGVkV29yZChj b25zdCBTdHJpbmcmIG1pc3NwZWxsZWRXb3JkKTsKICAgICBzdGF0aWMgdm9pZCBnZXRHdWVzc2Vz Rm9yV29yZChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFN0cmluZyYgd29yZCwgY29u c3QgU3RyaW5nJiBjb250ZXh0LCBWZWN0b3I8U3RyaW5nPiYgZ3Vlc3Nlcyk7CisgICAgc3RhdGlj IHZvaWQgbGVhcm5Xb3JkKGNvbnN0IFN0cmluZyYgd29yZCk7CisgICAgc3RhdGljIHZvaWQgaWdu b3JlV29yZChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFN0cmluZyYgd29yZCk7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkocmV2aXNpb24gNzUwNzgpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiUGFnZUNsaWVu dC5oIgogI2luY2x1ZGUgIlN0cmluZ1BhaXJWZWN0b3IuaCIKICNpbmNsdWRlICJUZXh0Q2hlY2tl ci5oIgorI2luY2x1ZGUgIlRleHRDaGVja2VyU3RhdGUuaCIKICNpbmNsdWRlICJXS0NvbnRleHRQ cml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCiAjaW5jbHVkZSAiV2Vi QmFja0ZvcndhcmRMaXN0SXRlbS5oIgpAQCAtMTE0LDYgKzExNSw3IEBAIFdlYlBhZ2VQcm94eTo6 V2ViUGFnZVByb3h5KFdlYkNvbnRleHQqIGMKICAgICAsIG1fcGFnZUlEKHBhZ2VJRCkKICAgICAs IG1fc3BlbGxEb2N1bWVudFRhZygwKQogICAgICwgbV9oYXNTcGVsbERvY3VtZW50VGFnKGZhbHNl KQorICAgICwgbV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQoMCkKICAgICAs IG1fbWFpbkZyYW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb24oZmFsc2UpCiB7CiAjaWZuZGVmIE5E RUJVRwpAQCAtMTcwNCw3ICsxNzA2LDMzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpjb250ZXh0TWVu dUl0ZW1TZWxlY3QKICAgICAgICAgbV9jb250ZXh0TWVudUNsaWVudC5jdXN0b21Db250ZXh0TWVu dUl0ZW1TZWxlY3RlZCh0aGlzLCBpdGVtKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICAK KworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAoaXRlbS5hY3Rpb24oKSA9PSBDb250ZXh0TWVu dUl0ZW1UYWdTbWFydFF1b3RlcykgeworICAgICAgICBUZXh0Q2hlY2tlcjo6c2V0QXV0b21hdGlj UXVvdGVTdWJzdGl0dXRpb25FbmFibGVkKCFUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRp Y1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZCk7CisgICAgICAgIHByb2Nlc3MoKS0+dXBkYXRlVGV4 dENoZWNrZXJTdGF0ZSgpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlmIChpdGVtLmFj dGlvbigpID09IENvbnRleHRNZW51SXRlbVRhZ1NtYXJ0RGFzaGVzKSB7CisgICAgICAgIFRleHRD aGVja2VyOjpzZXRBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCghVGV4dENoZWNrZXI6 OnN0YXRlKCkuaXNBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCk7CisgICAgICAgIHBy b2Nlc3MoKS0+dXBkYXRlVGV4dENoZWNrZXJTdGF0ZSgpOworICAgICAgICByZXR1cm47CisgICAg fQorICAgIGlmIChpdGVtLmFjdGlvbigpID09IENvbnRleHRNZW51SXRlbVRhZ1NtYXJ0TGlua3Mp IHsKKyAgICAgICAgVGV4dENoZWNrZXI6OnNldEF1dG9tYXRpY0xpbmtEZXRlY3Rpb25FbmFibGVk KCFUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY0xpbmtEZXRlY3Rpb25FbmFibGVkKTsK KyAgICAgICAgcHJvY2VzcygpLT51cGRhdGVUZXh0Q2hlY2tlclN0YXRlKCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgaWYgKGl0ZW0uYWN0aW9uKCkgPT0gQ29udGV4dE1lbnVJdGVtVGFn VGV4dFJlcGxhY2VtZW50KSB7CisgICAgICAgIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNUZXh0 UmVwbGFjZW1lbnRFbmFibGVkKCFUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY1RleHRS ZXBsYWNlbWVudEVuYWJsZWQpOworICAgICAgICBwcm9jZXNzKCktPnVwZGF0ZVRleHRDaGVja2Vy U3RhdGUoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgorCisgICAgaWYgKGl0ZW0u YWN0aW9uKCkgPT0gQ29udGV4dE1lbnVJdGVtVGFnTGVhcm5TcGVsbGluZyB8fCBpdGVtLmFjdGlv bigpID09IENvbnRleHRNZW51SXRlbVRhZ0lnbm9yZVNwZWxsaW5nKQorICAgICAgICArK21fcGVu ZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2FnZUNvdW50OworCiAgICAgcHJvY2VzcygpLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRTZWxlY3RJdGVtRnJvbUFjdGl2ZUNvbnRleHRNZW51KGl0 ZW0pLCBtX3BhZ2VJRCk7CiB9CiAKQEAgLTE3MzEsOSArMTc1OSwxNyBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGlkQ2FuY2VsRm9yT3BlblBhbmVsCiAgICAgbV9vcGVuUGFuZWxSZXN1bHRMaXN0ZW5l ciA9IDA7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjphZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmco KQordm9pZCBXZWJQYWdlUHJveHk6OmFkdmFuY2VUb05leHRNaXNzcGVsbGluZyhib29sIHN0YXJ0 QmVmb3JlU2VsZWN0aW9uKQogewotICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6QWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKCksIG1fcGFnZUlEKTsKKyAgICBwcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkFkdmFuY2VUb05leHRNaXNzcGVsbGluZyhzdGFydEJl Zm9yZVNlbGVjdGlvbiksIG1fcGFnZUlEKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OmNoYW5n ZVNwZWxsaW5nVG9Xb3JkKGNvbnN0IFN0cmluZyYgd29yZCkKK3sKKyAgICBpZiAod29yZC5pc0Vt cHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6Q2hhbmdlU3BlbGxpbmdUb1dvcmQod29yZCksIG1fcGFnZUlEKTsKIH0KIAogdm9p ZCBXZWJQYWdlUHJveHk6OnVubWFya0FsbE1pc3NwZWxsaW5ncygpCkBAIC0xNzkwLDYgKzE4MjYs MjIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmdldEd1ZXNzZXNGb3JXb3JkKGNvbgogICAgIFRleHRD aGVja2VyOjpnZXRHdWVzc2VzRm9yV29yZChzcGVsbERvY3VtZW50VGFnKCksIHdvcmQsIGNvbnRl eHQsIGd1ZXNzZXMpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6bGVhcm5Xb3JkKGNvbnN0IFN0 cmluZyYgd29yZCkKK3sKKyAgICBNRVNTQUdFX0NIRUNLKG1fcGVuZGluZ0xlYXJuT3JJZ25vcmVX b3JkTWVzc2FnZUNvdW50KTsKKyAgICAtLW1fcGVuZGluZ0xlYXJuT3JJZ25vcmVXb3JkTWVzc2Fn ZUNvdW50OworCisgICAgVGV4dENoZWNrZXI6OmxlYXJuV29yZCh3b3JkKTsKK30KKwordm9pZCBX ZWJQYWdlUHJveHk6Omlnbm9yZVdvcmQoY29uc3QgU3RyaW5nJiB3b3JkKQoreworICAgIE1FU1NB R0VfQ0hFQ0sobV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQpOworICAgIC0t bV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQ7CisKKyAgICBUZXh0Q2hlY2tl cjo6aWdub3JlV29yZChzcGVsbERvY3VtZW50VGFnKCksIHdvcmQpOworfQorCiAvLyBPdGhlcgog CiB2b2lkIFdlYlBhZ2VQcm94eTo6dGFrZUZvY3VzKGJvb2wgZGlyZWN0aW9uKQpAQCAtMTk5Miw2 ICsyMDQ0LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByb2Nlc3NEaWRDcmFzaCgpCiAKICAgICBt X2VzdGltYXRlZFByb2dyZXNzID0gMC4wOwogCisgICAgbV9wZW5kaW5nTGVhcm5Pcklnbm9yZVdv cmRNZXNzYWdlQ291bnQgPSAwOworCiAgICAgbV9wYWdlQ2xpZW50LT5wcm9jZXNzRGlkQ3Jhc2go KTsKICAgICBtX2xvYWRlckNsaWVudC5wcm9jZXNzRGlkQ3Jhc2godGhpcyk7CiB9CkluZGV4OiBX ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gNzUwNzgpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMjk5LDcgKzI5OSw4IEBAIHB1 YmxpYzoKICAgICB2b2lkIGZpbmRab29tYWJsZUFyZWFGb3JQb2ludChjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYpOwogI2VuZGlmCiAKLSAgICB2b2lkIGFkdmFuY2VUb05leHRNaXNzcGVsbGluZygp OworICAgIHZvaWQgYWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKGJvb2wgc3RhcnRCZWZvcmVTZWxl Y3Rpb24pOworICAgIHZvaWQgY2hhbmdlU3BlbGxpbmdUb1dvcmQoY29uc3QgU3RyaW5nJiB3b3Jk KTsKICAgICB2b2lkIHVubWFya0FsbE1pc3NwZWxsaW5ncygpOwogICAgIHZvaWQgdW5tYXJrQWxs QmFkR3JhbW1hcigpOwogCkBAIC00MzUsNiArNDM2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNo ZWNrVGV4dE9mUGFyYWdyYXBoKGNvbnN0IFN0cmluZyYgdGV4dCwgdWludDY0X3QgY2hlY2tpbmdU eXBlcywgVmVjdG9yPFdlYkNvcmU6OlRleHRDaGVja2luZ1Jlc3VsdD4mIHJlc3VsdHMpOwogICAg IHZvaWQgdXBkYXRlU3BlbGxpbmdVSVdpdGhNaXNzcGVsbGVkV29yZChjb25zdCBTdHJpbmcmIG1p c3NwZWxsZWRXb3JkKTsKICAgICB2b2lkIGdldEd1ZXNzZXNGb3JXb3JkKGNvbnN0IFN0cmluZyYg d29yZCwgY29uc3QgU3RyaW5nJiBjb250ZXh0LCBWZWN0b3I8U3RyaW5nPiYgZ3Vlc3Nlcyk7Cisg ICAgdm9pZCBsZWFybldvcmQoY29uc3QgU3RyaW5nJiB3b3JkKTsKKyAgICB2b2lkIGlnbm9yZVdv cmQoY29uc3QgU3RyaW5nJiB3b3JkKTsKIAogICAgIHZvaWQgdGFrZUZvY3VzKGJvb2wgZGlyZWN0 aW9uKTsKICAgICB2b2lkIHNldFRvb2xUaXAoY29uc3QgU3RyaW5nJik7CkBAIC01NDMsNiArNTQ2 LDcgQEAgcHJpdmF0ZToKIAogICAgIGludDY0X3QgbV9zcGVsbERvY3VtZW50VGFnOwogICAgIGJv b2wgbV9oYXNTcGVsbERvY3VtZW50VGFnOworICAgIHVuc2lnbmVkIG1fcGVuZGluZ0xlYXJuT3JJ Z25vcmVXb3JkTWVzc2FnZUNvdW50OwogCiAgICAgYm9vbCBtX21haW5GcmFtZUhhc0N1c3RvbVJl cHJlc2VudGF0aW9uOwogfTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5t ZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku bWVzc2FnZXMuaW4JKHJldmlzaW9uIDc1MDc4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xODEsNCArMTgxLDYgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBDaGVja1RleHRPZlBhcmFncmFwaChXVEY6OlN0 cmluZyB0ZXh0LCB1aW50NjRfdCBjaGVja2luZ1R5cGVzKSAtPiAoVmVjdG9yPFdlYkNvcmU6OlRl eHRDaGVja2luZ1Jlc3VsdD4gcmVzdWx0cykKICAgICBVcGRhdGVTcGVsbGluZ1VJV2l0aE1pc3Nw ZWxsZWRXb3JkKFdURjo6U3RyaW5nIG1pc3NwZWxsZWRXb3JkKQogICAgIEdldEd1ZXNzZXNGb3JX b3JkKFdURjo6U3RyaW5nIHdvcmQsIFdURjo6U3RyaW5nIGNvbnRleHQpIC0+IChWZWN0b3I8V1RG OjpTdHJpbmc+IGd1ZXNzZXMpCisgICAgTGVhcm5Xb3JkKFdURjo6U3RyaW5nIHdvcmQpOworICAg IElnbm9yZVdvcmQoV1RGOjpTdHJpbmcgd29yZCk7CiB9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbQkocmV2aXNpb24gNzUwNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzU1LDcgKzM1NSw3IEBAIC0gKEJPT0wp dmFsaWRhdGVVc2VySW50ZXJmYWNlSXRlbTooaWQgPE4KICAgICAgICAgcmV0dXJuIF9kYXRhLT5f cGFnZS0+c2VsZWN0aW9uU3RhdGUoKS5pc0NvbnRlbnRFZGl0YWJsZTsKICAgICB9CiAKLSAgICBp ZiAoYWN0aW9uID09IEBzZWxlY3RvcihjaGVja1NwZWxsaW5nOikpCisgICAgaWYgKGFjdGlvbiA9 PSBAc2VsZWN0b3IoY2hlY2tTcGVsbGluZzopIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3IoY2hhbmdl U3BlbGxpbmc6KSkKICAgICAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+c2VsZWN0aW9uU3RhdGUo KS5pc0NvbnRlbnRFZGl0YWJsZTsKIAogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRvZ2ds ZUNvbnRpbnVvdXNTcGVsbENoZWNraW5nOikpIHsKQEAgLTQ2MCwxMiArNDYwLDMyIEBAIC0gKElC QWN0aW9uKXN0b3BTcGVha2luZzooaWQpc2VuZGVyCiAKIC0gKElCQWN0aW9uKXNob3dHdWVzc1Bh bmVsOihpZClzZW5kZXIKIHsKLSAgICAvLyBGSVhNRSAoV2ViS2l0MikgPHJkYXI6Ly9wcm9ibGVt LzgyNDU5NTg+IE1ha2UgU3BlbGxpbmcvR3JhbW1hciBjaGVja2luZyB3b3JrIGluIFdlYktpdDIK KyAgICBOU1NwZWxsQ2hlY2tlciAqY2hlY2tlciA9IFtOU1NwZWxsQ2hlY2tlciBzaGFyZWRTcGVs bENoZWNrZXJdOworICAgIGlmICghY2hlY2tlcikgeworICAgICAgICBMT0dfRVJST1IoIk5vIE5T U3BlbGxDaGVja2VyIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgTlNQYW5l bCAqc3BlbGxpbmdQYW5lbCA9IFtjaGVja2VyIHNwZWxsaW5nUGFuZWxdOworICAgIGlmIChbc3Bl bGxpbmdQYW5lbCBpc1Zpc2libGVdKSB7CisgICAgICAgIFtzcGVsbGluZ1BhbmVsIG9yZGVyT3V0 OnNlbmRlcl07CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgX2RhdGEtPl9wYWdl LT5hZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmcodHJ1ZSk7CisgICAgW3NwZWxsaW5nUGFuZWwgb3Jk ZXJGcm9udDpzZW5kZXJdOwogfQogCiAtIChJQkFjdGlvbiljaGVja1NwZWxsaW5nOihpZClzZW5k ZXIKIHsKLSAgICBfZGF0YS0+X3BhZ2UtPmFkdmFuY2VUb05leHRNaXNzcGVsbGluZygpOworICAg IF9kYXRhLT5fcGFnZS0+YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKGZhbHNlKTsKK30KKworLSAo dm9pZCljaGFuZ2VTcGVsbGluZzooaWQpc2VuZGVyCit7CisgICAgTlNTdHJpbmcgKndvcmQgPSBb W3NlbmRlciBzZWxlY3RlZENlbGxdIHN0cmluZ1ZhbHVlXTsKKworICAgIF9kYXRhLT5fcGFnZS0+ Y2hhbmdlU3BlbGxpbmdUb1dvcmQod29yZCk7CiB9CiAKIC0gKElCQWN0aW9uKXRvZ2dsZUNvbnRp bnVvdXNTcGVsbENoZWNraW5nOihpZClzZW5kZXIKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL21h Yy9UZXh0Q2hlY2tlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9tYWMv VGV4dENoZWNrZXJNYWMubW0JKHJldmlzaW9uIDc1MDc5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1RleHRDaGVja2VyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yODksNCArMjg5LDE0IEBA IHZvaWQgVGV4dENoZWNrZXI6OmdldEd1ZXNzZXNGb3JXb3JkKGludDYKICAgICAgICAgZ3Vlc3Nl cy5hcHBlbmQoZ3Vlc3MpOwogfQogCit2b2lkIFRleHRDaGVja2VyOjpsZWFybldvcmQoY29uc3Qg U3RyaW5nJiB3b3JkKQoreworICAgIFtbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2Vy XSBsZWFybldvcmQ6d29yZF07Cit9CisKK3ZvaWQgVGV4dENoZWNrZXI6Omlnbm9yZVdvcmQoaW50 NjRfdCBzcGVsbERvY3VtZW50VGFnLCBjb25zdCBTdHJpbmcmIHdvcmQpCit7CisgICAgW1tOU1Nw ZWxsQ2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIGlnbm9yZVdvcmQ6d29yZCBpblNwZWxsRG9j dW1lbnRXaXRoVGFnOnNwZWxsRG9jdW1lbnRUYWddOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3F0L1RleHRDaGVja2VyUXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL3F0L1RleHRDaGVja2VyUXQuY3BwCShyZXZpc2lvbiA3 NTA3OCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL3F0L1RleHRDaGVja2VyUXQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04NSw0ICs4NSwxNCBAQCB2b2lkIFRleHRDaGVja2VyOjpnZXRHdWVzc2VzRm9y V29yZChpbnQ2CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAordm9pZCBUZXh0Q2hlY2tlcjo6 bGVhcm5Xb3JkKGNvbnN0IFN0cmluZyYgd29yZCkKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOwor fQorCit2b2lkIFRleHRDaGVja2VyOjppZ25vcmVXb3JkKGludDY0X3Qgc3BlbGxEb2N1bWVudFRh ZywgY29uc3QgU3RyaW5nJiB3b3JkKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1RleHRDaGVj a2VyV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vVGV4dENoZWNr ZXJXaW4uY3BwCShyZXZpc2lvbiA3NTA3OCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9UZXh0 Q2hlY2tlcldpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1LDQgKzg1LDE0IEBAIHZvaWQgVGV4 dENoZWNrZXI6OmdldEd1ZXNzZXNGb3JXb3JkKGludDYKICAgICBub3RJbXBsZW1lbnRlZCgpOwog fQogCit2b2lkIFRleHRDaGVja2VyOjpsZWFybldvcmQoY29uc3QgU3RyaW5nJiB3b3JkKQorewor ICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKK3ZvaWQgVGV4dENoZWNrZXI6Omlnbm9yZVdvcmQo aW50NjRfdCBzcGVsbERvY3VtZW50VGFnLCBjb25zdCBTdHJpbmcmIHdvcmQpCit7CisgICAgbm90 SW1wbGVtZW50ZWQoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNw cAkocmV2aXNpb24gNzUwNzgpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRWRpdG9yQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY0LDE0ICszNjQsMTQgQEAg dm9pZCBXZWJFZGl0b3JDbGllbnQ6OnRleHRXaWxsQmVEZWxldGVkSQogICAgIG1fcGFnZS0+aW5q ZWN0ZWRCdW5kbGVGb3JtQ2xpZW50KCkuc2hvdWxkUGVyZm9ybUFjdGlvbkluVGV4dEZpZWxkKG1f cGFnZSwgc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGVsZW1lbnQpLCBXS0lucHV0Rmll bGRBY3Rpb25UeXBlSW5zZXJ0RGVsZXRlLCB3ZWJGcmFtZSk7CiB9CiAKLXZvaWQgV2ViRWRpdG9y Q2xpZW50OjppZ25vcmVXb3JkSW5TcGVsbERvY3VtZW50KGNvbnN0IFN0cmluZyYpCit2b2lkIFdl YkVkaXRvckNsaWVudDo6aWdub3JlV29yZEluU3BlbGxEb2N1bWVudChjb25zdCBTdHJpbmcmIHdv cmQpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6SWdub3JlV29yZCh3b3JkKSk7CiB9CiAKLXZvaWQgV2ViRWRpdG9yQ2xp ZW50OjpsZWFybldvcmQoY29uc3QgU3RyaW5nJikKK3ZvaWQgV2ViRWRpdG9yQ2xpZW50OjpsZWFy bldvcmQoY29uc3QgU3RyaW5nJiB3b3JkKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAg bV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkxlYXJuV29yZCh3b3JkKSk7CiB9 CiAKIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpjaGVja1NwZWxsaW5nT2ZTdHJpbmcoY29uc3QgVUNo YXIqLCBpbnQsIGludCosIGludCopCkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvbWFjL1dlYkVkaXRvckNsaWVudE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkVkaXRvckNsaWVudE1hYy5tbQkocmV2aXNp b24gNzUwNzkpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkVk aXRvckNsaWVudE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTY5LDcgKzE2OSw4IEBAIGJvb2wg V2ViRWRpdG9yQ2xpZW50Ojppc0F1dG9tYXRpY1F1b3RlU3UKIAogdm9pZCBXZWJFZGl0b3JDbGll bnQ6OnRvZ2dsZUF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uKCkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIC8vIFRoaXMgc2hvdWxkIGJlIGhhbmRsZWQgaW4gdGhlIFVJIHByb2Nlc3Mu CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKIGJvb2wgV2ViRWRpdG9yQ2xpZW50Ojpp c0F1dG9tYXRpY0xpbmtEZXRlY3Rpb25FbmFibGVkKCkKQEAgLTE3OSw3ICsxODAsOCBAQCBib29s IFdlYkVkaXRvckNsaWVudDo6aXNBdXRvbWF0aWNMaW5rRGV0CiAKIHZvaWQgV2ViRWRpdG9yQ2xp ZW50Ojp0b2dnbGVBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uKCkKIHsKLSAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgIC8vIFRoaXMgc2hvdWxkIGJlIGhhbmRsZWQgaW4gdGhlIFVJIHByb2Nlc3MuCisg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKIGJvb2wgV2ViRWRpdG9yQ2xpZW50Ojppc0F1 dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkKCkKQEAgLTE4OSw3ICsxOTEsOCBAQCBib29s IFdlYkVkaXRvckNsaWVudDo6aXNBdXRvbWF0aWNEYXNoU3ViCiAKIHZvaWQgV2ViRWRpdG9yQ2xp ZW50Ojp0b2dnbGVBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uKCkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIC8vIFRoaXMgc2hvdWxkIGJlIGhhbmRsZWQgaW4gdGhlIFVJIHByb2Nlc3Mu CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKIGJvb2wgV2ViRWRpdG9yQ2xpZW50Ojpp c0F1dG9tYXRpY1RleHRSZXBsYWNlbWVudEVuYWJsZWQoKQpAQCAtMTk5LDcgKzIwMiw4IEBAIGJv b2wgV2ViRWRpdG9yQ2xpZW50Ojppc0F1dG9tYXRpY1RleHRSZXAKIAogdm9pZCBXZWJFZGl0b3JD bGllbnQ6OnRvZ2dsZUF1dG9tYXRpY1RleHRSZXBsYWNlbWVudCgpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICAvLyBUaGlzIHNob3VsZCBiZSBoYW5kbGVkIGluIHRoZSBVSSBwcm9jZXNz LgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBib29sIFdlYkVkaXRvckNsaWVudDo6 aXNBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb25FbmFibGVkKCkKSW5kZXg6IFdlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA3NTA3OCkKKysrIFdlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw2ICs2Miw3 IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9BcmNoaXZlUmVzb3VyY2UuaD4KICNpbmNsdWRlIDxXZWJD b3JlL0Nocm9tZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ29udGV4dE1lbnVDb250cm9sbGVyLmg+ CisjaW5jbHVkZSA8V2ViQ29yZS9Eb2N1bWVudEZyYWdtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9Eb2N1bWVudExvYWRlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRG9jdW1lbnRNYXJrZXJDb250 cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9FdmVudEhhbmRsZXIuaD4KQEAgLTc0LDExICs3 NSwxMyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGxh dGZvcm1LZXlib2FyZEV2ZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZW5kZXJUcmVlQXNUZXh0 Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXR0aW5n cy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9TdWJzdGl0dXRlRGF0YS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVGV4dEl0ZXJhdG9yLmg+Cisj aW5jbHVkZSA8V2ViQ29yZS9tYXJrdXAuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgog I2luY2x1ZGUgPHJ1bnRpbWUvSlNWYWx1ZS5oPgogCkBAIC0xMjU2LDEwICsxMjU5LDIxIEBAIHZv aWQgV2ViUGFnZTo6ZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCkKICAgICBtX2FjdGl2ZU9wZW5QYW5l bFJlc3VsdExpc3RlbmVyID0gMDsKIH0KIAotdm9pZCBXZWJQYWdlOjphZHZhbmNlVG9OZXh0TWlz c3BlbGxpbmcoKQordm9pZCBXZWJQYWdlOjphZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmcoYm9vbCBz dGFydEJlZm9yZVNlbGVjdGlvbikKIHsKLSAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5m b2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCkpCi0gICAgICAgIGZyYW1lLT5l ZGl0b3IoKS0+YWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKCk7CisgICAgRnJhbWUqIGZyYW1lID0g bV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CisgICAgZnJh bWUtPmVkaXRvcigpLT5hZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmcoc3RhcnRCZWZvcmVTZWxlY3Rp b24pOworfQorCit2b2lkIFdlYlBhZ2U6OmNoYW5nZVNwZWxsaW5nVG9Xb3JkKGNvbnN0IFN0cmlu ZyYgd29yZCkKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigp LT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBpZiAoZnJhbWUtPnNlbGVjdGlvbigpLT5pc05v bmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IHRl eHRGcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoZnJhbWUtPnNlbGVjdGlvbigpLT50 b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpLCB3b3JkKTsKKyAgICBhcHBseUNvbW1hbmQoUmVwbGFj ZVNlbGVjdGlvbkNvbW1hbmQ6OmNyZWF0ZShmcmFtZS0+ZG9jdW1lbnQoKSwgdGV4dEZyYWdtZW50 LnJlbGVhc2UoKSwgdHJ1ZSwgZmFsc2UsIHRydWUpKTsKKyAgICBmcmFtZS0+c2VsZWN0aW9uKCkt PnJldmVhbFNlbGVjdGlvbihTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQpOwog fQogCiB2b2lkIFdlYlBhZ2U6OnVubWFya0FsbE1pc3NwZWxsaW5ncygpCkluZGV4OiBXZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA3NTA3OCkKKysrIFdlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzc0LDcgKzM3NCw4 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbChjb25zdCBW ZWN0b3I8U3RyaW5nPiYpOwogICAgIHZvaWQgZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCk7CiAKLSAg ICB2b2lkIGFkdmFuY2VUb05leHRNaXNzcGVsbGluZygpOworICAgIHZvaWQgYWR2YW5jZVRvTmV4 dE1pc3NwZWxsaW5nKGJvb2wgc3RhcnRCZWZvcmVTZWxlY3Rpb24pOworICAgIHZvaWQgY2hhbmdl U3BlbGxpbmdUb1dvcmQoY29uc3QgU3RyaW5nJiB3b3JkKTsKICAgICB2b2lkIHVubWFya0FsbE1p c3NwZWxsaW5ncygpOwogICAgIHZvaWQgdW5tYXJrQWxsQmFkR3JhbW1hcigpOwogCkluZGV4OiBX ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlz aW9uIDc1MDc4KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTAxLDcgKzEwMSw4IEBAIG1lc3NhZ2VzIC0+IFdlYlBh Z2UgewogICAgIERpZENhbmNlbEZvck9wZW5QYW5lbCgpCiAKICAgICAjIFNwZWxpbmcgYW5kIGdy YW1tZXIuCi0gICAgQWR2YW5jZVRvTmV4dE1pc3NwZWxsaW5nKCkKKyAgICBBZHZhbmNlVG9OZXh0 TWlzc3BlbGxpbmcoYm9vbCBzdGFydEJlZm9yZVNlbGVjdGlvbikKKyAgICBDaGFuZ2VTcGVsbGlu Z1RvV29yZChXVEY6OlN0cmluZyB3b3JkKQogICAgIFVubWFya0FsbE1pc3NwZWxsaW5ncygpCiAg ICAgVW5tYXJrQWxsQmFkR3JhbW1hcigpCiAK