215899 2020-08-27 12:29:46 -0700 structureOrNull should take VM instead of getting it from the marked block 2020-08-27 13:13:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1683452 0 keith_miller 2020-08-27 12:29:46 -0700 structureOrNull should take VM instead of getting it from the marked block 1683454 1 407423 keith_miller 2020-08-27 12:30:57 -0700 Created attachment 407423 Patch 1683455 2 407423 ysuzuki 2020-08-27 12:31:59 -0700 Comment on attachment 407423 Patch r=me 1683466 3 ews-feeder 2020-08-27 13:12:02 -0700 Committed r266251: <https://trac.webkit.org/changeset/266251> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407423. 1683468 4 webkit-bug-importer 2020-08-27 13:13:15 -0700 <rdar://problem/67893118> 407423 2020-08-27 12:30:57 -0700 2020-08-27 13:12:03 -0700 Patch bug-215899-20200827123056.patch text/plain 11547 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 MTc0YmQxNGEyNmNlYzRkYjJlYjg1ZmZkNDVkYjJkMjRiZDU0ZDMyLi5mZjk2MGZiOGY2MmNjNjAy ODIxZGViMmU0NzBmOTUwNTRhMDQyODM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMC0wOC0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBzdHJ1Y3R1cmVPck51bGwgc2hvdWxkIHRha2UgVk0gaW5zdGVhZCBv ZiBnZXR0aW5nIGl0IGZyb20gdGhlIG1hcmtlZCBibG9jaworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1ODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQncyBzbGlnaHRseSBmYXN0ZXIgdXNlIGFuIGV4 aXN0aW5nIFZNIG92ZXIgcmVjb21wdXRpbmcgdGhlIGFkZHJlc3MuIEl0IHByb2JhYmx5IGRvZXNu J3QKKyAgICAgICAgaGFwcGVuIHRvIG1hdHRlciBoZXJlIGZvciBwZXJmb3JtYW5jZSBidXQgaXQn cyBnb29kIGh5Z2llbmUuCisKKyAgICAgICAgKiBBUEkvdGVzdHMvSlNXcmFwcGVyTWFwVGVzdHMu bW06CisgICAgICAgICgrW0pTV3JhcHBlck1hcFRlc3RzIHRlc3RTdHJ1Y3R1cmVJZGVudGl0eV0p OgorICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKiBydW50aW1lL0pT Q0pTVmFsdWUuaDoKKyAgICAgICAgKiBydW50aW1lL0pTQ0pTVmFsdWVJbmxpbmVzLmg6CisgICAg ICAgIChKU0M6OkpTVmFsdWU6OnN0cnVjdHVyZU9yTnVsbCBjb25zdCk6CisgICAgICAgIChKU0M6 OkpTVmFsdWU6OnN0cnVjdHVyZU9yVW5kZWZpbmVkIGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0w OC0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0Nd IEFkZCBjb25jdXJyZW5jeS1hd2FyZSB2ZXJzaW9uIG9mIGlzQ2FsbGFibGUgLyBpc0NvbnN0cnVj dG9yIHRvIG1ha2UgaXQgdXNhYmxlIGluIERGRyBjb21waWxlcgpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy9KU1dyYXBwZXJNYXBUZXN0cy5tbSBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvdGVzdHMvSlNXcmFwcGVyTWFwVGVzdHMubW0KaW5kZXggY2E2ZDcz OTRlOWZjZTExY2Q1ZjI0ODFkYmE4YTRjMWNkMGEzNzNhZS4uYWU0ODRlOTUxMzYwNmUzNDM3ZGQ2 ZjM0NGQ5YWRmNGRmMjQ5NTIzNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS90ZXN0cy9KU1dyYXBwZXJNYXBUZXN0cy5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv QVBJL3Rlc3RzL0pTV3JhcHBlck1hcFRlc3RzLm1tCkBAIC01NywxNCArNTcsMTUgQEAgZXh0ZXJu ICJDIiB2b2lkIGNoZWNrUmVzdWx0KE5TU3RyaW5nICpkZXNjcmlwdGlvbiwgYm9vbCBwYXNzZWQp OwogICAgIEpTQ29udGV4dCogY29udGV4dCA9IFtbSlNDb250ZXh0IGFsbG9jXSBpbml0XTsKICAg ICBKU0dsb2JhbENvbnRleHRSZWYgY29udGV4dFJlZiA9IEpTR2xvYmFsQ29udGV4dFJldGFpbihj b250ZXh0LkpTR2xvYmFsQ29udGV4dFJlZik7CiAgICAgSlNDOjpKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0ID0gdG9KUyhjb250ZXh0UmVmKTsKKyAgICBKU0M6OlZNJiB2bSA9IGdsb2JhbE9i amVjdC0+dm0oKTsKIAogICAgIGNvbnRleHRbQCJUZXN0Q2xhc3MiXSA9IFtUZXN0Q2xhc3MgY2xh c3NdOwogICAgIEpTVmFsdWUqIGFXcmFwcGVyID0gW2NvbnRleHQgZXZhbHVhdGVTY3JpcHQ6QCJu ZXcgVGVzdENsYXNzKCkiXTsKICAgICBKU1ZhbHVlKiBiV3JhcHBlciA9IFtjb250ZXh0IGV2YWx1 YXRlU2NyaXB0OkAibmV3IFRlc3RDbGFzcygpIl07CiAgICAgSlNDOjpKU1ZhbHVlIGFWYWx1ZSA9 IHRvSlMoZ2xvYmFsT2JqZWN0LCBhV3JhcHBlci5KU1ZhbHVlUmVmKTsKICAgICBKU0M6OkpTVmFs dWUgYlZhbHVlID0gdG9KUyhnbG9iYWxPYmplY3QsIGJXcmFwcGVyLkpTVmFsdWVSZWYpOwotICAg IEpTQzo6U3RydWN0dXJlKiBhU3RydWN0dXJlID0gYVZhbHVlLnN0cnVjdHVyZU9yTnVsbCgpOwot ICAgIEpTQzo6U3RydWN0dXJlKiBiU3RydWN0dXJlID0gYlZhbHVlLnN0cnVjdHVyZU9yTnVsbCgp OworICAgIEpTQzo6U3RydWN0dXJlKiBhU3RydWN0dXJlID0gYVZhbHVlLnN0cnVjdHVyZU9yTnVs bCh2bSk7CisgICAgSlNDOjpTdHJ1Y3R1cmUqIGJTdHJ1Y3R1cmUgPSBiVmFsdWUuc3RydWN0dXJl T3JOdWxsKHZtKTsKICAgICBjaGVja1Jlc3VsdChAInN0cnVjdHVyZSBzaG91bGQgbm90IGJlIG51 bGwiLCAhIWFTdHJ1Y3R1cmUpOwogICAgIGNoZWNrUmVzdWx0KEAiYm90aCB3cmFwcGVycyBzaG91 bGQgc2hhcmUgdGhlIHNhbWUgc3RydWN0dXJlIiwgYVN0cnVjdHVyZSA9PSBiU3RydWN0dXJlKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCmluZGV4IDJl Y2ZhZGExYzk3NTkzZGNlY2MwNGUxNjg2ODdlNzMxZGUzZmQ2ZjMuLjRmNDUyNGRjNzJiNGQ5MWI3 MjllYTk1ZWM4ZDI2MGVjMTg1NjQyZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGVyYXRpb25zLmNwcApAQCAtMjEyLDcgKzIxMiw3IEBAIEVuY29kZWRKU1ZhbHVlIEpJVF9P UEVSQVRJT04gb3BlcmF0aW9uVHJ5R2V0QnlJZE9wdGltaXplKEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPCiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CiAK ICAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9IGNhbGxGcmFtZS0+Y29kZUJsb2NrKCk7Ci0gICAg aWYgKHN0dWJJbmZvLT5jb25zaWRlckNhY2hpbmdCeSh2bSwgY29kZUJsb2NrLCBiYXNlVmFsdWUu c3RydWN0dXJlT3JOdWxsKCksIGlkZW50aWZpZXIpICYmICFzbG90LmlzVGFpbnRlZEJ5T3BhcXVl T2JqZWN0KCkgJiYgKHNsb3QuaXNDYWNoZWFibGVWYWx1ZSgpIHx8IHNsb3QuaXNDYWNoZWFibGVH ZXR0ZXIoKSB8fCBzbG90LmlzVW5zZXQoKSkpCisgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNh Y2hpbmdCeSh2bSwgY29kZUJsb2NrLCBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKHZtKSwgaWRl bnRpZmllcikgJiYgIXNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3QoKSAmJiAoc2xvdC5pc0Nh Y2hlYWJsZVZhbHVlKCkgfHwgc2xvdC5pc0NhY2hlYWJsZUdldHRlcigpIHx8IHNsb3QuaXNVbnNl dCgpKSkKICAgICAgICAgcmVwYXRjaEdldEJ5KGdsb2JhbE9iamVjdCwgY29kZUJsb2NrLCBiYXNl VmFsdWUsIGlkZW50aWZpZXIsIHNsb3QsICpzdHViSW5mbywgR2V0QnlLaW5kOjpUcnkpOwogCiAg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShzbG90LmdldFB1cmVSZXN1bHQoKSk7CkBAIC0yNzEs NyArMjcxLDcgQEAgRW5jb2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeUlk RGlyZWN0T3B0aW1pemUoSlNHbG9iYWxPYmplY3QqIGdsb2IKICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKIAogICAgIENvZGVCbG9jayogY29kZUJsb2Nr ID0gY2FsbEZyYW1lLT5jb2RlQmxvY2soKTsKLSAgICBpZiAoc3R1YkluZm8tPmNvbnNpZGVyQ2Fj aGluZ0J5KHZtLCBjb2RlQmxvY2ssIGJhc2VWYWx1ZS5zdHJ1Y3R1cmVPck51bGwoKSwgaWRlbnRp ZmllcikpCisgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNhY2hpbmdCeSh2bSwgY29kZUJsb2Nr LCBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKHZtKSwgaWRlbnRpZmllcikpCiAgICAgICAgIHJl cGF0Y2hHZXRCeShnbG9iYWxPYmplY3QsIGNvZGVCbG9jaywgYmFzZVZhbHVlLCBpZGVudGlmaWVy LCBzbG90LCAqc3R1YkluZm8sIEdldEJ5S2luZDo6RGlyZWN0KTsKIAogICAgIFJFTEVBU0VfQU5E X1JFVFVSTihzY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKGZvdW5kID8gc2xvdC5nZXRWYWx1ZShnbG9i YWxPYmplY3QsIGlkZW50KSA6IGpzVW5kZWZpbmVkKCkpKTsKQEAgLTMzNCw3ICszMzQsNyBAQCBF bmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5SWRPcHRpbWl6ZShKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZQogICAgICAgICBMT0dfSUMoKElDRXZlbnQ6Ok9wZXJhdGlv bkdldEJ5SWRPcHRpbWl6ZSwgYmFzZVZhbHVlLmNsYXNzSW5mb09yTnVsbCh2bSksIGlkZW50LCBi YXNlVmFsdWUgPT0gc2xvdC5zbG90QmFzZSgpKSk7CiAgICAgICAgIAogICAgICAgICBDb2RlQmxv Y2sqIGNvZGVCbG9jayA9IGNhbGxGcmFtZS0+Y29kZUJsb2NrKCk7Ci0gICAgICAgIGlmIChzdHVi SW5mby0+Y29uc2lkZXJDYWNoaW5nQnkodm0sIGNvZGVCbG9jaywgYmFzZVZhbHVlLnN0cnVjdHVy ZU9yTnVsbCgpLCBpZGVudGlmaWVyKSkKKyAgICAgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNh Y2hpbmdCeSh2bSwgY29kZUJsb2NrLCBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKHZtKSwgaWRl bnRpZmllcikpCiAgICAgICAgICAgICByZXBhdGNoR2V0QnkoZ2xvYmFsT2JqZWN0LCBjb2RlQmxv Y2ssIGJhc2VWYWx1ZSwgaWRlbnRpZmllciwgc2xvdCwgKnN0dWJJbmZvLCBHZXRCeUtpbmQ6Ok5v cm1hbCk7CiAgICAgICAgIHJldHVybiBmb3VuZCA/IHNsb3QuZ2V0VmFsdWUoZ2xvYmFsT2JqZWN0 LCBpZGVudCkgOiBqc1VuZGVmaW5lZCgpOwogICAgIH0pKTsKQEAgLTM5NCw3ICszOTQsNyBAQCBF bmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5SWRXaXRoVGhpc09wdGlt aXplKEpTR2xvYmFsT2JqZWN0KiBnbAogICAgICAgICBMT0dfSUMoKElDRXZlbnQ6Ok9wZXJhdGlv bkdldEJ5SWRXaXRoVGhpc09wdGltaXplLCBiYXNlVmFsdWUuY2xhc3NJbmZvT3JOdWxsKHZtKSwg aWRlbnQsIGJhc2VWYWx1ZSA9PSBzbG90LnNsb3RCYXNlKCkpKTsKICAgICAgICAgCiAgICAgICAg IENvZGVCbG9jayogY29kZUJsb2NrID0gY2FsbEZyYW1lLT5jb2RlQmxvY2soKTsKLSAgICAgICAg aWYgKHN0dWJJbmZvLT5jb25zaWRlckNhY2hpbmdCeSh2bSwgY29kZUJsb2NrLCBiYXNlVmFsdWUu c3RydWN0dXJlT3JOdWxsKCksIGlkZW50aWZpZXIpKQorICAgICAgICBpZiAoc3R1YkluZm8tPmNv bnNpZGVyQ2FjaGluZ0J5KHZtLCBjb2RlQmxvY2ssIGJhc2VWYWx1ZS5zdHJ1Y3R1cmVPck51bGwo dm0pLCBpZGVudGlmaWVyKSkKICAgICAgICAgICAgIHJlcGF0Y2hHZXRCeShnbG9iYWxPYmplY3Qs IGNvZGVCbG9jaywgYmFzZVZhbHVlLCBpZGVudGlmaWVyLCBzbG90LCAqc3R1YkluZm8sIEdldEJ5 S2luZDo6V2l0aFRoaXMpOwogICAgICAgICByZXR1cm4gZm91bmQgPyBzbG90LmdldFZhbHVlKGds b2JhbE9iamVjdCwgaWRlbnQpIDoganNVbmRlZmluZWQoKTsKICAgICB9KSk7CkBAIC0yMTQ2LDcg KzIxNDYsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldEJ5VmFs T3B0aW1pemUoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iagogICAgICAgICAgICAgICAgIExPR19J QygoSUNFdmVudDo6T3BlcmF0aW9uR2V0QnlWYWxPcHRpbWl6ZSwgYmFzZVZhbHVlLmNsYXNzSW5m b09yTnVsbCh2bSksIHByb3BlcnR5TmFtZSwgYmFzZVZhbHVlID09IHNsb3Quc2xvdEJhc2UoKSkp OyAKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBDYWNoZWFibGVJZGVudGlmaWVy IGlkZW50aWZpZXIgPSBDYWNoZWFibGVJZGVudGlmaWVyOjpjcmVhdGVGcm9tQ2VsbChzdWJzY3Jp cHQuYXNDZWxsKCkpOwotICAgICAgICAgICAgICAgIGlmIChzdHViSW5mby0+Y29uc2lkZXJDYWNo aW5nQnkodm0sIGNvZGVCbG9jaywgYmFzZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCgpLCBpZGVudGlm aWVyKSkKKyAgICAgICAgICAgICAgICBpZiAoc3R1YkluZm8tPmNvbnNpZGVyQ2FjaGluZ0J5KHZt LCBjb2RlQmxvY2ssIGJhc2VWYWx1ZS5zdHJ1Y3R1cmVPck51bGwodm0pLCBpZGVudGlmaWVyKSkK ICAgICAgICAgICAgICAgICAgICAgcmVwYXRjaEdldEJ5KGdsb2JhbE9iamVjdCwgY29kZUJsb2Nr LCBiYXNlVmFsdWUsIGlkZW50aWZpZXIsIHNsb3QsICpzdHViSW5mbywgR2V0QnlLaW5kOjpOb3Jt YWxCeVZhbCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZvdW5kID8gc2xvdC5nZXRWYWx1ZShn bG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSkgOiBqc1VuZGVmaW5lZCgpOwogICAgICAgICAgICAg fSkpOwpAQCAtMjI0Myw3ICsyMjQzLDcgQEAgRW5jb2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBv cGVyYXRpb25HZXRQcml2YXRlTmFtZU9wdGltaXplKEpTR2xvYmFsT2JqZWN0KiBnbG8KICAgICAg ICAgTE9HX0lDKChJQ0V2ZW50OjpPcGVyYXRpb25HZXRQcml2YXRlTmFtZU9wdGltaXplLCBiYXNl VmFsdWUuY2xhc3NJbmZvT3JOdWxsKHZtKSwgZmllbGROYW1lLCB0cnVlKSk7CiAKICAgICAgICAg Q2FjaGVhYmxlSWRlbnRpZmllciBpZGVudGlmaWVyID0gQ2FjaGVhYmxlSWRlbnRpZmllcjo6Y3Jl YXRlRnJvbUNlbGwoZmllbGROYW1lVmFsdWUuYXNDZWxsKCkpOwotICAgICAgICBpZiAoc3R1Yklu Zm8tPmNvbnNpZGVyQ2FjaGluZ0J5KHZtLCBjb2RlQmxvY2ssIGJhc2VWYWx1ZS5zdHJ1Y3R1cmVP ck51bGwoKSwgaWRlbnRpZmllcikpCisgICAgICAgIGlmIChzdHViSW5mby0+Y29uc2lkZXJDYWNo aW5nQnkodm0sIGNvZGVCbG9jaywgYmFzZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCh2bSksIGlkZW50 aWZpZXIpKQogICAgICAgICAgICAgcmVwYXRjaEdldEJ5KGdsb2JhbE9iamVjdCwgY29kZUJsb2Nr LCBiYXNlVmFsdWUsIGlkZW50aWZpZXIsIHNsb3QsICpzdHViSW5mbywgR2V0QnlLaW5kOjpQcml2 YXRlTmFtZSk7CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoc2xvdC5nZXRWYWx1ZShn bG9iYWxPYmplY3QsIGZpZWxkTmFtZSkpOwogICAgIH0KQEAgLTIzNTgsNyArMjM1OCw3IEBAIHNp emVfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRlbGV0ZUJ5SWRPcHRpbWl6ZShKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBTCiAgICAgSlNWYWx1ZSBiYXNlVmFsdWUgPSBKU1ZhbHVlOjpk ZWNvZGUoZW5jb2RlZEJhc2UpOwogCiAgICAgRGVsZXRlUHJvcGVydHlTbG90IHNsb3Q7Ci0gICAg U3RydWN0dXJlKiBvbGRTdHJ1Y3R1cmUgPSBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKCk7Cisg ICAgU3RydWN0dXJlKiBvbGRTdHJ1Y3R1cmUgPSBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKHZt KTsKIAogICAgIENhY2hlYWJsZUlkZW50aWZpZXIgaWRlbnRpZmllciA9IENhY2hlYWJsZUlkZW50 aWZpZXI6OmNyZWF0ZUZyb21SYXdCaXRzKHJhd0NhY2hlYWJsZUlkZW50aWZpZXIpOwogICAgIElk ZW50aWZpZXIgaWRlbnQgPSBJZGVudGlmaWVyOjpmcm9tVWlkKHZtLCBpZGVudGlmaWVyLnVpZCgp KTsKQEAgLTIzNjksNyArMjM2OSw3IEBAIHNpemVfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRl bGV0ZUJ5SWRPcHRpbWl6ZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBTCiAgICAgaWYg KGJhc2VWYWx1ZS5pc09iamVjdCgpKSB7CiAgICAgICAgIGlmICghcGFyc2VJbmRleChpZGVudCkp IHsKICAgICAgICAgICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gY2FsbEZyYW1lLT5jb2RlQmxv Y2soKTsKLSAgICAgICAgICAgIGlmIChzdHViSW5mby0+Y29uc2lkZXJDYWNoaW5nQnkodm0sIGNv ZGVCbG9jaywgYmFzZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCgpLCBpZGVudGlmaWVyKSkKKyAgICAg ICAgICAgIGlmIChzdHViSW5mby0+Y29uc2lkZXJDYWNoaW5nQnkodm0sIGNvZGVCbG9jaywgYmFz ZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCh2bSksIGlkZW50aWZpZXIpKQogICAgICAgICAgICAgICAg IHJlcGF0Y2hEZWxldGVCeShnbG9iYWxPYmplY3QsIGNvZGVCbG9jaywgc2xvdCwgYmFzZVZhbHVl LCBvbGRTdHJ1Y3R1cmUsIGlkZW50aWZpZXIsICpzdHViSW5mbywgRGVsQnlLaW5kOjpOb3JtYWws IGVjbWFNb2RlKTsKICAgICAgICAgfQogICAgIH0KQEAgLTI0MjIsNyArMjQyMiw3IEBAIHNpemVf dCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRlbGV0ZUJ5VmFsT3B0aW1pemUoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwKICAgICBKU1ZhbHVlIHN1YnNjcmlwdCA9IEpTVmFsdWU6OmRlY29k ZShlbmNvZGVkU3Vic2NyaXB0KTsKIAogICAgIERlbGV0ZVByb3BlcnR5U2xvdCBzbG90OwotICAg IFN0cnVjdHVyZSogb2xkU3RydWN0dXJlID0gYmFzZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCgpOwor ICAgIFN0cnVjdHVyZSogb2xkU3RydWN0dXJlID0gYmFzZVZhbHVlLnN0cnVjdHVyZU9yTnVsbCh2 bSk7CiAKICAgICBib29sIHJlc3VsdCA9IGRlbGV0ZUJ5VmFsKGdsb2JhbE9iamVjdCwgdm0sIHNs b3QsIGJhc2VWYWx1ZSwgc3Vic2NyaXB0LCBlY21hTW9kZSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CkBAIC0yNDM0LDcgKzI0MzQsNyBAQCBzaXpl X3QgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeVZhbE9wdGltaXplKEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsCiAgICAgICAgIGlmIChzdWJzY3JpcHQuaXNTeW1ib2woKSB8fCAh cGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKSB7CiAgICAgICAgICAgICBDb2RlQmxvY2sqIGNvZGVC bG9jayA9IGNhbGxGcmFtZS0+Y29kZUJsb2NrKCk7CiAgICAgICAgICAgICBDYWNoZWFibGVJZGVu dGlmaWVyIGlkZW50aWZpZXIgPSBDYWNoZWFibGVJZGVudGlmaWVyOjpjcmVhdGVGcm9tQ2VsbChz dWJzY3JpcHQuYXNDZWxsKCkpOwotICAgICAgICAgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNh Y2hpbmdCeSh2bSwgY29kZUJsb2NrLCBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKCksIGlkZW50 aWZpZXIpKQorICAgICAgICAgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNhY2hpbmdCeSh2bSwg Y29kZUJsb2NrLCBiYXNlVmFsdWUuc3RydWN0dXJlT3JOdWxsKHZtKSwgaWRlbnRpZmllcikpCiAg ICAgICAgICAgICAgICAgcmVwYXRjaERlbGV0ZUJ5KGdsb2JhbE9iamVjdCwgY29kZUJsb2NrLCBz bG90LCBiYXNlVmFsdWUsIG9sZFN0cnVjdHVyZSwgaWRlbnRpZmllciwgKnN0dWJJbmZvLCBEZWxC eUtpbmQ6Ok5vcm1hbEJ5VmFsLCBlY21hTW9kZSk7CiAgICAgICAgIH0KICAgICB9CkBAIC0yNTE0 LDcgKzI1MTQsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkluc3Rh bmNlT2ZPcHRpbWl6ZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsTwogICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKSk7CiAgICAgCiAgICAg Q29kZUJsb2NrKiBjb2RlQmxvY2sgPSBjYWxsRnJhbWUtPmNvZGVCbG9jaygpOwotICAgIGlmIChz dHViSW5mby0+Y29uc2lkZXJDYWNoaW5nR2VuZXJpYyh2bSwgY29kZUJsb2NrLCB2YWx1ZS5zdHJ1 Y3R1cmVPck51bGwoKSkpCisgICAgaWYgKHN0dWJJbmZvLT5jb25zaWRlckNhY2hpbmdHZW5lcmlj KHZtLCBjb2RlQmxvY2ssIHZhbHVlLnN0cnVjdHVyZU9yTnVsbCh2bSkpKQogICAgICAgICByZXBh dGNoSW5zdGFuY2VPZihnbG9iYWxPYmplY3QsIGNvZGVCbG9jaywgdmFsdWUsIHByb3RvLCAqc3R1 YkluZm8sIHJlc3VsdCk7CiAgICAgCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc0Jvb2xl YW4ocmVzdWx0KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0NKU1ZhbHVlLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NKU1ZhbHVlLmgK aW5kZXggMTMxZjAwYWZkMjU2MmM1YzlkNDQ1NTM1ZjdiN2NjOTNmMWRhMjVmYy4uNjJmN2Y4MGZj ODRlOGUyMzkwZTk1N2JiNjdhYjExMjhjMWFkNWU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNDSlNWYWx1ZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTQ0pTVmFsdWUuaApAQCAtMzM4LDggKzMzOCw3IEBAIHB1YmxpYzoKICAgICBK U0NlbGwqIGFzQ2VsbCgpIGNvbnN0OwogICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNWYWxp ZENhbGxlZSgpOwogCi0gICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmVPck51bGwoKSBjb25zdDsKLSAg ICBKU1ZhbHVlIHN0cnVjdHVyZU9yVW5kZWZpbmVkKCkgY29uc3Q7CisgICAgU3RydWN0dXJlKiBz dHJ1Y3R1cmVPck51bGwoVk0mKSBjb25zdDsKIAogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQg ZHVtcChQcmludFN0cmVhbSYpIGNvbnN0OwogICAgIHZvaWQgZHVtcEluQ29udGV4dChQcmludFN0 cmVhbSYsIER1bXBDb250ZXh0KikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0NKU1ZhbHVlSW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDSlNWYWx1ZUlubGluZXMuaAppbmRleCBiZDZmMzFjODIwN2VmNmMzODhiZDM1 MDhiNzFiZDczOTNhMzVmMzM5Li5mZDY4MmJiYjYzOTU2OGRmZWQyNWU0ZGFhNGFjMWRhYjk3OTI2 ZWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NKU1ZhbHVl SW5saW5lcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ0pTVmFsdWVJ bmxpbmVzLmgKQEAgLTExMDUsMjAgKzExMDUsMTMgQEAgQUxXQVlTX0lOTElORSBKU1ZhbHVlIEpT VmFsdWU6OmdldFByb3RvdHlwZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KSBjb25zdAog ICAgIHJldHVybiBzeW50aGVzaXplUHJvdG90eXBlKGdsb2JhbE9iamVjdCk7CiB9CiAKLWlubGlu ZSBTdHJ1Y3R1cmUqIEpTVmFsdWU6OnN0cnVjdHVyZU9yTnVsbCgpIGNvbnN0CitpbmxpbmUgU3Ry dWN0dXJlKiBKU1ZhbHVlOjpzdHJ1Y3R1cmVPck51bGwoVk0mIHZtKSBjb25zdAogewogICAgIGlm IChpc0NlbGwoKSkKLSAgICAgICAgcmV0dXJuIGFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKTsKKyAgICAg ICAgcmV0dXJuIGFzQ2VsbCgpLT5zdHJ1Y3R1cmUodm0pOwogICAgIHJldHVybiBudWxscHRyOwog fQogCi1pbmxpbmUgSlNWYWx1ZSBKU1ZhbHVlOjpzdHJ1Y3R1cmVPclVuZGVmaW5lZCgpIGNvbnN0 Ci17Ci0gICAgaWYgKGlzQ2VsbCgpKQotICAgICAgICByZXR1cm4gSlNWYWx1ZShhc0NlbGwoKS0+ c3RydWN0dXJlKCkpOwotICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotfQotCiAvLyBFQ01BIDEx LjkuMwogaW5saW5lIGJvb2wgSlNWYWx1ZTo6ZXF1YWwoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCwgSlNWYWx1ZSB2MSwgSlNWYWx1ZSB2MikKIHsK