75520 2012-01-03 21:28:08 -0800 HTMLConstructionSite::attach shouldn't return a value 2012-01-03 23:05:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric webkit.review.bot oldest_to_newest 529304 0 abarth 2012-01-03 21:28:08 -0800 HTMLConstructionSite::attach shouldn't return a value 529309 1 121056 abarth 2012-01-03 21:30:24 -0800 Created attachment 121056 Patch 529345 2 121056 eric 2012-01-03 22:16:23 -0800 Comment on attachment 121056 Patch LGTM. 529375 3 121056 webkit.review.bot 2012-01-03 23:05:51 -0800 Comment on attachment 121056 Patch Clearing flags on attachment: 121056 Committed r104015: <http://trac.webkit.org/changeset/104015> 529376 4 webkit.review.bot 2012-01-03 23:05:55 -0800 All reviewed patches have been landed. Closing bug. 121056 2012-01-03 21:30:24 -0800 2012-01-03 23:05:50 -0800 Patch bug-75520-20120103213023.patch text/plain 12112 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDAwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEyLTAxLTAzICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSFRNTENvbnN0cnVjdGlvblNpdGU6 OmF0dGFjaCBzaG91bGRuJ3QgcmV0dXJuIGEgdmFsdWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgdXNlZCB0byByZXR1cm4gYSB2YWx1ZSB0byBhdm9p ZCBzb21lIHJlZmNodXJuLCBidXQgbm93IHRoYXQgd2UncmUKKyAgICAgICAgdXNpbmcgdGFza3Ms IHdlIGFsd2F5cyBuZWVkIHRvIHRha2UgdGhhdCByZWZlcmVuY2UuICBSZW1vdmluZyB0aGUKKyAg ICAgICAgcmV0dXJuIHZhbHVlIGxldHMgdXMgcmVtb3ZlIHRoZSB0ZW1wbGF0ZSBwYXJhbWV0ZXIs IHdoaWNoIGlzIGEgYm9vbi4KKyAgICAgICAgVGhpcyBwYXRjaCBoYXMgbm8gaW1wYWN0IG9uIHRo ZSBodG1sLXBhcnNlci5odG1sIGJlbmNobWFyay4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hU TUxDb25zdHJ1Y3Rpb25TaXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rp b25TaXRlOjphdHRhY2hMYXRlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9u U2l0ZTo6aW5zZXJ0SFRNTEh0bWxTdGFydFRhZ0JlZm9yZUhUTUwpOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydEhUTUxIdG1sU3RhcnRUYWdJbkJvZHkpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydERvY3R5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydENvbW1lbnQpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydENvbW1lbnRPbkRv Y3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRD b21tZW50T25IVE1MSHRtbEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVj dGlvblNpdGU6Omluc2VydEhUTUxIZWFkRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M Q29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEJvZHlFbGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRIVE1MRm9ybUVsZW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydEhUTUxFbGVtZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRTZWxmQ2xvc2luZ0hU TUxFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNl cnRTY3JpcHRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRl OjppbnNlcnRGb3JlaWduRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0 aW9uU2l0ZTo6aW5zZXJ0VGV4dE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVj dGlvblNpdGU6OnJlY29uc3RydWN0VGhlQWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpmb3N0ZXJQYXJlbnQpOgorICAgICAg ICAqIGh0bWwvcGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmg6CisKIDIwMTItMDEtMDMgIEth cmwgS29zY2hlciAgPHN1cGVyc2F0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBHaXZlIGVtYmVk ZGVycyBhIGNoYW5jZSB0byBoYW5kbGUgcG9zdE1lc3NhZ2UgY2FsbHMKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHAJKHJl dmlzaW9uIDEwNDAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1 Y3Rpb25TaXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA2LDIwICsxMDYsMTUgQEAgc3RhdGlj IGlubGluZSB2b2lkIGV4ZWN1dGVUYXNrKEhUTUxDb25zdAogICAgICAgICB0YXNrLmNoaWxkLT5m aW5pc2hQYXJzaW5nQ2hpbGRyZW4oKTsKIH0KIAotLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24gc2hv dWxkIHJldHVybiB2b2lkLiBDYWxsZXJzIHNob3VsZCBrZWVwIGEgcG9pbnRlciB0bwotLy8gdGhl IGNoaWxkIGlmIHRoZXkgd2FudCBvbmUuCi10ZW1wbGF0ZTx0eXBlbmFtZSBDaGlsZFR5cGU+Ci1Q YXNzUmVmUHRyPENoaWxkVHlwZT4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmF0dGFjaChDb250YWlu ZXJOb2RlKiBwYXJlbnQsIFBhc3NSZWZQdHI8Q2hpbGRUeXBlPiBwcnBDaGlsZCkKK3ZvaWQgSFRN TENvbnN0cnVjdGlvblNpdGU6OmF0dGFjaExhdGVyKENvbnRhaW5lck5vZGUqIHBhcmVudCwgUGFz c1JlZlB0cjxOb2RlPiBwcnBDaGlsZCkKIHsKLSAgICBSZWZQdHI8Q2hpbGRUeXBlPiBjaGlsZCA9 IHBycENoaWxkOwotCiAgICAgSFRNTENvbnN0cnVjdGlvblNpdGVUYXNrIHRhc2s7CiAgICAgdGFz ay5wYXJlbnQgPSBwYXJlbnQ7Ci0gICAgdGFzay5jaGlsZCA9IGNoaWxkLmdldCgpOworICAgIHRh c2suY2hpbGQgPSBwcnBDaGlsZDsKIAogICAgIGlmIChzaG91bGRGb3N0ZXJQYXJlbnQoKSkgewog ICAgICAgICBmb3N0ZXJQYXJlbnQodGFzay5jaGlsZCk7Ci0gICAgICAgIHJldHVybiBjaGlsZC5y ZWxlYXNlKCk7CisgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICAvLyBBZGQgYXMgYSBzaWJs aW5nIG9mIHRoZSBwYXJlbnQgaWYgd2UgaGF2ZSByZWFjaGVkIHRoZSBtYXhpbXVtIGRlcHRoIGFs bG93ZWQuCkBAIC0xMjcsNyArMTIyLDYgQEAgUGFzc1JlZlB0cjxDaGlsZFR5cGU+IEhUTUxDb25z dHJ1Y3Rpb25TaQogICAgICAgICB0YXNrLnBhcmVudCA9IHRhc2sucGFyZW50LT5wYXJlbnROb2Rl KCk7CiAKICAgICBtX2F0dGFjaG1lbnRRdWV1ZS5hcHBlbmQodGFzayk7Ci0gICAgcmV0dXJuIGNo aWxkLnJlbGVhc2UoKTsKIH0KIAogdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6ZXhlY3V0ZVF1 ZXVlZFRhc2tzKCkKQEAgLTIwMCw3ICsxOTQsOSBAQCB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRl OjppbnNlcnRIVE1MSHRtCiB7CiAgICAgUmVmUHRyPEhUTUxIdG1sRWxlbWVudD4gZWxlbWVudCA9 IEhUTUxIdG1sRWxlbWVudDo6Y3JlYXRlKG1fZG9jdW1lbnQpOwogICAgIGVsZW1lbnQtPnBhcnNl clNldEF0dHJpYnV0ZU1hcCh0b2tlbi50YWtlQXR0cmlidXRlcygpLCBtX2ZyYWdtZW50U2NyaXB0 aW5nUGVybWlzc2lvbik7Ci0gICAgbV9vcGVuRWxlbWVudHMucHVzaEhUTUxIdG1sRWxlbWVudChh dHRhY2g8RWxlbWVudD4obV9hdHRhY2htZW50Um9vdCwgZWxlbWVudC5nZXQoKSkpOworICAgIGF0 dGFjaExhdGVyKG1fYXR0YWNobWVudFJvb3QsIGVsZW1lbnQpOworICAgIG1fb3BlbkVsZW1lbnRz LnB1c2hIVE1MSHRtbEVsZW1lbnQoZWxlbWVudCk7CisgICAgLy8gRklYTUU6IFdlIHByb2JhYmx5 IG5lZWQgdG8gY2FsbCBleGVjdXRlUXVldWVkVGFza3MoKSBiZWZvcmUgY2FsbGluZyB0aGVzZSBt ZXRob2RzLgogICAgIGVsZW1lbnQtPmluc2VydGVkQnlQYXJzZXIoKTsKICAgICBkaXNwYXRjaERv Y3VtZW50RWxlbWVudEF2YWlsYWJsZUlmTmVlZGVkKCk7CiB9CkBAIC0yMjEsNyArMjE3LDcgQEAg dm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6bWVyZ2VBdHRyaWJ1dAogdm9pZCBIVE1MQ29uc3Ry dWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEh0bWxTdGFydFRhZ0luQm9keShBdG9taWNIVE1MVG9rZW4m IHRva2VuKQogewogICAgIC8vIEZJWE1FOiBwYXJzZSBlcnJvcgotICAgIAorCiAgICAgLy8gRnJh Z21lbnRzIGRvIG5vdCBoYXZlIGEgcm9vdCBIVE1MIGVsZW1lbnQsIHNvIGFueSBhZGRpdGlvbmFs IEhUTUwgZWxlbWVudHMKICAgICAvLyBlbmNvdW50ZXJlZCBkdXJpbmcgZnJhZ21lbnQgcGFyc2lu ZyBzaG91bGQgYmUgaWdub3JlZC4KICAgICBpZiAobV9pc1BhcnNpbmdGcmFnbWVudCkKQEAgLTIz OSw3ICsyMzUsOSBAQCB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRIVE1MQm9kCiB2 b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnREb2N0eXBlKEF0b21pY0hUTUxUb2tlbiYg dG9rZW4pCiB7CiAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW5UeXBlczo6RE9D VFlQRSk7Ci0gICAgYXR0YWNoKG1fYXR0YWNobWVudFJvb3QsIERvY3VtZW50VHlwZTo6Y3JlYXRl KG1fZG9jdW1lbnQsIHRva2VuLm5hbWUoKSwgU3RyaW5nOjphZG9wdCh0b2tlbi5wdWJsaWNJZGVu dGlmaWVyKCkpLCBTdHJpbmc6OmFkb3B0KHRva2VuLnN5c3RlbUlkZW50aWZpZXIoKSkpKTsKKwor ICAgIFJlZlB0cjxEb2N1bWVudFR5cGU+IGRvY3R5cGUgPSBEb2N1bWVudFR5cGU6OmNyZWF0ZSht X2RvY3VtZW50LCB0b2tlbi5uYW1lKCksIFN0cmluZzo6YWRvcHQodG9rZW4ucHVibGljSWRlbnRp ZmllcigpKSwgU3RyaW5nOjphZG9wdCh0b2tlbi5zeXN0ZW1JZGVudGlmaWVyKCkpKTsKKyAgICBh dHRhY2hMYXRlcihtX2F0dGFjaG1lbnRSb290LCBkb2N0eXBlLnJlbGVhc2UoKSk7CiAKICAgICAv LyBET0NUWVBFIG5vZGVzIGFyZSBvbmx5IHByb2Nlc3NlZCB3aGVuIHBhcnNpbmcgZnJhZ21lbnRz IHcvbyBjb250ZXh0RWxlbWVudHMsIHdoaWNoCiAgICAgLy8gbmV2ZXIgb2NjdXJzLiAgSG93ZXZl ciwgaWYgd2UgZXZlciBjaG9zZSB0byBzdXBwb3J0IHN1Y2gsIHRoaXMgY29kZSBpcyBzdWJ0bHkg d3JvbmcsCkBAIC0yNjIsNjEgKzI2MCw1OSBAQCB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpp bnNlcnREb2N0eXBlCiB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRDb21tZW50KEF0 b21pY0hUTUxUb2tlbiYgdG9rZW4pCiB7CiAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1M VG9rZW5UeXBlczo6Q29tbWVudCk7Ci0gICAgYXR0YWNoKGN1cnJlbnROb2RlKCksIENvbW1lbnQ6 OmNyZWF0ZShjdXJyZW50Tm9kZSgpLT5kb2N1bWVudCgpLCB0b2tlbi5jb21tZW50KCkpKTsKKyAg ICBhdHRhY2hMYXRlcihjdXJyZW50Tm9kZSgpLCBDb21tZW50OjpjcmVhdGUoY3VycmVudE5vZGUo KS0+ZG9jdW1lbnQoKSwgdG9rZW4uY29tbWVudCgpKSk7CiB9CiAKIHZvaWQgSFRNTENvbnN0cnVj dGlvblNpdGU6Omluc2VydENvbW1lbnRPbkRvY3VtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiB7CiAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW5UeXBlczo6Q29tbWVudCk7 Ci0gICAgYXR0YWNoKG1fYXR0YWNobWVudFJvb3QsIENvbW1lbnQ6OmNyZWF0ZShtX2RvY3VtZW50 LCB0b2tlbi5jb21tZW50KCkpKTsKKyAgICBhdHRhY2hMYXRlcihtX2F0dGFjaG1lbnRSb290LCBD b21tZW50OjpjcmVhdGUobV9kb2N1bWVudCwgdG9rZW4uY29tbWVudCgpKSk7CiB9CiAKIHZvaWQg SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydENvbW1lbnRPbkhUTUxIdG1sRWxlbWVudChBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRv a2VuVHlwZXM6OkNvbW1lbnQpOwogICAgIENvbnRhaW5lck5vZGUqIHBhcmVudCA9IG1fb3BlbkVs ZW1lbnRzLnJvb3ROb2RlKCk7Ci0gICAgYXR0YWNoKHBhcmVudCwgQ29tbWVudDo6Y3JlYXRlKHBh cmVudC0+ZG9jdW1lbnQoKSwgdG9rZW4uY29tbWVudCgpKSk7Ci19Ci0KLVBhc3NSZWZQdHI8RWxl bWVudD4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmF0dGFjaFRvQ3VycmVudChQYXNzUmVmUHRyPEVs ZW1lbnQ+IGNoaWxkKQotewotICAgIHJldHVybiBhdHRhY2goY3VycmVudE5vZGUoKSwgY2hpbGQp OworICAgIGF0dGFjaExhdGVyKHBhcmVudCwgQ29tbWVudDo6Y3JlYXRlKHBhcmVudC0+ZG9jdW1l bnQoKSwgdG9rZW4uY29tbWVudCgpKSk7CiB9CiAKIHZvaWQgSFRNTENvbnN0cnVjdGlvblNpdGU6 Omluc2VydEhUTUxIZWFkRWxlbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFT U0VSVCghc2hvdWxkRm9zdGVyUGFyZW50KCkpOwotICAgIG1faGVhZCA9IGF0dGFjaFRvQ3VycmVu dChjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikpOworICAgIG1faGVhZCA9IGNyZWF0ZUhUTUxFbGVt ZW50KHRva2VuKTsKKyAgICBhdHRhY2hMYXRlcihjdXJyZW50Tm9kZSgpLCBtX2hlYWQpOwogICAg IG1fb3BlbkVsZW1lbnRzLnB1c2hIVE1MSGVhZEVsZW1lbnQobV9oZWFkKTsKIH0KIAogdm9pZCBI VE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEJvZHlFbGVtZW50KEF0b21pY0hUTUxUb2tl biYgdG9rZW4pCiB7CiAgICAgQVNTRVJUKCFzaG91bGRGb3N0ZXJQYXJlbnQoKSk7Ci0gICAgbV9v cGVuRWxlbWVudHMucHVzaEhUTUxCb2R5RWxlbWVudChhdHRhY2hUb0N1cnJlbnQoY3JlYXRlSFRN TEVsZW1lbnQodG9rZW4pKSk7CisgICAgUmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBjcmVhdGVIVE1M RWxlbWVudCh0b2tlbik7CisgICAgYXR0YWNoTGF0ZXIoY3VycmVudE5vZGUoKSwgYm9keSk7Cisg ICAgbV9vcGVuRWxlbWVudHMucHVzaEhUTUxCb2R5RWxlbWVudChib2R5LnJlbGVhc2UoKSk7CiB9 CiAKIHZvaWQgSFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydEhUTUxGb3JtRWxlbWVudChBdG9t aWNIVE1MVG9rZW4mIHRva2VuLCBib29sIGlzRGVtb3RlZCkKIHsKICAgICBSZWZQdHI8RWxlbWVu dD4gZWxlbWVudCA9IGNyZWF0ZUhUTUxFbGVtZW50KHRva2VuKTsKICAgICBBU1NFUlQoZWxlbWVu dC0+aGFzVGFnTmFtZShmb3JtVGFnKSk7Ci0gICAgUmVmUHRyPEhUTUxGb3JtRWxlbWVudD4gZm9y bSA9IHN0YXRpY19wb2ludGVyX2Nhc3Q8SFRNTEZvcm1FbGVtZW50PihlbGVtZW50LnJlbGVhc2Uo KSk7Ci0gICAgZm9ybS0+c2V0RGVtb3RlZChpc0RlbW90ZWQpOwotICAgIG1fb3BlbkVsZW1lbnRz LnB1c2goYXR0YWNoVG9DdXJyZW50KGZvcm0ucmVsZWFzZSgpKSk7Ci0gICAgQVNTRVJUKGN1cnJl bnRFbGVtZW50KCktPmlzSFRNTEVsZW1lbnQoKSk7Ci0gICAgQVNTRVJUKGN1cnJlbnRFbGVtZW50 KCktPmhhc1RhZ05hbWUoZm9ybVRhZykpOwotICAgIG1fZm9ybSA9IHN0YXRpY19jYXN0PEhUTUxG b3JtRWxlbWVudCo+KGN1cnJlbnRFbGVtZW50KCkpOworICAgIG1fZm9ybSA9IHN0YXRpY19wb2lu dGVyX2Nhc3Q8SFRNTEZvcm1FbGVtZW50PihlbGVtZW50LnJlbGVhc2UoKSk7CisgICAgbV9mb3Jt LT5zZXREZW1vdGVkKGlzRGVtb3RlZCk7CisgICAgYXR0YWNoTGF0ZXIoY3VycmVudE5vZGUoKSwg bV9mb3JtKTsKKyAgICBtX29wZW5FbGVtZW50cy5wdXNoKG1fZm9ybSk7CiB9CiAKIHZvaWQgSFRN TENvbnN0cnVjdGlvblNpdGU6Omluc2VydEhUTUxFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9r ZW4pCiB7Ci0gICAgbV9vcGVuRWxlbWVudHMucHVzaChhdHRhY2hUb0N1cnJlbnQoY3JlYXRlSFRN TEVsZW1lbnQodG9rZW4pKSk7CisgICAgUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQgPSBjcmVhdGVI VE1MRWxlbWVudCh0b2tlbik7CisgICAgYXR0YWNoTGF0ZXIoY3VycmVudE5vZGUoKSwgZWxlbWVu dCk7CisgICAgbV9vcGVuRWxlbWVudHMucHVzaChlbGVtZW50LnJlbGVhc2UoKSk7CiB9CiAKIHZv aWQgSFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydFNlbGZDbG9zaW5nSFRNTEVsZW1lbnQoQXRv bWljSFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxU b2tlblR5cGVzOjpTdGFydFRhZyk7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQgPSBhdHRh Y2hUb0N1cnJlbnQoY3JlYXRlSFRNTEVsZW1lbnQodG9rZW4pKTsKKyAgICBhdHRhY2hMYXRlcihj dXJyZW50Tm9kZSgpLCBjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikpOwogICAgIC8vIE5vcm1hbGx5 IEhUTUxFbGVtZW50U3RhY2sgaXMgcmVzcG9uc2libGUgZm9yIGNhbGxpbmcgZmluaXNoUGFyc2lu Z0NoaWxkcmVuLAogICAgIC8vIGJ1dCBzZWxmLWNsb3NpbmcgZWxlbWVudHMgYXJlIG5ldmVyIGlu IHRoZSBlbGVtZW50IHN0YWNrIHNvIHRoZSBzdGFjawogICAgIC8vIGRvZXNuJ3QgZ2V0IGEgY2hh bmNlIHRvIHRlbGwgdGhlbSB0aGF0IHdlJ3JlIGRvbmUgcGFyc2luZyB0aGVpciBjaGlsZHJlbi4K QEAgLTMzOSw3ICszMzUsOCBAQCB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRTY3Jp cHRFCiAgICAgUmVmUHRyPEhUTUxTY3JpcHRFbGVtZW50PiBlbGVtZW50ID0gSFRNTFNjcmlwdEVs ZW1lbnQ6OmNyZWF0ZShzY3JpcHRUYWcsIGN1cnJlbnROb2RlKCktPmRvY3VtZW50KCksIHRydWUp OwogICAgIGlmIChtX2ZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiA9PSBGcmFnbWVudFNjcmlw dGluZ0FsbG93ZWQpCiAgICAgICAgIGVsZW1lbnQtPnBhcnNlclNldEF0dHJpYnV0ZU1hcCh0b2tl bi50YWtlQXR0cmlidXRlcygpLCBtX2ZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbik7Ci0gICAg bV9vcGVuRWxlbWVudHMucHVzaChhdHRhY2hUb0N1cnJlbnQoZWxlbWVudC5yZWxlYXNlKCkpKTsK KyAgICBhdHRhY2hMYXRlcihjdXJyZW50Tm9kZSgpLCBlbGVtZW50KTsKKyAgICBtX29wZW5FbGVt ZW50cy5wdXNoKGVsZW1lbnQucmVsZWFzZSgpKTsKIH0KIAogdm9pZCBIVE1MQ29uc3RydWN0aW9u U2l0ZTo6aW5zZXJ0Rm9yZWlnbkVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbiwgY29uc3Qg QXRvbWljU3RyaW5nJiBuYW1lc3BhY2VVUkkpCkBAIC0zNDcsMTYgKzM0NCwxOSBAQCB2b2lkIEhU TUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRGb3JlaWduCiAgICAgQVNTRVJUKHRva2VuLnR5cGUo KSA9PSBIVE1MVG9rZW5UeXBlczo6U3RhcnRUYWcpOwogICAgIG5vdEltcGxlbWVudGVkKCk7IC8v IHBhcnNlRXJyb3Igd2hlbiB4bWxucyBvciB4bWxuczp4bGluayBhcmUgd3JvbmcuCiAKLSAgICBS ZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IGF0dGFjaFRvQ3VycmVudChjcmVhdGVFbGVtZW50KHRv a2VuLCBuYW1lc3BhY2VVUkkpKTsKKyAgICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IGNyZWF0 ZUVsZW1lbnQodG9rZW4sIG5hbWVzcGFjZVVSSSk7CisgICAgYXR0YWNoTGF0ZXIoY3VycmVudE5v ZGUoKSwgZWxlbWVudCk7CisgICAgLy8gRklYTUU6IERvbid0IHdlIG5lZWQgdG8gc2V0IHRoZSBz ZWxmQ2xvc2luZyBmbGFnIG9uIHRoZSB0YXNrIGlmIHdlJ3JlCisgICAgLy8gbm90IGdvaW5nIHRv IHB1c2ggdGhlIGVsZW1lbnQgb24gdG8gdGhlIHN0YWNrIG9mIG9wZW4gZWxlbWVudHM/CiAgICAg aWYgKCF0b2tlbi5zZWxmQ2xvc2luZygpKQotICAgICAgICBtX29wZW5FbGVtZW50cy5wdXNoKGVs ZW1lbnQpOworICAgICAgICBtX29wZW5FbGVtZW50cy5wdXNoKGVsZW1lbnQucmVsZWFzZSgpKTsK IH0KIAogdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0VGV4dE5vZGUoY29uc3QgU3Ry aW5nJiBjaGFyYWN0ZXJzLCBXaGl0ZXNwYWNlTW9kZSB3aGl0ZXNwYWNlTW9kZSkKIHsKICAgICBI VE1MQ29uc3RydWN0aW9uU2l0ZVRhc2sgdGFzazsKICAgICB0YXNrLnBhcmVudCA9IGN1cnJlbnRO b2RlKCk7Ci0gICAgdGFzay5uZXh0Q2hpbGQgPSAwOworCiAgICAgaWYgKHNob3VsZEZvc3RlclBh cmVudCgpKQogICAgICAgICBmaW5kRm9zdGVyU2l0ZSh0YXNrKTsKIApAQCAtNDIwLDcgKzQyMCw4 IEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gSFRNTENvbnN0cnVjdGlvblNpdGUKIAogbmFtZXNwYWNl IHsKIAotUGFzc1JlZlB0cjxOYW1lZE5vZGVNYXA+IGNsb25lQXR0cmlidXRlcyhFbGVtZW50KiBl bGVtZW50KQorLy8gRklYTUU6IE1vdmUgdGhpcyBmdW5jdGlvbiB0byB0aGUgdG9wIG9mIHRoZSBm aWxlLgoraW5saW5lIFBhc3NSZWZQdHI8TmFtZWROb2RlTWFwPiBjbG9uZUF0dHJpYnV0ZXMoRWxl bWVudCogZWxlbWVudCkKIHsKICAgICBOYW1lZE5vZGVNYXAqIGF0dHJpYnV0ZXMgPSBlbGVtZW50 LT5hdHRyaWJ1dGVzKHRydWUpOwogICAgIGlmICghYXR0cmlidXRlcykKQEAgLTQzNSw3ICs0MzYs NyBAQCBQYXNzUmVmUHRyPE5hbWVkTm9kZU1hcD4gY2xvbmVBdHRyaWJ1dGVzCiAgICAgcmV0dXJu IG5ld0F0dHJpYnV0ZXMucmVsZWFzZSgpOwogfQogCi19Cit9IC8vIG5hbWVzcGFjZQogCiBQYXNz UmVmUHRyPEVsZW1lbnQ+IEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpjcmVhdGVIVE1MRWxlbWVudEZy b21TYXZlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKIHsKQEAgLTQ3OSw3ICs0ODAsOCBAQCB2 b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpyZWNvbnN0cnVjdFRoCiAgICAgZm9yICg7IHVub3Bl bkVudHJ5SW5kZXggPCBtX2FjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5zaXplKCk7ICsrdW5vcGVu RW50cnlJbmRleCkgewogICAgICAgICBIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjpFbnRyeSYg dW5vcGVuZWRFbnRyeSA9IG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzLmF0KHVub3BlbkVudHJ5 SW5kZXgpOwogICAgICAgICBSZWZQdHI8RWxlbWVudD4gcmVjb25zdHJ1Y3RlZCA9IGNyZWF0ZUhU TUxFbGVtZW50RnJvbVNhdmVkRWxlbWVudCh1bm9wZW5lZEVudHJ5LmVsZW1lbnQoKSk7Ci0gICAg ICAgIG1fb3BlbkVsZW1lbnRzLnB1c2goYXR0YWNoVG9DdXJyZW50KHJlY29uc3RydWN0ZWQucmVs ZWFzZSgpKSk7CisgICAgICAgIGF0dGFjaExhdGVyKGN1cnJlbnROb2RlKCksIHJlY29uc3RydWN0 ZWQpOworICAgICAgICBtX29wZW5FbGVtZW50cy5wdXNoKHJlY29uc3RydWN0ZWQucmVsZWFzZSgp KTsKICAgICAgICAgdW5vcGVuZWRFbnRyeS5yZXBsYWNlRWxlbWVudChjdXJyZW50RWxlbWVudCgp KTsKICAgICB9CiB9CkBAIC01MjMsNyArNTI1LDYgQEAgYm9vbCBIVE1MQ29uc3RydWN0aW9uU2l0 ZTo6c2hvdWxkRm9zdGVyUAogdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6Zm9zdGVyUGFyZW50 KFBhc3NSZWZQdHI8Tm9kZT4gbm9kZSkKIHsKICAgICBIVE1MQ29uc3RydWN0aW9uU2l0ZVRhc2sg dGFzazsKLSAgICB0YXNrLm5leHRDaGlsZCA9IDA7CiAgICAgZmluZEZvc3RlclNpdGUodGFzayk7 CiAgICAgdGFzay5jaGlsZCA9IG5vZGU7CiAgICAgZXhlY3V0ZVRhc2sodGFzayk7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmgJ KHJldmlzaW9uIDEwNDAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25z dHJ1Y3Rpb25TaXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw5ICsxNTUsNyBAQCBwcml2YXRl OgogICAgIC8vIHRva2VucyBwcm9kdWNlIG9ubHkgb25lIERPTSBtdXRhdGlvbi4KICAgICB0eXBl ZGVmIFZlY3RvcjxIVE1MQ29uc3RydWN0aW9uU2l0ZVRhc2ssIDE+IEF0dGFjaG1lbnRRdWV1ZTsK IAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIENoaWxkVHlwZT4KLSAgICBQYXNzUmVmUHRyPENoaWxk VHlwZT4gYXR0YWNoKENvbnRhaW5lck5vZGUqIHBhcmVudCwgUGFzc1JlZlB0cjxDaGlsZFR5cGU+ IGNoaWxkKTsKLSAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+IGF0dGFjaFRvQ3VycmVudChQYXNzUmVm UHRyPEVsZW1lbnQ+KTsKKyAgICB2b2lkIGF0dGFjaExhdGVyKENvbnRhaW5lck5vZGUqIHBhcmVu dCwgUGFzc1JlZlB0cjxOb2RlPiBjaGlsZCk7CiAKICAgICB2b2lkIGZpbmRGb3N0ZXJTaXRlKEhU TUxDb25zdHJ1Y3Rpb25TaXRlVGFzayYpOwogCg==