217925 2020-10-19 15:34:42 -0700 Don't OSR exit to bc#0 for FTL argument type checks during loop OSR entry 2020-10-20 21:00:12 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov guijemont jsc32 keith_miller mark.lam msaboff rmorisset ross.kirsling ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1699488 0 saam 2020-10-19 15:34:42 -0700 ... 1699491 1 saam 2020-10-19 15:38:53 -0700 <rdar://problem/70369407> 1699504 2 411809 saam 2020-10-19 16:14:39 -0700 Created attachment 411809 patch 1699540 3 411809 msaboff 2020-10-19 17:21:48 -0700 Comment on attachment 411809 patch r=me 1699954 4 411926 saam 2020-10-20 15:16:05 -0700 Created attachment 411926 patch 1699976 5 411926 msaboff 2020-10-20 15:50:17 -0700 Comment on attachment 411926 patch r=me 1699977 6 tzagallo 2020-10-20 15:51:12 -0700 r=me too 1699983 7 411931 saam 2020-10-20 15:56:32 -0700 Created attachment 411931 patch for landing 1700057 8 ews-feeder 2020-10-20 21:00:10 -0700 Committed r268783: <https://trac.webkit.org/changeset/268783> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411931. 411809 2020-10-19 16:14:39 -0700 2020-10-20 15:16:05 -0700 patch c-backup.diff text/plain 8397 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjg2OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIwLTEwLTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERvbid0IE9TUiBleGl0IHRvIGJjIzAgZm9yIEZUTCBhcmd1bWVudCB0 eXBlIGNoZWNrcyBkdXJpbmcgbG9vcCBPU1IgZW50cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzkyNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzAzNjk0MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzdHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4aXQtdG8tYmMtemVyby5qczog QWRkZWQuCisKIDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1wYy5zaD4KIAogICAgICAgICB0 ZXN0MjYyOiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0x LmpzCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9mdGwtb3NyLWVudHJ5LXNob3VsZC1ub3QtZXhpdC10 by1iYy16ZXJvLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2Z0bC1vc3ItZW50cnkt c2hvdWxkLW5vdC1leGl0LXRvLWJjLXplcm8uanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9z dHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4aXQtdG8tYmMtemVyby5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDUgQEAKKy8vQCBydW5EZWZhdWx0KCItLXZlcmJvc2VPU1JFeGl0 RnV6ej0wIiwgIi0tdXNlT1NSRXhpdEZ1eno9MSIsICItLWZpcmVPU1JFeGl0RnV6ekF0T3JBZnRl cj0xMCIsICItLWppdFBvbGljeVNjYWxlPTAiLCAiLS11c2VDb25jdXJyZW50SklUPTAiKQorCits ZXQgYSA9IFswLCAwLCAwXTsKK2Euc29ydCgpOworYS5zb3J0KCk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOSBAQAorMjAyMC0xMC0xOSAgU2Fh bSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBPU1IgZXhpdCB0 byBiYyMwIGZvciBGVEwgYXJndW1lbnQgdHlwZSBjaGVja3MgZHVyaW5nIGxvb3AgT1NSIGVudHJ5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc5MjUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMzY5NDA3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIEZUTCB3YXMgZW1pdHRpbmcgdHlw ZSBjaGVja3MgZm9yIHRoZSBuYW1lZCBhcmd1bWVudHMgb2YgYSBmdW5jdGlvbiwKKyAgICAgICAg aXQgd2FzIGFsd2F5cyBlbWl0dGluZyB0aGVzZSB0eXBlIGNoZWNrcyB3aXRoIGFuIGV4aXQgb3Jp Z2luIG9mIGJjIzAuIEl0IHdhcworICAgICAgICBkb2luZyB0aGlzIGV2ZW4gaWYgd2Ugd2VyZSBh biBPU1IgZW50cnkgY29tcGlsYXRpb24hIFRoaXMgbWVhbnQgdGhhdCB0eXBlCisgICAgICAgIGNo ZWNrcyBmb3IgYXJndW1lbnRzIHRoYXQgZmFpbGVkIGR1cmluZyBsb29wIE9TUiBlbnRyeSB3b3Vs ZCBpbmNvcnJlY3RseSBleGl0CisgICAgICAgIGJhY2sgdG8gYmMjMC4KKyAgICAgICAgCisgICAg ICAgIFRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBieSBoYXZpbmcgdGhlIE9TUiBlbnRyeSBydW50aW1l IGNvZGUgdmFsaWRhdGUgdGhlCisgICAgICAgIGFyZ3VtZW50IHR5cGVzIGJlZm9yZSBPU1IgZW50 ZXJpbmcuIFRoZSBjdXJyZW50IE9TUiBlbnRyeSBjb21waWxlZCBjb2RlIGluCisgICAgICAgIHRo ZSBGVEwgaXMgZGVzaWduZWQgdG8gb25seSBhbGxvdyBleGl0aW5nIGFmdGVyIGFsbCBFeHRyYWN0 T1NSRW50cnlMb2NhbCBhbmQKKyAgICAgICAgTW92SGludHMgaGF2ZSBleGVjdXRlZCwgc28gaXQg aXMgc2ltcGxlciB0byBwdXQgdGhlIHR5cGUgY2hlY2tzIGluIHRoZSBydW50aW1lCisgICAgICAg IGluc3RlYWQgb2YgdGhlIGNvbXBpbGVkIGNvZGUuCisKKyAgICAgICAgKiBmdGwvRlRMRm9yT1NS RW50cnlKSVRDb2RlLmg6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAg ICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6Omxvd2VyKToKKyAgICAgICAgKiBmdGwv RlRMT1NSRW50cnkuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OnByZXBhcmVPU1JFbnRyeSk6CisK IDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1wYy5zaD4KIAogICAgICAgICB0ZXN0MjYyOiB0 ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0xLmpzCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEZvck9TUkVudHJ5SklUQ29kZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRm9yT1NSRW50cnlKSVRDb2Rl LmgJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRm9y T1NSRW50cnlKSVRDb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDggKzU1LDEwIEBAIHB1Ymxp YzoKICAgICB1bnNpZ25lZCBlbnRyeUZhaWx1cmVDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fZW50 cnlGYWlsdXJlQ291bnQ7IH0KICAgICAKICAgICBGb3JPU1JFbnRyeUpJVENvZGUqIGZ0bEZvck9T UkVudHJ5KCkgZmluYWw7Ci0gICAgCisgICAgVmVjdG9yPERGRzo6Rmx1c2hGb3JtYXQ+JiBhcmd1 bWVudEZsdXNoRm9ybWF0cygpIHsgcmV0dXJuIG1fYXJndW1lbnRGbHVzaEZvcm1hdHM7IH0KKwog cHJpdmF0ZToKKyAgICBWZWN0b3I8REZHOjpGbHVzaEZvcm1hdD4gbV9hcmd1bWVudEZsdXNoRm9y bWF0czsKICAgICBTY3JhdGNoQnVmZmVyKiBtX2VudHJ5QnVmZmVyOyAvLyBPbmx5IGZvciBPU1Ig ZW50cnkgY29kZSBibG9ja3MuCiAgICAgQnl0ZWNvZGVJbmRleCBtX2J5dGVjb2RlSW5kZXg7CiAg ICAgdW5zaWduZWQgbV9lbnRyeUZhaWx1cmVDb3VudDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzU4LDI4ICszNTgsMzYgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICBBdmFp bGFiaWxpdHkoRmx1c2hlZEF0KEZsdXNoZWRKU1ZhbHVlLCB2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1 bWVudEluY2x1ZGluZ1RoaXMoaSkpKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gY29kZUJsb2NrKCktPm51bVBhcmFtZXRlcnMoKTsgaS0tOykgewotICAg ICAgICAgICAgICAgIE1ldGhvZE9mR2V0dGluZ0FWYWx1ZVByb2ZpbGUgcHJvZmlsZSgmbV9ncmFw aC5tX3Byb2ZpbGVkQmxvY2stPnZhbHVlUHJvZmlsZUZvckFyZ3VtZW50KGkpKTsKLSAgICAgICAg ICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgb3BlcmFuZCA9IHZpcnR1YWxSZWdpc3RlckZvckFyZ3Vt ZW50SW5jbHVkaW5nVGhpcyhpKTsKLSAgICAgICAgICAgICAgICBMVmFsdWUganNWYWx1ZSA9IG1f b3V0LmxvYWQ2NChhZGRyZXNzRm9yKG9wZXJhbmQpKTsKLSAgICAgICAgICAgICAgICAKLSAgICAg ICAgICAgICAgICBzd2l0Y2ggKG1fZ3JhcGgubV9hcmd1bWVudEZvcm1hdHNbMF1baV0pIHsKLSAg ICAgICAgICAgICAgICBjYXNlIEZsdXNoZWRJbnQzMjoKLSAgICAgICAgICAgICAgICAgICAgc3Bl Y3VsYXRlKEJhZFR5cGUsIGpzVmFsdWVWYWx1ZShqc1ZhbHVlKSwgcHJvZmlsZSwgaXNOb3RJbnQz Mihqc1ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg IGNhc2UgRmx1c2hlZEJvb2xlYW46Ci0gICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRU eXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Qm9vbGVhbihqc1ZhbHVl KSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgRmx1 c2hlZENlbGw6Ci0gICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVl VmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Q2VsbChqc1ZhbHVlKSk7Ci0gICAgICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hlZEpTVmFsdWU6Ci0g ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAg ICAgICAgICAgICAgICAgIERGR19DUkFTSChtX2dyYXBoLCBudWxscHRyLCAiQmFkIGZsdXNoIGZv cm1hdCBmb3IgYXJndW1lbnQiKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBpZiAobV9ncmFwaC5tX3BsYW4ubW9kZSgpID09IEZUTEZvck9TUkVudHJ5TW9kZSkgewor ICAgICAgICAgICAgICAgIGF1dG8qIGppdENvZGUgPSBtX2Z0bFN0YXRlLmppdENvZGUtPmZ0bEZv ck9TUkVudHJ5KCk7CisgICAgICAgICAgICAgICAgaml0Q29kZS0+YXJndW1lbnRGbHVzaEZvcm1h dHMoKS5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNvZGVCbG9jaygpLT5udW1QYXJhbWV0ZXJzKCkp OworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IGNvZGVCbG9jaygpLT5udW1QYXJh bWV0ZXJzKCk7IGktLTspCisgICAgICAgICAgICAgICAgICAgIGppdENvZGUtPmFyZ3VtZW50Rmx1 c2hGb3JtYXRzKCkuYXBwZW5kKG1fZ3JhcGgubV9hcmd1bWVudEZvcm1hdHNbMF1baV0pOworICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBjb2Rl QmxvY2soKS0+bnVtUGFyYW1ldGVycygpOyBpLS07KSB7CisgICAgICAgICAgICAgICAgICAgIE1l dGhvZE9mR2V0dGluZ0FWYWx1ZVByb2ZpbGUgcHJvZmlsZSgmbV9ncmFwaC5tX3Byb2ZpbGVkQmxv Y2stPnZhbHVlUHJvZmlsZUZvckFyZ3VtZW50KGkpKTsKKyAgICAgICAgICAgICAgICAgICAgVmly dHVhbFJlZ2lzdGVyIG9wZXJhbmQgPSB2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGlu Z1RoaXMoaSk7CisgICAgICAgICAgICAgICAgICAgIExWYWx1ZSBqc1ZhbHVlID0gbV9vdXQubG9h ZDY0KGFkZHJlc3NGb3Iob3BlcmFuZCkpOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAg ICAgICAgICAgICAgc3dpdGNoIChtX2dyYXBoLm1fYXJndW1lbnRGb3JtYXRzWzBdW2ldKSB7Cisg ICAgICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hlZEludDMyOgorICAgICAgICAgICAgICAgICAg ICAgICAgc3BlY3VsYXRlKEJhZFR5cGUsIGpzVmFsdWVWYWx1ZShqc1ZhbHVlKSwgcHJvZmlsZSwg aXNOb3RJbnQzMihqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkQm9vbGVhbjoKKyAgICAgICAgICAgICAgICAg ICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUs IGlzTm90Qm9vbGVhbihqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkQ2VsbDoKKyAgICAgICAgICAgICAgICAg ICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUs IGlzTm90Q2VsbChqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkSlNWYWx1ZToKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAg ICAgICAgICAgICAgREZHX0NSQVNIKG1fZ3JhcGgsIG51bGxwdHIsICJCYWQgZmx1c2ggZm9ybWF0 IGZvciBhcmd1bWVudCIpOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CisKICAgICAg ICAgICAgIG1fb3V0Lmp1bXAoZmlyc3RERkdCYXNpY0Jsb2NrKTsKICAgICAgICAgfQogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkVudHJ5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkVudHJ5LmNwcAkocmV2aXNpb24gMjY4 Njk1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFbnRyeS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTc0LDYgKzc0LDMxIEBAIHZvaWQqIHByZXBhcmVPU1JFbnRyeSgKICAgICBm b3IgKGludCBhcmd1bWVudCA9IHZhbHVlcy5udW1iZXJPZkFyZ3VtZW50cygpOyBhcmd1bWVudC0t OykgewogICAgICAgICBKU1ZhbHVlIHZhbHVlT25TdGFjayA9IGNhbGxGcmFtZS0+cih2aXJ0dWFs UmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMoYXJndW1lbnQpKS5hc2FuVW5zYWZlSlNW YWx1ZSgpOwogICAgICAgICBPcHRpb25hbDxKU1ZhbHVlPiByZWNvbnN0cnVjdGVkVmFsdWUgPSB2 YWx1ZXMuYXJndW1lbnQoYXJndW1lbnQpOworICAgICAgICB7CisgICAgICAgICAgICBKU1ZhbHVl IHZhbHVlVG9WYWxpZGF0ZSA9IHJlY29uc3RydWN0ZWRWYWx1ZSA/ICpyZWNvbnN0cnVjdGVkVmFs dWUgOiB2YWx1ZU9uU3RhY2s7CisgICAgICAgICAgICBhdXRvIGZsdXNoRm9ybWF0ID0gZW50cnlD b2RlLT5hcmd1bWVudEZsdXNoRm9ybWF0cygpW2FyZ3VtZW50XTsKKyAgICAgICAgICAgIHN3aXRj aCAoZmx1c2hGb3JtYXQpIHsKKyAgICAgICAgICAgIGNhc2UgREZHOjpGbHVzaGVkSW50MzI6Cisg ICAgICAgICAgICAgICAgaWYgKCF2YWx1ZVRvVmFsaWRhdGUuaXNJbnQzMigpKQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIGNhc2UgREZHOjpGbHVzaGVkQm9vbGVhbjoKKyAgICAgICAgICAgICAgICBpZiAoIXZh bHVlVG9WYWxpZGF0ZS5pc0Jvb2xlYW4oKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIERGRzo6Rmx1 c2hlZENlbGw6CisgICAgICAgICAgICAgICAgaWYgKCF2YWx1ZVRvVmFsaWRhdGUuaXNDZWxsKCkp CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgY2FzZSBERkc6OkZsdXNoZWRKU1ZhbHVlOgorICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBkYXRhTG9n TG4oIlVua25vd24gZmx1c2ggZm9ybWF0IGZvciBhcmd1bWVudCBkdXJpbmcgRlRMIG9zciBlbnRy eTogIiwgZmx1c2hGb3JtYXQpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAg IH0KKwogICAgICAgICBpZiAoIWFyZ3VtZW50KSB7CiAgICAgICAgICAgICAvLyB8dGhpc3wgYXJn dW1lbnQgY2FuIGJlIHVuYm94ZWQuIFdlIHNob3VsZCBzdG9yZSBib3hlZCB2YWx1ZSBpbnN0ZWFk IGZvciBsb29wIE9TUiBlbnRyeSBzaW5jZSBGVEwgYXNzdW1lcyB0aGF0IGFsbCBhcmd1bWVudHMg YXJlIGZsdXNoZWQgSlNWYWx1ZS4KICAgICAgICAgICAgIC8vIFRvIG1ha2UgdGhpcyB2YWxpZCwg d2Ugd2lsbCBtb2RpZnkgdGhlIHN0YWNrIG9uIHRoZSBmbHk6IHJlcGxhY2luZyB0aGUgdmFsdWUg d2l0aCBib3hlZCB2YWx1ZS4K 411926 2020-10-20 15:16:05 -0700 2020-10-20 15:56:32 -0700 patch c-backup.diff text/plain 12078 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjg2OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIwLTEwLTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERvbid0IE9TUiBleGl0IHRvIGJjIzAgZm9yIEZUTCBhcmd1bWVudCB0 eXBlIGNoZWNrcyBkdXJpbmcgbG9vcCBPU1IgZW50cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzkyNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzAzNjk0MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzdHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4aXQtdG8tYmMtemVyby5qczog QWRkZWQuCisKIDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1wYy5zaD4KIAogICAgICAgICB0 ZXN0MjYyOiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0x LmpzCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9mdGwtb3NyLWVudHJ5LXNob3VsZC1ub3QtZXhpdC10 by1iYy16ZXJvLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2Z0bC1vc3ItZW50cnkt c2hvdWxkLW5vdC1leGl0LXRvLWJjLXplcm8uanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9z dHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4aXQtdG8tYmMtemVyby5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDUgQEAKKy8vQCBydW5EZWZhdWx0KCItLXZlcmJvc2VPU1JFeGl0 RnV6ej0wIiwgIi0tdXNlT1NSRXhpdEZ1eno9MSIsICItLWZpcmVPU1JFeGl0RnV6ekF0T3JBZnRl cj0xMCIsICItLWppdFBvbGljeVNjYWxlPTAiLCAiLS11c2VDb25jdXJyZW50SklUPTAiKQorCits ZXQgYSA9IFswLCAwLCAwXTsKK2Euc29ydCgpOworYS5zb3J0KCk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNiBAQAorMjAyMC0xMC0xOSAgU2Fh bSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBPU1IgZXhpdCB0 byBiYyMwIGZvciBGVEwgYXJndW1lbnQgdHlwZSBjaGVja3MgZHVyaW5nIGxvb3AgT1NSIGVudHJ5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc5MjUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMzY5NDA3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIEZUTCB3YXMgZW1pdHRpbmcgdHlw ZSBjaGVja3MgZm9yIHRoZSBuYW1lZCBhcmd1bWVudHMgb2YgYSBmdW5jdGlvbiwKKyAgICAgICAg aXQgd2FzIGFsd2F5cyBlbWl0dGluZyB0aGVzZSB0eXBlIGNoZWNrcyB3aXRoIGFuIGV4aXQgb3Jp Z2luIG9mIGJjIzAuIEl0IHdhcworICAgICAgICBkb2luZyB0aGlzIGV2ZW4gaWYgd2Ugd2VyZSBh biBPU1IgZW50cnkgY29tcGlsYXRpb24hIFRoaXMgbWVhbnQgdGhhdCB0eXBlCisgICAgICAgIGNo ZWNrcyBmb3IgYXJndW1lbnRzIHRoYXQgZmFpbGVkIGR1cmluZyBsb29wIE9TUiBlbnRyeSB3b3Vs ZCBpbmNvcnJlY3RseSBleGl0CisgICAgICAgIGJhY2sgdG8gYmMjMC4KKyAgICAgICAgCisgICAg ICAgIFRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBieSBoYXZpbmcgdGhlIE9TUiBlbnRyeSBydW50aW1l IGNvZGUgdmFsaWRhdGUgdGhlCisgICAgICAgIGFyZ3VtZW50IHR5cGVzIGJlZm9yZSBPU1IgZW50 ZXJpbmcuIFRoZSBjdXJyZW50IE9TUiBlbnRyeSBjb21waWxlZCBjb2RlIGluCisgICAgICAgIHRo ZSBGVEwgaXMgZGVzaWduZWQgdG8gb25seSBhbGxvdyBleGl0aW5nIGFmdGVyIGFsbCBFeHRyYWN0 T1NSRW50cnlMb2NhbCBhbmQKKyAgICAgICAgTW92SGludHMgaGF2ZSBleGVjdXRlZCwgc28gaXQg aXMgc2ltcGxlciB0byBwdXQgdGhlIHR5cGUgY2hlY2tzIGluIHRoZSBydW50aW1lCisgICAgICAg IGluc3RlYWQgb2YgdGhlIGNvbXBpbGVkIGNvZGUuCisgICAgICAgIAorICAgICAgICBUaGlzIHBh dGNoIGFsc28gbWFrZXMgaXQgc28gd2UgZG8gZXhwb25lbnRpYWwgYmFja29mZiB3aGVuIGZhaWxp bmcgdG8gT1NSCisgICAgICAgIGVudGVyLiBUaGlzIGlzIG5lZWRlZCBkdWUgdG8gaW5zdWZmaWNp ZW50IHByb2ZpbGluZyB3aGVyZSB3ZSBuZXZlciBwcm9wZXJseQorICAgICAgICBwcm9maWxlIHRo ZSB0eXBlIG9mIGFyZ3VtZW50cy4gQmVmb3JlIHRoaXMsIHdlJ2QgT1NSIGV4aXQgaW4gdGhlIEZU TCBjb2RlCisgICAgICAgIGl0c2VsZiwgd2hpY2ggZG9lcyBleHBvbmVudGlhbCBiYWNrb2ZmIHdo ZW4gcmVjb21waWxpbmcuIFRoaXMgcGF0Y2ggYnVpbGRzCisgICAgICAgIHRoaXMgc2FtZSBleHBv bmVudGlhbCBiYWNrb2ZmIGluIGZvciB3aGVuIHdlIGZhaWwgdG8gT1NSIGVudGVyIGVub3VnaCB0 aW1lcworICAgICAgICB0byBnaXZlIHVwIG9uIHRoZSBPU1IgZW50cnkgY29tcGlsYXRpb24uCisK KyAgICAgICAgKiBmdGwvRlRMRm9yT1NSRW50cnlKSVRDb2RlLmg6CisgICAgICAgICogZnRsL0ZU TExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6 Omxvd2VyKToKKyAgICAgICAgKiBmdGwvRlRMT1NSRW50cnkuY3BwOgorICAgICAgICAoSlNDOjpG VEw6OnByZXBhcmVPU1JFbnRyeSk6CisKIDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1wYy5z aD4KIAogICAgICAgICB0ZXN0MjYyOiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlv bmFsL2luLWJyYW5jaC0xLmpzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09w ZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3NjgsNiArMzc2OCwy MyBAQCBzdGF0aWMgY2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIH0KIAorICAgIGF1dG8gZmFpbGVkT1NSRW50cnkgPSBbJl0gKENv ZGVCbG9jayogZW50cnlCbG9jaykgeworICAgICAgICBGVEw6OkZvck9TUkVudHJ5SklUQ29kZSog ZW50cnlDb2RlID0gZW50cnlCbG9jay0+aml0Q29kZSgpLT5mdGxGb3JPU1JFbnRyeSgpOworICAg ICAgICBlbnRyeUNvZGUtPmNvdW50RW50cnlGYWlsdXJlKCk7CisgICAgICAgIGlmIChlbnRyeUNv ZGUtPmVudHJ5RmFpbHVyZUNvdW50KCkgPAorICAgICAgICAgICAgT3B0aW9uczo6ZnRsT1NSRW50 cnlGYWlsdXJlQ291bnRGb3JSZW9wdGltaXphdGlvbigpKSB7CisgICAgICAgICAgICBDT0RFQkxP Q0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5RlRMQ29tcGlsZSIsICgiT1NSIGVudHJ5IGZh aWxlZCIpKTsKKyAgICAgICAgICAgIGppdENvZGUtPnNldE9wdGltaXphdGlvblRocmVzaG9sZEJh c2VkT25Db21waWxhdGlvblJlc3VsdCgKKyAgICAgICAgICAgICAgICBjb2RlQmxvY2ssIENvbXBp bGF0aW9uRGVmZXJyZWQpOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIH0K KworICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5RlRMQ29tcGls ZSIsICgiT1NSIGVudHJ5IGZhaWxlZCB0b28gbWFueSB0aW1lcyIpKTsKKyAgICAgICAgY29kZUJs b2NrLT5iYXNlbGluZVZlcnNpb24oKS0+Y291bnRSZW9wdGltaXphdGlvbigpOworICAgICAgICBq aXRDb2RlLT5jbGVhck9TUkVudHJ5QmxvY2tBbmRSZXNldFRocmVzaG9sZHMoY29kZUJsb2NrKTsK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfTsKKwogICAgIC8vIElmIHdlIGNhbiBPU1Ig RW50ZXIsIGRvIGl0IHJpZ2h0IGF3YXkuCiAgICAgaWYgKGNhbk9TUkVudGVySGVyZSkgewogICAg ICAgICBhdXRvIGl0ZXIgPSBqaXRDb2RlLT5ieXRlY29kZUluZGV4VG9TdHJlYW1JbmRleC5maW5k KG9yaWdpbkJ5dGVjb2RlSW5kZXgpOwpAQCAtMzc4MSw2ICszNzk4LDggQEAgc3RhdGljIGNoYXIq IHRpZXJVcENvbW1vbihWTSYgdm0sIENhbGxGcgogICAgICAgICAgICAgICAgICAgICBDT0RFQkxP Q0tfTE9HX0VWRU5UKGVudHJ5QmxvY2ssICJvc3JFbnRyeSIsICgiYXQgIiwgb3JpZ2luQnl0ZWNv ZGVJbmRleCkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGFnQ29kZVB0cldpdGhTdGFj a1BvaW50ZXJGb3JKSVRDYWxsKHVudGFnQ29kZVB0cjxjaGFyKiwgSlNFbnRyeVB0clRhZz4oYWRk cmVzcyksIGNhbGxGcmFtZSk7CiAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAg cmV0dXJuIGZhaWxlZE9TUkVudHJ5KGVudHJ5QmxvY2spOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQpAQCAtMzgyMiwyMSArMzg0MSw3IEBAIHN0YXRpYyBjaGFyKiB0aWVyVXBDb21t b24oVk0mIHZtLCBDYWxsRnIKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9 CiAKLSAgICAgICAgRlRMOjpGb3JPU1JFbnRyeUpJVENvZGUqIGVudHJ5Q29kZSA9IGVudHJ5Qmxv Y2stPmppdENvZGUoKS0+ZnRsRm9yT1NSRW50cnkoKTsKLSAgICAgICAgZW50cnlDb2RlLT5jb3Vu dEVudHJ5RmFpbHVyZSgpOwotICAgICAgICBpZiAoZW50cnlDb2RlLT5lbnRyeUZhaWx1cmVDb3Vu dCgpIDwKLSAgICAgICAgICAgIE9wdGlvbnM6OmZ0bE9TUkVudHJ5RmFpbHVyZUNvdW50Rm9yUmVv cHRpbWl6YXRpb24oKSkgewotICAgICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxv Y2ssICJkZWxheUZUTENvbXBpbGUiLCAoIk9TUiBlbnRyeSBmYWlsZWQiKSk7Ci0gICAgICAgICAg ICBqaXRDb2RlLT5zZXRPcHRpbWl6YXRpb25UaHJlc2hvbGRCYXNlZE9uQ29tcGlsYXRpb25SZXN1 bHQoCi0gICAgICAgICAgICAgICAgY29kZUJsb2NrLCBDb21waWxhdGlvbkRlZmVycmVkKTsKLSAg ICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gT1NSIGVu dHJ5IGZhaWxlZC4gT2ggbm8hIFRoaXMgaW1wbGllcyB0aGF0IHdlIG5lZWQgdG8gcmV0cnkuIFdl IHJldHJ5Ci0gICAgICAgIC8vIHdpdGhvdXQgZXhwb25lbnRpYWwgYmFja29mZiBhbmQgd2Ugb25s eSBkbyB0aGlzIGZvciB0aGUgZW50cnkgY29kZSBibG9jay4KLSAgICAgICAgQ09ERUJMT0NLX0xP R19FVkVOVChjb2RlQmxvY2ssICJkZWxheUZUTENvbXBpbGUiLCAoIk9TUiBlbnRyeSBmYWlsZWQg dG9vIG1hbnkgdGltZXMiKSk7Ci0gICAgICAgIGppdENvZGUtPmNsZWFyT1NSRW50cnlCbG9ja0Fu ZFJlc2V0VGhyZXNob2xkcyhjb2RlQmxvY2spOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAg ICAgICAgcmV0dXJuIGZhaWxlZE9TUkVudHJ5KGVudHJ5QmxvY2spOwogICAgIH0KIAogICAgIC8v IEl0J3MgdGltZSB0byB0cnkgdG8gY29tcGlsZSBjb2RlIGZvciBPU1IgZW50cnkuCkBAIC0zOTMz LDcgKzM5MzgsNyBAQCBzdGF0aWMgY2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyCiAg ICAgQVNTRVJUKGNhbk9TUkVudGVySGVyZSk7CiAgICAgdm9pZCogYWRkcmVzcyA9IEZUTDo6cHJl cGFyZU9TUkVudHJ5KHZtLCBjYWxsRnJhbWUsIGNvZGVCbG9jaywgaml0Q29kZS0+b3NyRW50cnlC bG9jaygpLCBvcmlnaW5CeXRlY29kZUluZGV4LCBzdHJlYW1JbmRleCk7CiAgICAgaWYgKCFhZGRy ZXNzKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgcmV0dXJuIGZhaWxlZE9TUkVu dHJ5KGppdENvZGUtPm9zckVudHJ5QmxvY2soKSk7CiAgICAgcmV0dXJuIHRhZ0NvZGVQdHJXaXRo U3RhY2tQb2ludGVyRm9ySklUQ2FsbCh1bnRhZ0NvZGVQdHI8Y2hhciosIEpTRW50cnlQdHJUYWc+ KGFkZHJlc3MpLCBjYWxsRnJhbWUpOwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTEZvck9TUkVudHJ5SklUQ29kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMRm9yT1NSRW50cnlKSVRDb2RlLmgJKHJldmlzaW9uIDI2ODY5NSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRm9yT1NSRW50cnlKSVRDb2RlLmgJKHdvcmtp bmcgY29weSkKQEAgLTU1LDggKzU1LDEwIEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBlbnRyeUZh aWx1cmVDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fZW50cnlGYWlsdXJlQ291bnQ7IH0KICAgICAK ICAgICBGb3JPU1JFbnRyeUpJVENvZGUqIGZ0bEZvck9TUkVudHJ5KCkgZmluYWw7Ci0gICAgCisg ICAgVmVjdG9yPERGRzo6Rmx1c2hGb3JtYXQ+JiBhcmd1bWVudEZsdXNoRm9ybWF0cygpIHsgcmV0 dXJuIG1fYXJndW1lbnRGbHVzaEZvcm1hdHM7IH0KKwogcHJpdmF0ZToKKyAgICBWZWN0b3I8REZH OjpGbHVzaEZvcm1hdD4gbV9hcmd1bWVudEZsdXNoRm9ybWF0czsKICAgICBTY3JhdGNoQnVmZmVy KiBtX2VudHJ5QnVmZmVyOyAvLyBPbmx5IGZvciBPU1IgZW50cnkgY29kZSBibG9ja3MuCiAgICAg Qnl0ZWNvZGVJbmRleCBtX2J5dGVjb2RlSW5kZXg7CiAgICAgdW5zaWduZWQgbV9lbnRyeUZhaWx1 cmVDb3VudDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0Iz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwv RlRMTG93ZXJERkdUb0IzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU4LDI4ICszNTgsMzYgQEAg cHVibGljOgogICAgICAgICAgICAgICAgICAgICBBdmFpbGFiaWxpdHkoRmx1c2hlZEF0KEZsdXNo ZWRKU1ZhbHVlLCB2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMoaSkpKTsK ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gY29kZUJsb2Nr KCktPm51bVBhcmFtZXRlcnMoKTsgaS0tOykgewotICAgICAgICAgICAgICAgIE1ldGhvZE9mR2V0 dGluZ0FWYWx1ZVByb2ZpbGUgcHJvZmlsZSgmbV9ncmFwaC5tX3Byb2ZpbGVkQmxvY2stPnZhbHVl UHJvZmlsZUZvckFyZ3VtZW50KGkpKTsKLSAgICAgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIg b3BlcmFuZCA9IHZpcnR1YWxSZWdpc3RlckZvckFyZ3VtZW50SW5jbHVkaW5nVGhpcyhpKTsKLSAg ICAgICAgICAgICAgICBMVmFsdWUganNWYWx1ZSA9IG1fb3V0LmxvYWQ2NChhZGRyZXNzRm9yKG9w ZXJhbmQpKTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBzd2l0Y2ggKG1fZ3Jh cGgubV9hcmd1bWVudEZvcm1hdHNbMF1baV0pIHsKLSAgICAgICAgICAgICAgICBjYXNlIEZsdXNo ZWRJbnQzMjoKLSAgICAgICAgICAgICAgICAgICAgc3BlY3VsYXRlKEJhZFR5cGUsIGpzVmFsdWVW YWx1ZShqc1ZhbHVlKSwgcHJvZmlsZSwgaXNOb3RJbnQzMihqc1ZhbHVlKSk7Ci0gICAgICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hlZEJvb2xlYW46Ci0g ICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1 ZSksIHByb2ZpbGUsIGlzTm90Qm9vbGVhbihqc1ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hlZENlbGw6Ci0gICAgICAgICAgICAg ICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUs IGlzTm90Q2VsbChqc1ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgICAgIGNhc2UgRmx1c2hlZEpTVmFsdWU6Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIERGR19DUkFT SChtX2dyYXBoLCBudWxscHRyLCAiQmFkIGZsdXNoIGZvcm1hdCBmb3IgYXJndW1lbnQiKTsKLSAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBpZiAobV9ncmFwaC5tX3BsYW4u bW9kZSgpID09IEZUTEZvck9TUkVudHJ5TW9kZSkgeworICAgICAgICAgICAgICAgIGF1dG8qIGpp dENvZGUgPSBtX2Z0bFN0YXRlLmppdENvZGUtPmZ0bEZvck9TUkVudHJ5KCk7CisgICAgICAgICAg ICAgICAgaml0Q29kZS0+YXJndW1lbnRGbHVzaEZvcm1hdHMoKS5yZXNlcnZlSW5pdGlhbENhcGFj aXR5KGNvZGVCbG9jaygpLT5udW1QYXJhbWV0ZXJzKCkpOworICAgICAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IGNvZGVCbG9jaygpLT5udW1QYXJhbWV0ZXJzKCk7IGktLTspCisgICAgICAg ICAgICAgICAgICAgIGppdENvZGUtPmFyZ3VtZW50Rmx1c2hGb3JtYXRzKCkuYXBwZW5kKG1fZ3Jh cGgubV9hcmd1bWVudEZvcm1hdHNbMF1baV0pOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBjb2RlQmxvY2soKS0+bnVtUGFyYW1ldGVycygp OyBpLS07KSB7CisgICAgICAgICAgICAgICAgICAgIE1ldGhvZE9mR2V0dGluZ0FWYWx1ZVByb2Zp bGUgcHJvZmlsZSgmbV9ncmFwaC5tX3Byb2ZpbGVkQmxvY2stPnZhbHVlUHJvZmlsZUZvckFyZ3Vt ZW50KGkpKTsKKyAgICAgICAgICAgICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIG9wZXJhbmQgPSB2 aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMoaSk7CisgICAgICAgICAgICAg ICAgICAgIExWYWx1ZSBqc1ZhbHVlID0gbV9vdXQubG9hZDY0KGFkZHJlc3NGb3Iob3BlcmFuZCkp OworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChtX2dy YXBoLm1fYXJndW1lbnRGb3JtYXRzWzBdW2ldKSB7CisgICAgICAgICAgICAgICAgICAgIGNhc2Ug Rmx1c2hlZEludDMyOgorICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3VsYXRlKEJhZFR5cGUs IGpzVmFsdWVWYWx1ZShqc1ZhbHVlKSwgcHJvZmlsZSwgaXNOb3RJbnQzMihqc1ZhbHVlKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBG bHVzaGVkQm9vbGVhbjoKKyAgICAgICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBl LCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Qm9vbGVhbihqc1ZhbHVlKSk7 CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2Fz ZSBGbHVzaGVkQ2VsbDoKKyAgICAgICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBl LCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Q2VsbChqc1ZhbHVlKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBG bHVzaGVkSlNWYWx1ZToKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICAgICAgREZHX0NSQVNIKG1f Z3JhcGgsIG51bGxwdHIsICJCYWQgZmx1c2ggZm9ybWF0IGZvciBhcmd1bWVudCIpOworICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9CisKICAgICAgICAgICAgIG1fb3V0Lmp1bXAoZmlyc3RE RkdCYXNpY0Jsb2NrKTsKICAgICAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTE9TUkVudHJ5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTE9TUkVudHJ5LmNwcAkocmV2aXNpb24gMjY4Njk1KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2Z0bC9GVExPU1JFbnRyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0LDYgKzc0LDMx IEBAIHZvaWQqIHByZXBhcmVPU1JFbnRyeSgKICAgICBmb3IgKGludCBhcmd1bWVudCA9IHZhbHVl cy5udW1iZXJPZkFyZ3VtZW50cygpOyBhcmd1bWVudC0tOykgewogICAgICAgICBKU1ZhbHVlIHZh bHVlT25TdGFjayA9IGNhbGxGcmFtZS0+cih2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1 ZGluZ1RoaXMoYXJndW1lbnQpKS5hc2FuVW5zYWZlSlNWYWx1ZSgpOwogICAgICAgICBPcHRpb25h bDxKU1ZhbHVlPiByZWNvbnN0cnVjdGVkVmFsdWUgPSB2YWx1ZXMuYXJndW1lbnQoYXJndW1lbnQp OworICAgICAgICB7CisgICAgICAgICAgICBKU1ZhbHVlIHZhbHVlVG9WYWxpZGF0ZSA9IHJlY29u c3RydWN0ZWRWYWx1ZSA/ICpyZWNvbnN0cnVjdGVkVmFsdWUgOiB2YWx1ZU9uU3RhY2s7CisgICAg ICAgICAgICBhdXRvIGZsdXNoRm9ybWF0ID0gZW50cnlDb2RlLT5hcmd1bWVudEZsdXNoRm9ybWF0 cygpW2FyZ3VtZW50XTsKKyAgICAgICAgICAgIHN3aXRjaCAoZmx1c2hGb3JtYXQpIHsKKyAgICAg ICAgICAgIGNhc2UgREZHOjpGbHVzaGVkSW50MzI6CisgICAgICAgICAgICAgICAgaWYgKCF2YWx1 ZVRvVmFsaWRhdGUuaXNJbnQzMigpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgREZHOjpGbHVzaGVk Qm9vbGVhbjoKKyAgICAgICAgICAgICAgICBpZiAoIXZhbHVlVG9WYWxpZGF0ZS5pc0Jvb2xlYW4o KSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICBjYXNlIERGRzo6Rmx1c2hlZENlbGw6CisgICAgICAgICAgICAg ICAgaWYgKCF2YWx1ZVRvVmFsaWRhdGUuaXNDZWxsKCkpCisgICAgICAgICAgICAgICAgICAgIHJl dHVybiBudWxscHRyOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBE Rkc6OkZsdXNoZWRKU1ZhbHVlOgorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg ZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBkYXRhTG9nTG4oIlVua25vd24gZmx1c2ggZm9ybWF0 IGZvciBhcmd1bWVudCBkdXJpbmcgRlRMIG9zciBlbnRyeTogIiwgZmx1c2hGb3JtYXQpOworICAg ICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBpZiAoIWFyZ3Vt ZW50KSB7CiAgICAgICAgICAgICAvLyB8dGhpc3wgYXJndW1lbnQgY2FuIGJlIHVuYm94ZWQuIFdl IHNob3VsZCBzdG9yZSBib3hlZCB2YWx1ZSBpbnN0ZWFkIGZvciBsb29wIE9TUiBlbnRyeSBzaW5j ZSBGVEwgYXNzdW1lcyB0aGF0IGFsbCBhcmd1bWVudHMgYXJlIGZsdXNoZWQgSlNWYWx1ZS4KICAg ICAgICAgICAgIC8vIFRvIG1ha2UgdGhpcyB2YWxpZCwgd2Ugd2lsbCBtb2RpZnkgdGhlIHN0YWNr IG9uIHRoZSBmbHk6IHJlcGxhY2luZyB0aGUgdmFsdWUgd2l0aCBib3hlZCB2YWx1ZS4K 411931 2020-10-20 15:56:32 -0700 2020-10-20 21:00:11 -0700 patch for landing c-backup.diff text/plain 12114 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjg2OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIwLTEwLTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERvbid0IE9TUiBleGl0IHRvIGJjIzAgZm9yIEZUTCBhcmd1bWVudCB0 eXBlIGNoZWNrcyBkdXJpbmcgbG9vcCBPU1IgZW50cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzkyNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzAzNjk0MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWljaGFlbCBTYWJvZmYgYW5kIFRhZGV1 IFphZ2FsbG8uCisKKyAgICAgICAgKiBzdHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4 aXQtdG8tYmMtemVyby5qczogQWRkZWQuCisKIDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1w Yy5zaD4KIAogICAgICAgICB0ZXN0MjYyOiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRp dGlvbmFsL2luLWJyYW5jaC0xLmpzCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9mdGwtb3NyLWVudHJ5 LXNob3VsZC1ub3QtZXhpdC10by1iYy16ZXJvLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3Ry ZXNzL2Z0bC1vc3ItZW50cnktc2hvdWxkLW5vdC1leGl0LXRvLWJjLXplcm8uanMJKG5vbmV4aXN0 ZW50KQorKysgSlNUZXN0cy9zdHJlc3MvZnRsLW9zci1lbnRyeS1zaG91bGQtbm90LWV4aXQtdG8t YmMtemVyby5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDUgQEAKKy8vQCBydW5EZWZhdWx0 KCItLXZlcmJvc2VPU1JFeGl0RnV6ej0wIiwgIi0tdXNlT1NSRXhpdEZ1eno9MSIsICItLWZpcmVP U1JFeGl0RnV6ekF0T3JBZnRlcj0xMCIsICItLWppdFBvbGljeVNjYWxlPTAiLCAiLS11c2VDb25j dXJyZW50SklUPTAiKQorCitsZXQgYSA9IFswLCAwLCAwXTsKK2Euc29ydCgpOworYS5zb3J0KCk7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNiBA QAorMjAyMC0xMC0xOSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAg ICBEb24ndCBPU1IgZXhpdCB0byBiYyMwIGZvciBGVEwgYXJndW1lbnQgdHlwZSBjaGVja3MgZHVy aW5nIGxvb3AgT1NSIGVudHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTc5MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMzY5NDA3PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmIGFuZCBUYWRldSBaYWdhbGxvLgorCisg ICAgICAgIFdoZW4gdGhlIEZUTCB3YXMgZW1pdHRpbmcgdHlwZSBjaGVja3MgZm9yIHRoZSBuYW1l ZCBhcmd1bWVudHMgb2YgYSBmdW5jdGlvbiwKKyAgICAgICAgaXQgd2FzIGFsd2F5cyBlbWl0dGlu ZyB0aGVzZSB0eXBlIGNoZWNrcyB3aXRoIGFuIGV4aXQgb3JpZ2luIG9mIGJjIzAuIEl0IHdhcwor ICAgICAgICBkb2luZyB0aGlzIGV2ZW4gaWYgd2Ugd2VyZSBhbiBPU1IgZW50cnkgY29tcGlsYXRp b24hIFRoaXMgbWVhbnQgdGhhdCB0eXBlCisgICAgICAgIGNoZWNrcyBmb3IgYXJndW1lbnRzIHRo YXQgZmFpbGVkIGR1cmluZyBsb29wIE9TUiBlbnRyeSB3b3VsZCBpbmNvcnJlY3RseSBleGl0Cisg ICAgICAgIGJhY2sgdG8gYmMjMC4KKyAgICAgICAgCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMg dGhpcyBieSBoYXZpbmcgdGhlIE9TUiBlbnRyeSBydW50aW1lIGNvZGUgdmFsaWRhdGUgdGhlCisg ICAgICAgIGFyZ3VtZW50IHR5cGVzIGJlZm9yZSBPU1IgZW50ZXJpbmcuIFRoZSBjdXJyZW50IE9T UiBlbnRyeSBjb21waWxlZCBjb2RlIGluCisgICAgICAgIHRoZSBGVEwgaXMgZGVzaWduZWQgdG8g b25seSBhbGxvdyBleGl0aW5nIGFmdGVyIGFsbCBFeHRyYWN0T1NSRW50cnlMb2NhbCBhbmQKKyAg ICAgICAgTW92SGludHMgaGF2ZSBleGVjdXRlZCwgc28gaXQgaXMgc2ltcGxlciB0byBwdXQgdGhl IHR5cGUgY2hlY2tzIGluIHRoZSBydW50aW1lCisgICAgICAgIGluc3RlYWQgb2YgdGhlIGNvbXBp bGVkIGNvZGUuCisgICAgICAgIAorICAgICAgICBUaGlzIHBhdGNoIGFsc28gbWFrZXMgaXQgc28g d2UgZG8gZXhwb25lbnRpYWwgYmFja29mZiB3aGVuIGZhaWxpbmcgdG8gT1NSCisgICAgICAgIGVu dGVyLiBUaGlzIGlzIG5lZWRlZCBkdWUgdG8gaW5zdWZmaWNpZW50IHByb2ZpbGluZyB3aGVyZSB3 ZSBuZXZlciBwcm9wZXJseQorICAgICAgICBwcm9maWxlIHRoZSB0eXBlIG9mIGFyZ3VtZW50cy4g QmVmb3JlIHRoaXMsIHdlJ2QgT1NSIGV4aXQgaW4gdGhlIEZUTCBjb2RlCisgICAgICAgIGl0c2Vs Ziwgd2hpY2ggZG9lcyBleHBvbmVudGlhbCBiYWNrb2ZmIHdoZW4gcmVjb21waWxpbmcuIFRoaXMg cGF0Y2ggYnVpbGRzCisgICAgICAgIHRoaXMgc2FtZSBleHBvbmVudGlhbCBiYWNrb2ZmIGluIGZv ciB3aGVuIHdlIGZhaWwgdG8gT1NSIGVudGVyIGVub3VnaCB0aW1lcworICAgICAgICB0byBnaXZl IHVwIG9uIHRoZSBPU1IgZW50cnkgY29tcGlsYXRpb24uCisKKyAgICAgICAgKiBmdGwvRlRMRm9y T1NSRW50cnlKSVRDb2RlLmg6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6Cisg ICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6Omxvd2VyKToKKyAgICAgICAgKiBm dGwvRlRMT1NSRW50cnkuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OnByZXBhcmVPU1JFbnRyeSk6 CisKIDIwMjAtMTAtMTkgIE1hcmsgQ29oZW4gIDxtQG1wYy5zaD4KIAogICAgICAgICB0ZXN0MjYy OiB0ZXN0L2xhbmd1YWdlL2V4cHJlc3Npb25zL2NvbmRpdGlvbmFsL2luLWJyYW5jaC0xLmpzCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHJldmlz aW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM3NjgsNiArMzc2OCwyMyBAQCBzdGF0aWMgY2hhciogdGll clVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0K IAorICAgIGF1dG8gZmFpbGVkT1NSRW50cnkgPSBbJl0gKENvZGVCbG9jayogZW50cnlCbG9jaykg eworICAgICAgICBGVEw6OkZvck9TUkVudHJ5SklUQ29kZSogZW50cnlDb2RlID0gZW50cnlCbG9j ay0+aml0Q29kZSgpLT5mdGxGb3JPU1JFbnRyeSgpOworICAgICAgICBlbnRyeUNvZGUtPmNvdW50 RW50cnlGYWlsdXJlKCk7CisgICAgICAgIGlmIChlbnRyeUNvZGUtPmVudHJ5RmFpbHVyZUNvdW50 KCkgPAorICAgICAgICAgICAgT3B0aW9uczo6ZnRsT1NSRW50cnlGYWlsdXJlQ291bnRGb3JSZW9w dGltaXphdGlvbigpKSB7CisgICAgICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGNvZGVCbG9j aywgImRlbGF5RlRMQ29tcGlsZSIsICgiT1NSIGVudHJ5IGZhaWxlZCIpKTsKKyAgICAgICAgICAg IGppdENvZGUtPnNldE9wdGltaXphdGlvblRocmVzaG9sZEJhc2VkT25Db21waWxhdGlvblJlc3Vs dCgKKyAgICAgICAgICAgICAgICBjb2RlQmxvY2ssIENvbXBpbGF0aW9uRGVmZXJyZWQpOworICAg ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIH0KKworICAgICAgICBDT0RFQkxPQ0tf TE9HX0VWRU5UKGNvZGVCbG9jaywgImRlbGF5RlRMQ29tcGlsZSIsICgiT1NSIGVudHJ5IGZhaWxl ZCB0b28gbWFueSB0aW1lcyIpKTsKKyAgICAgICAgY29kZUJsb2NrLT5iYXNlbGluZVZlcnNpb24o KS0+Y291bnRSZW9wdGltaXphdGlvbigpOworICAgICAgICBqaXRDb2RlLT5jbGVhck9TUkVudHJ5 QmxvY2tBbmRSZXNldFRocmVzaG9sZHMoY29kZUJsb2NrKTsKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgfTsKKwogICAgIC8vIElmIHdlIGNhbiBPU1IgRW50ZXIsIGRvIGl0IHJpZ2h0IGF3 YXkuCiAgICAgaWYgKGNhbk9TUkVudGVySGVyZSkgewogICAgICAgICBhdXRvIGl0ZXIgPSBqaXRD b2RlLT5ieXRlY29kZUluZGV4VG9TdHJlYW1JbmRleC5maW5kKG9yaWdpbkJ5dGVjb2RlSW5kZXgp OwpAQCAtMzc4MSw2ICszNzk4LDggQEAgc3RhdGljIGNoYXIqIHRpZXJVcENvbW1vbihWTSYgdm0s IENhbGxGcgogICAgICAgICAgICAgICAgICAgICBDT0RFQkxPQ0tfTE9HX0VWRU5UKGVudHJ5Qmxv Y2ssICJvc3JFbnRyeSIsICgiYXQgIiwgb3JpZ2luQnl0ZWNvZGVJbmRleCkpOwogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gdGFnQ29kZVB0cldpdGhTdGFja1BvaW50ZXJGb3JKSVRDYWxsKHVu dGFnQ29kZVB0cjxjaGFyKiwgSlNFbnRyeVB0clRhZz4oYWRkcmVzcyksIGNhbGxGcmFtZSk7CiAg ICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhaWxlZE9TUkVudHJ5 KGVudHJ5QmxvY2spOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMzgyMiwy MSArMzg0MSw3IEBAIHN0YXRpYyBjaGFyKiB0aWVyVXBDb21tb24oVk0mIHZtLCBDYWxsRnIKICAg ICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9CiAKLSAgICAgICAgRlRMOjpGb3JP U1JFbnRyeUpJVENvZGUqIGVudHJ5Q29kZSA9IGVudHJ5QmxvY2stPmppdENvZGUoKS0+ZnRsRm9y T1NSRW50cnkoKTsKLSAgICAgICAgZW50cnlDb2RlLT5jb3VudEVudHJ5RmFpbHVyZSgpOwotICAg ICAgICBpZiAoZW50cnlDb2RlLT5lbnRyeUZhaWx1cmVDb3VudCgpIDwKLSAgICAgICAgICAgIE9w dGlvbnM6OmZ0bE9TUkVudHJ5RmFpbHVyZUNvdW50Rm9yUmVvcHRpbWl6YXRpb24oKSkgewotICAg ICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxvY2ssICJkZWxheUZUTENvbXBpbGUi LCAoIk9TUiBlbnRyeSBmYWlsZWQiKSk7Ci0gICAgICAgICAgICBqaXRDb2RlLT5zZXRPcHRpbWl6 YXRpb25UaHJlc2hvbGRCYXNlZE9uQ29tcGlsYXRpb25SZXN1bHQoCi0gICAgICAgICAgICAgICAg Y29kZUJsb2NrLCBDb21waWxhdGlvbkRlZmVycmVkKTsKLSAgICAgICAgICAgIHJldHVybiBudWxs cHRyOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gT1NSIGVudHJ5IGZhaWxlZC4gT2ggbm8hIFRo aXMgaW1wbGllcyB0aGF0IHdlIG5lZWQgdG8gcmV0cnkuIFdlIHJldHJ5Ci0gICAgICAgIC8vIHdp dGhvdXQgZXhwb25lbnRpYWwgYmFja29mZiBhbmQgd2Ugb25seSBkbyB0aGlzIGZvciB0aGUgZW50 cnkgY29kZSBibG9jay4KLSAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxvY2ssICJk ZWxheUZUTENvbXBpbGUiLCAoIk9TUiBlbnRyeSBmYWlsZWQgdG9vIG1hbnkgdGltZXMiKSk7Ci0g ICAgICAgIGppdENvZGUtPmNsZWFyT1NSRW50cnlCbG9ja0FuZFJlc2V0VGhyZXNob2xkcyhjb2Rl QmxvY2spOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgcmV0dXJuIGZhaWxlZE9T UkVudHJ5KGVudHJ5QmxvY2spOwogICAgIH0KIAogICAgIC8vIEl0J3MgdGltZSB0byB0cnkgdG8g Y29tcGlsZSBjb2RlIGZvciBPU1IgZW50cnkuCkBAIC0zOTMzLDcgKzM5MzgsNyBAQCBzdGF0aWMg Y2hhciogdGllclVwQ29tbW9uKFZNJiB2bSwgQ2FsbEZyCiAgICAgQVNTRVJUKGNhbk9TUkVudGVy SGVyZSk7CiAgICAgdm9pZCogYWRkcmVzcyA9IEZUTDo6cHJlcGFyZU9TUkVudHJ5KHZtLCBjYWxs RnJhbWUsIGNvZGVCbG9jaywgaml0Q29kZS0+b3NyRW50cnlCbG9jaygpLCBvcmlnaW5CeXRlY29k ZUluZGV4LCBzdHJlYW1JbmRleCk7CiAgICAgaWYgKCFhZGRyZXNzKQotICAgICAgICByZXR1cm4g bnVsbHB0cjsKKyAgICAgICAgcmV0dXJuIGZhaWxlZE9TUkVudHJ5KGppdENvZGUtPm9zckVudHJ5 QmxvY2soKSk7CiAgICAgcmV0dXJuIHRhZ0NvZGVQdHJXaXRoU3RhY2tQb2ludGVyRm9ySklUQ2Fs bCh1bnRhZ0NvZGVQdHI8Y2hhciosIEpTRW50cnlQdHJUYWc+KGFkZHJlc3MpLCBjYWxsRnJhbWUp OwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEZvck9TUkVudHJ5SklU Q29kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMRm9yT1NS RW50cnlKSVRDb2RlLmgJKHJldmlzaW9uIDI2ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9mdGwvRlRMRm9yT1NSRW50cnlKSVRDb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDggKzU1 LDEwIEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBlbnRyeUZhaWx1cmVDb3VudCgpIGNvbnN0IHsg cmV0dXJuIG1fZW50cnlGYWlsdXJlQ291bnQ7IH0KICAgICAKICAgICBGb3JPU1JFbnRyeUpJVENv ZGUqIGZ0bEZvck9TUkVudHJ5KCkgZmluYWw7Ci0gICAgCisgICAgVmVjdG9yPERGRzo6Rmx1c2hG b3JtYXQ+JiBhcmd1bWVudEZsdXNoRm9ybWF0cygpIHsgcmV0dXJuIG1fYXJndW1lbnRGbHVzaEZv cm1hdHM7IH0KKwogcHJpdmF0ZToKKyAgICBWZWN0b3I8REZHOjpGbHVzaEZvcm1hdD4gbV9hcmd1 bWVudEZsdXNoRm9ybWF0czsKICAgICBTY3JhdGNoQnVmZmVyKiBtX2VudHJ5QnVmZmVyOyAvLyBP bmx5IGZvciBPU1IgZW50cnkgY29kZSBibG9ja3MuCiAgICAgQnl0ZWNvZGVJbmRleCBtX2J5dGVj b2RlSW5kZXg7CiAgICAgdW5zaWduZWQgbV9lbnRyeUZhaWx1cmVDb3VudDsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDI2 ODY5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzU4LDI4ICszNTgsMzYgQEAgcHVibGljOgogICAgICAgICAgICAg ICAgICAgICBBdmFpbGFiaWxpdHkoRmx1c2hlZEF0KEZsdXNoZWRKU1ZhbHVlLCB2aXJ0dWFsUmVn aXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMoaSkpKTsKICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gY29kZUJsb2NrKCktPm51bVBhcmFtZXRlcnMoKTsg aS0tOykgewotICAgICAgICAgICAgICAgIE1ldGhvZE9mR2V0dGluZ0FWYWx1ZVByb2ZpbGUgcHJv ZmlsZSgmbV9ncmFwaC5tX3Byb2ZpbGVkQmxvY2stPnZhbHVlUHJvZmlsZUZvckFyZ3VtZW50KGkp KTsKLSAgICAgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgb3BlcmFuZCA9IHZpcnR1YWxSZWdp c3RlckZvckFyZ3VtZW50SW5jbHVkaW5nVGhpcyhpKTsKLSAgICAgICAgICAgICAgICBMVmFsdWUg anNWYWx1ZSA9IG1fb3V0LmxvYWQ2NChhZGRyZXNzRm9yKG9wZXJhbmQpKTsKLSAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICBzd2l0Y2ggKG1fZ3JhcGgubV9hcmd1bWVudEZvcm1hdHNb MF1baV0pIHsKLSAgICAgICAgICAgICAgICBjYXNlIEZsdXNoZWRJbnQzMjoKLSAgICAgICAgICAg ICAgICAgICAgc3BlY3VsYXRlKEJhZFR5cGUsIGpzVmFsdWVWYWx1ZShqc1ZhbHVlKSwgcHJvZmls ZSwgaXNOb3RJbnQzMihqc1ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgICAgIGNhc2UgRmx1c2hlZEJvb2xlYW46Ci0gICAgICAgICAgICAgICAgICAgIHNw ZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Qm9v bGVhbihqc1ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg ICAgIGNhc2UgRmx1c2hlZENlbGw6Ci0gICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRU eXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1ZSksIHByb2ZpbGUsIGlzTm90Q2VsbChqc1ZhbHVlKSk7 Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hl ZEpTVmFsdWU6Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGRl ZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIERGR19DUkFTSChtX2dyYXBoLCBudWxscHRyLCAi QmFkIGZsdXNoIGZvcm1hdCBmb3IgYXJndW1lbnQiKTsKLSAgICAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBpZiAobV9ncmFwaC5tX3BsYW4ubW9kZSgpID09IEZUTEZvck9TUkVu dHJ5TW9kZSkgeworICAgICAgICAgICAgICAgIGF1dG8qIGppdENvZGUgPSBtX2Z0bFN0YXRlLmpp dENvZGUtPmZ0bEZvck9TUkVudHJ5KCk7CisgICAgICAgICAgICAgICAgaml0Q29kZS0+YXJndW1l bnRGbHVzaEZvcm1hdHMoKS5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNvZGVCbG9jaygpLT5udW1Q YXJhbWV0ZXJzKCkpOworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IGNvZGVCbG9j aygpLT5udW1QYXJhbWV0ZXJzKCk7IGktLTspCisgICAgICAgICAgICAgICAgICAgIGppdENvZGUt PmFyZ3VtZW50Rmx1c2hGb3JtYXRzKCkuYXBwZW5kKG1fZ3JhcGgubV9hcmd1bWVudEZvcm1hdHNb MF1baV0pOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSBjb2RlQmxvY2soKS0+bnVtUGFyYW1ldGVycygpOyBpLS07KSB7CisgICAgICAgICAg ICAgICAgICAgIE1ldGhvZE9mR2V0dGluZ0FWYWx1ZVByb2ZpbGUgcHJvZmlsZSgmbV9ncmFwaC5t X3Byb2ZpbGVkQmxvY2stPnZhbHVlUHJvZmlsZUZvckFyZ3VtZW50KGkpKTsKKyAgICAgICAgICAg ICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIG9wZXJhbmQgPSB2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1 bWVudEluY2x1ZGluZ1RoaXMoaSk7CisgICAgICAgICAgICAgICAgICAgIExWYWx1ZSBqc1ZhbHVl ID0gbV9vdXQubG9hZDY0KGFkZHJlc3NGb3Iob3BlcmFuZCkpOworICAgICAgICAgICAgICAgICAg ICAKKyAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChtX2dyYXBoLm1fYXJndW1lbnRGb3JtYXRz WzBdW2ldKSB7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgRmx1c2hlZEludDMyOgorICAgICAg ICAgICAgICAgICAgICAgICAgc3BlY3VsYXRlKEJhZFR5cGUsIGpzVmFsdWVWYWx1ZShqc1ZhbHVl KSwgcHJvZmlsZSwgaXNOb3RJbnQzMihqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkQm9vbGVhbjoKKyAgICAg ICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1 ZSksIHByb2ZpbGUsIGlzTm90Qm9vbGVhbihqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkQ2VsbDoKKyAgICAg ICAgICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShCYWRUeXBlLCBqc1ZhbHVlVmFsdWUoanNWYWx1 ZSksIHByb2ZpbGUsIGlzTm90Q2VsbChqc1ZhbHVlKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBGbHVzaGVkSlNWYWx1ZToKKyAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICBkZWZhdWx0Ogor ICAgICAgICAgICAgICAgICAgICAgICAgREZHX0NSQVNIKG1fZ3JhcGgsIG51bGxwdHIsICJCYWQg Zmx1c2ggZm9ybWF0IGZvciBhcmd1bWVudCIpOworICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9CisKICAgICAgICAgICAgIG1fb3V0Lmp1bXAoZmlyc3RERkdCYXNpY0Jsb2NrKTsKICAgICAg ICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkVudHJ5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTE9TUkVudHJ5LmNwcAko cmV2aXNpb24gMjY4Njk1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExPU1JFbnRy eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0LDYgKzc0LDMxIEBAIHZvaWQqIHByZXBhcmVPU1JF bnRyeSgKICAgICBmb3IgKGludCBhcmd1bWVudCA9IHZhbHVlcy5udW1iZXJPZkFyZ3VtZW50cygp OyBhcmd1bWVudC0tOykgewogICAgICAgICBKU1ZhbHVlIHZhbHVlT25TdGFjayA9IGNhbGxGcmFt ZS0+cih2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudEluY2x1ZGluZ1RoaXMoYXJndW1lbnQpKS5h c2FuVW5zYWZlSlNWYWx1ZSgpOwogICAgICAgICBPcHRpb25hbDxKU1ZhbHVlPiByZWNvbnN0cnVj dGVkVmFsdWUgPSB2YWx1ZXMuYXJndW1lbnQoYXJndW1lbnQpOworICAgICAgICB7CisgICAgICAg ICAgICBKU1ZhbHVlIHZhbHVlVG9WYWxpZGF0ZSA9IHJlY29uc3RydWN0ZWRWYWx1ZSA/ICpyZWNv bnN0cnVjdGVkVmFsdWUgOiB2YWx1ZU9uU3RhY2s7CisgICAgICAgICAgICBhdXRvIGZsdXNoRm9y bWF0ID0gZW50cnlDb2RlLT5hcmd1bWVudEZsdXNoRm9ybWF0cygpW2FyZ3VtZW50XTsKKyAgICAg ICAgICAgIHN3aXRjaCAoZmx1c2hGb3JtYXQpIHsKKyAgICAgICAgICAgIGNhc2UgREZHOjpGbHVz aGVkSW50MzI6CisgICAgICAgICAgICAgICAgaWYgKCF2YWx1ZVRvVmFsaWRhdGUuaXNJbnQzMigp KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIGNhc2UgREZHOjpGbHVzaGVkQm9vbGVhbjoKKyAgICAgICAgICAg ICAgICBpZiAoIXZhbHVlVG9WYWxpZGF0ZS5pc0Jvb2xlYW4oKSkKKyAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBj YXNlIERGRzo6Rmx1c2hlZENlbGw6CisgICAgICAgICAgICAgICAgaWYgKCF2YWx1ZVRvVmFsaWRh dGUuaXNDZWxsKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBERkc6OkZsdXNoZWRKU1ZhbHVlOgor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAg ICAgICBkYXRhTG9nTG4oIlVua25vd24gZmx1c2ggZm9ybWF0IGZvciBhcmd1bWVudCBkdXJpbmcg RlRMIG9zciBlbnRyeTogIiwgZmx1c2hGb3JtYXQpOworICAgICAgICAgICAgICAgIFJFTEVBU0Vf QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICB9CisgICAgICAgIH0KKwogICAgICAgICBpZiAoIWFyZ3VtZW50KSB7CiAgICAgICAgICAgICAv LyB8dGhpc3wgYXJndW1lbnQgY2FuIGJlIHVuYm94ZWQuIFdlIHNob3VsZCBzdG9yZSBib3hlZCB2 YWx1ZSBpbnN0ZWFkIGZvciBsb29wIE9TUiBlbnRyeSBzaW5jZSBGVEwgYXNzdW1lcyB0aGF0IGFs bCBhcmd1bWVudHMgYXJlIGZsdXNoZWQgSlNWYWx1ZS4KICAgICAgICAgICAgIC8vIFRvIG1ha2Ug dGhpcyB2YWxpZCwgd2Ugd2lsbCBtb2RpZnkgdGhlIHN0YWNrIG9uIHRoZSBmbHk6IHJlcGxhY2lu ZyB0aGUgdmFsdWUgd2l0aCBib3hlZCB2YWx1ZS4K