44004 2010-08-13 22:20:13 -0700 Rename some concepts in HTML entity search to be more self-documenting 2010-08-13 23:26:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue eric oldest_to_newest 264620 0 abarth 2010-08-13 22:20:13 -0700 Rename some concepts in HTML entity search to be more self-documenting 264621 1 64405 abarth 2010-08-13 22:21:47 -0700 Created attachment 64405 Patch 264622 2 64405 eric 2010-08-13 22:24:25 -0700 Comment on attachment 64405 Patch OK. 264638 3 64405 commit-queue 2010-08-13 23:26:37 -0700 Comment on attachment 64405 Patch Clearing flags on attachment: 64405 Committed r65358: <http://trac.webkit.org/changeset/65358> 264639 4 commit-queue 2010-08-13 23:26:42 -0700 All reviewed patches have been landed. Closing bug. 64405 2010-08-13 22:21:47 -0700 2010-08-13 23:26:37 -0700 Patch bug-44004-20100813222146.patch text/plain 10390 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTM1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDgtMTMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgc29tZSBjb25jZXB0cyBpbiBIVE1MIGVudGl0eSBzZWFyY2ggdG8gYmUgbW9yZSBzZWxmLWRv Y3VtZW50aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NDAwNAorCisgICAgICAgIFN0YXJ0IGFuZCBlbmQgYXJlIG5vdyBmaXJzdCBhbmQgbGFzdCwg d2hpY2ggbGV0cyB1cyB1c2Ugc29tZSBiZXR0ZXIKKyAgICAgICAgbmFtZXMgZm9yIHRoZSBzdGF0 aWNzIGluIEhUTUxFbnRpdHlUYWJsZS4KKworICAgICAgICAqIGh0bWwvSFRNTEVudGl0eVBhcnNl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb25zdW1lSFRNTEVudGl0eSk6CisgICAgICAgICog aHRtbC9IVE1MRW50aXR5U2VhcmNoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbnRpdHlT ZWFyY2g6OkhUTUxFbnRpdHlTZWFyY2gpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVudGl0eVNl YXJjaDo6ZmluZEZpcnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbnRpdHlTZWFyY2g6OmZp bmRMYXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbnRpdHlTZWFyY2g6OmFkdmFuY2UpOgor ICAgICAgICAqIGh0bWwvSFRNTEVudGl0eVNlYXJjaC5oOgorICAgICAgICAoV2ViQ29yZTo6SFRN TEVudGl0eVNlYXJjaDo6aXNFbnRpdHlQcmVmaXgpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVu dGl0eVNlYXJjaDo6bW9zdFJlY2VudE1hdGNoKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbnRp dHlTZWFyY2g6OmZhaWwpOgorICAgICAgICAqIGh0bWwvSFRNTEVudGl0eVRhYmxlLmg6CisKIDIw MTAtMDgtMTMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXgg QVNTRVJUIGluIFhNTCBlbnRpdHkgcGFyc2luZy4gIFlvdSBjYW4ndCBhZHZhbmNlIHRoZSBlbnRp dHkgc2VhcmNoCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEVudGl0eVBhcnNlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxFbnRpdHlQYXJzZXIuY3BwCShyZXZpc2lvbiA2NTM1 NCkKKysrIFdlYkNvcmUvaHRtbC9IVE1MRW50aXR5UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTk2LDE5ICsxOTYsMTkgQEAgdW5zaWduZWQgY29uc3VtZUhUTUxFbnRpdHkoU2VnbWVudGVk U3RyaQogICAgICAgICAgICAgICAgIHVuY29uc3VtZUNoYXJhY3RlcnMoc291cmNlLCBjb25zdW1l ZENoYXJhY3RlcnMpOwogICAgICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgaWYgKCFlbnRpdHlTZWFyY2gubGFzdE1hdGNoKCkpIHsKKyAgICAgICAgICAg IGlmICghZW50aXR5U2VhcmNoLm1vc3RSZWNlbnRNYXRjaCgpKSB7CiAgICAgICAgICAgICAgICAg QVNTRVJUKCFlbnRpdHlTZWFyY2guY3VycmVudFZhbHVlKCkpOwogICAgICAgICAgICAgICAgIHVu Y29uc3VtZUNoYXJhY3RlcnMoc291cmNlLCBjb25zdW1lZENoYXJhY3RlcnMpOwogICAgICAgICAg ICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKGVudGl0eVNl YXJjaC5sYXN0TWF0Y2goKS0+bGVuZ3RoICE9IGVudGl0eVNlYXJjaC5jdXJyZW50TGVuZ3RoKCkp IHsKKyAgICAgICAgICAgIGlmIChlbnRpdHlTZWFyY2gubW9zdFJlY2VudE1hdGNoKCktPmxlbmd0 aCAhPSBlbnRpdHlTZWFyY2guY3VycmVudExlbmd0aCgpKSB7CiAgICAgICAgICAgICAgICAgLy8g V2UndmUgY29uc3VtZWQgdG9vIG1hbnkgY2hhcmFjdGVycy4gIFdlIG5lZWQgdG8gd2FsayB0aGUK ICAgICAgICAgICAgICAgICAvLyBzb3VyY2UgYmFjayB0byB0aGUgcG9pbnQgYXQgd2hpY2ggd2Ug aGFkIGNvbnN1bWVkIGFuCiAgICAgICAgICAgICAgICAgLy8gYWN0dWFsIGVudGl0eS4KICAgICAg ICAgICAgICAgICB1bmNvbnN1bWVDaGFyYWN0ZXJzKHNvdXJjZSwgY29uc3VtZWRDaGFyYWN0ZXJz KTsKICAgICAgICAgICAgICAgICBjb25zdW1lZENoYXJhY3RlcnMuY2xlYXIoKTsKLSAgICAgICAg ICAgICAgICBjb25zdCBpbnQgbGVuZ3RoID0gZW50aXR5U2VhcmNoLmxhc3RNYXRjaCgpLT5sZW5n dGg7Ci0gICAgICAgICAgICAgICAgY29uc3QgVUNoYXIqIHJlZmVyZW5jZSA9IGVudGl0eVNlYXJj aC5sYXN0TWF0Y2goKS0+ZW50aXR5OworICAgICAgICAgICAgICAgIGNvbnN0IGludCBsZW5ndGgg PSBlbnRpdHlTZWFyY2gubW9zdFJlY2VudE1hdGNoKCktPmxlbmd0aDsKKyAgICAgICAgICAgICAg ICBjb25zdCBVQ2hhciogcmVmZXJlbmNlID0gZW50aXR5U2VhcmNoLm1vc3RSZWNlbnRNYXRjaCgp LT5lbnRpdHk7CiAgICAgICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW5ndGg7ICsr aSkgewogICAgICAgICAgICAgICAgICAgICBjYyA9ICpzb3VyY2U7CiAgICAgICAgICAgICAgICAg ICAgIEFTU0VSVF9VTlVTRUQocmVmZXJlbmNlLCBjYyA9PSAqcmVmZXJlbmNlKyspOwpAQCAtMjE4 LDEwICsyMTgsMTAgQEAgdW5zaWduZWQgY29uc3VtZUhUTUxFbnRpdHkoU2VnbWVudGVkU3RyaQog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBjYyA9ICpzb3VyY2U7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBpZiAoZW50aXR5U2VhcmNoLmxhc3RNYXRjaCgpLT5sYXN0Q2hh cmFjdGVyKCkgPT0gJzsnKQotICAgICAgICAgICAgICAgIHJldHVybiBlbnRpdHlTZWFyY2gubGFz dE1hdGNoKCktPnZhbHVlOworICAgICAgICAgICAgaWYgKGVudGl0eVNlYXJjaC5tb3N0UmVjZW50 TWF0Y2goKS0+bGFzdENoYXJhY3RlcigpID09ICc7JykKKyAgICAgICAgICAgICAgICByZXR1cm4g ZW50aXR5U2VhcmNoLm1vc3RSZWNlbnRNYXRjaCgpLT52YWx1ZTsKICAgICAgICAgICAgIGlmICgh YWRkaXRpb25hbEFsbG93ZWRDaGFyYWN0ZXIgfHwgIShpc0FscGhhTnVtZXJpYyhjYykgfHwgY2Mg PT0gJz0nKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZW50aXR5U2VhcmNoLmxhc3RNYXRjaCgp LT52YWx1ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZW50aXR5U2VhcmNoLm1vc3RSZWNlbnRN YXRjaCgpLT52YWx1ZTsKICAgICAgICAgICAgIHVuY29uc3VtZUNoYXJhY3RlcnMoc291cmNlLCBj b25zdW1lZENoYXJhY3RlcnMpOwogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KSW5k ZXg6IFdlYkNvcmUvaHRtbC9IVE1MRW50aXR5U2VhcmNoLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2h0bWwvSFRNTEVudGl0eVNlYXJjaC5jcHAJKHJldmlzaW9uIDY1MzUzKQorKysgV2ViQ29y ZS9odG1sL0hUTUxFbnRpdHlTZWFyY2guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw5ICs0Miw5 IEBAIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBoYWxmd2F5KGNvbnMKIEhUTUxFbnRpdHlT ZWFyY2g6OkhUTUxFbnRpdHlTZWFyY2goKQogICAgIDogbV9jdXJyZW50TGVuZ3RoKDApCiAgICAg LCBtX2N1cnJlbnRWYWx1ZSgwKQotICAgICwgbV9sYXN0TWF0Y2goMCkKLSAgICAsIG1fc3RhcnQo SFRNTEVudGl0eVRhYmxlOjpzdGFydCgpKQotICAgICwgbV9lbmQoSFRNTEVudGl0eVRhYmxlOjpl bmQoKSkKKyAgICAsIG1fbW9zdFJlY2VudE1hdGNoKDApCisgICAgLCBtX2ZpcnN0KEhUTUxFbnRp dHlUYWJsZTo6Zmlyc3RFbnRyeSgpKQorICAgICwgbV9sYXN0KEhUTUxFbnRpdHlUYWJsZTo6bGFz dEVudHJ5KCkpCiB7CiB9CiAKQEAgLTU4LDEwICs1OCwxMCBAQCBIVE1MRW50aXR5U2VhcmNoOjpD b21wYXJlUmVzdWx0IEhUTUxFbnRpCiAgICAgcmV0dXJuIGVudHJ5TmV4dENoYXJhY3RlciA8IG5l eHRDaGFyYWN0ZXIgPyBCZWZvcmUgOiBBZnRlcjsKIH0KIAotY29uc3QgSFRNTEVudGl0eVRhYmxl RW50cnkqIEhUTUxFbnRpdHlTZWFyY2g6OmZpbmRTdGFydChVQ2hhciBuZXh0Q2hhcmFjdGVyKSBj b25zdAorY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhUTUxFbnRpdHlTZWFyY2g6OmZpbmRG aXJzdChVQ2hhciBuZXh0Q2hhcmFjdGVyKSBjb25zdAogewotICAgIGNvbnN0IEhUTUxFbnRpdHlU YWJsZUVudHJ5KiBsZWZ0ID0gbV9zdGFydDsKLSAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRy eSogcmlnaHQgPSBtX2VuZDsKKyAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogbGVmdCA9 IG1fZmlyc3Q7CisgICAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIHJpZ2h0ID0gbV9sYXN0 OwogICAgIGlmIChsZWZ0ID09IHJpZ2h0KQogICAgICAgICByZXR1cm4gbGVmdDsKICAgICBDb21w YXJlUmVzdWx0IHJlc3VsdCA9IGNvbXBhcmUobGVmdCwgbmV4dENoYXJhY3Rlcik7CkBAIC04Mywx MCArODMsMTAgQEAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhUTUxFbnRpdHlTZQogICAg IHJldHVybiByaWdodDsKIH0KIAotY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhUTUxFbnRp dHlTZWFyY2g6OmZpbmRFbmQoVUNoYXIgbmV4dENoYXJhY3RlcikgY29uc3QKK2NvbnN0IEhUTUxF bnRpdHlUYWJsZUVudHJ5KiBIVE1MRW50aXR5U2VhcmNoOjpmaW5kTGFzdChVQ2hhciBuZXh0Q2hh cmFjdGVyKSBjb25zdAogewotICAgIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBsZWZ0ID0g bV9zdGFydDsKLSAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogcmlnaHQgPSBtX2VuZDsK KyAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogbGVmdCA9IG1fZmlyc3Q7CisgICAgY29u c3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIHJpZ2h0ID0gbV9sYXN0OwogICAgIGlmIChsZWZ0ID09 IHJpZ2h0KQogICAgICAgICByZXR1cm4gcmlnaHQ7CiAgICAgQ29tcGFyZVJlc3VsdCByZXN1bHQg PSBjb21wYXJlKHJpZ2h0LCBuZXh0Q2hhcmFjdGVyKTsKQEAgLTExMiwyMSArMTEyLDIxIEBAIHZv aWQgSFRNTEVudGl0eVNlYXJjaDo6YWR2YW5jZShVQ2hhciBuZXgKIHsKICAgICBBU1NFUlQoaXNF bnRpdHlQcmVmaXgoKSk7CiAgICAgaWYgKCFtX2N1cnJlbnRMZW5ndGgpIHsKLSAgICAgICAgbV9z dGFydCA9IEhUTUxFbnRpdHlUYWJsZTo6c3RhcnQobmV4dENoYXJhY3Rlcik7Ci0gICAgICAgIG1f ZW5kID0gSFRNTEVudGl0eVRhYmxlOjplbmQobmV4dENoYXJhY3Rlcik7CisgICAgICAgIG1fZmly c3QgPSBIVE1MRW50aXR5VGFibGU6OmZpcnN0RW50cnlTdGFydGluZ1dpdGgobmV4dENoYXJhY3Rl cik7CisgICAgICAgIG1fbGFzdCA9IEhUTUxFbnRpdHlUYWJsZTo6bGFzdEVudHJ5U3RhcnRpbmdX aXRoKG5leHRDaGFyYWN0ZXIpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fc3RhcnQgPSBmaW5k U3RhcnQobmV4dENoYXJhY3Rlcik7Ci0gICAgICAgIG1fZW5kID0gZmluZEVuZChuZXh0Q2hhcmFj dGVyKTsKLSAgICAgICAgaWYgKG1fc3RhcnQgPT0gbV9lbmQgJiYgY29tcGFyZShtX3N0YXJ0LCBu ZXh0Q2hhcmFjdGVyKSAhPSBQcmVmaXgpCisgICAgICAgIG1fZmlyc3QgPSBmaW5kRmlyc3QobmV4 dENoYXJhY3Rlcik7CisgICAgICAgIG1fbGFzdCA9IGZpbmRMYXN0KG5leHRDaGFyYWN0ZXIpOwor ICAgICAgICBpZiAobV9maXJzdCA9PSBtX2xhc3QgJiYgY29tcGFyZShtX2ZpcnN0LCBuZXh0Q2hh cmFjdGVyKSAhPSBQcmVmaXgpCiAgICAgICAgICAgICByZXR1cm4gZmFpbCgpOwogICAgIH0KICAg ICArK21fY3VycmVudExlbmd0aDsKLSAgICBpZiAobV9zdGFydC0+bGVuZ3RoICE9IG1fY3VycmVu dExlbmd0aCkgeworICAgIGlmIChtX2ZpcnN0LT5sZW5ndGggIT0gbV9jdXJyZW50TGVuZ3RoKSB7 CiAgICAgICAgIG1fY3VycmVudFZhbHVlID0gMDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAg ICBtX2xhc3RNYXRjaCA9IG1fc3RhcnQ7Ci0gICAgbV9jdXJyZW50VmFsdWUgPSBtX2xhc3RNYXRj aC0+dmFsdWU7CisgICAgbV9tb3N0UmVjZW50TWF0Y2ggPSBtX2ZpcnN0OworICAgIG1fY3VycmVu dFZhbHVlID0gbV9tb3N0UmVjZW50TWF0Y2gtPnZhbHVlOwogfQogCiB9CkluZGV4OiBXZWJDb3Jl L2h0bWwvSFRNTEVudGl0eVNlYXJjaC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1M RW50aXR5U2VhcmNoLmgJKHJldmlzaW9uIDY1MzUzKQorKysgV2ViQ29yZS9odG1sL0hUTUxFbnRp dHlTZWFyY2guaAkod29ya2luZyBjb3B5KQpAQCAtMzgsMTEgKzM4LDExIEBAIHB1YmxpYzoKIAog ICAgIHZvaWQgYWR2YW5jZShVQ2hhcik7CiAKLSAgICBib29sIGlzRW50aXR5UHJlZml4KCkgY29u c3QgeyByZXR1cm4gISFtX3N0YXJ0OyB9CisgICAgYm9vbCBpc0VudGl0eVByZWZpeCgpIGNvbnN0 IHsgcmV0dXJuICEhbV9maXJzdDsgfQogICAgIGludCBjdXJyZW50VmFsdWUoKSBjb25zdCB7IHJl dHVybiBtX2N1cnJlbnRWYWx1ZTsgfQogICAgIGludCBjdXJyZW50TGVuZ3RoKCkgY29uc3QgeyBy ZXR1cm4gbV9jdXJyZW50TGVuZ3RoOyB9CiAKLSAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRy eSogbGFzdE1hdGNoKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0TWF0Y2g7IH0KKyAgICBjb25zdCBI VE1MRW50aXR5VGFibGVFbnRyeSogbW9zdFJlY2VudE1hdGNoKCkgY29uc3QgeyByZXR1cm4gbV9t b3N0UmVjZW50TWF0Y2g7IH0KIAogcHJpdmF0ZToKICAgICBlbnVtIENvbXBhcmVSZXN1bHQgewpA QCAtNTIsMjIgKzUyLDIyIEBAIHByaXZhdGU6CiAgICAgfTsKIAogICAgIENvbXBhcmVSZXN1bHQg Y29tcGFyZShjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSosIFVDaGFyKSBjb25zdDsKLSAgICBj b25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogZmluZFN0YXJ0KFVDaGFyKSBjb25zdDsKLSAgICBj b25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogZmluZEVuZChVQ2hhcikgY29uc3Q7CisgICAgY29u c3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGZpbmRGaXJzdChVQ2hhcikgY29uc3Q7CisgICAgY29u c3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGZpbmRMYXN0KFVDaGFyKSBjb25zdDsKIAogICAgIHZv aWQgZmFpbCgpCiAgICAgewogICAgICAgICBtX2N1cnJlbnRWYWx1ZSA9IDA7Ci0gICAgICAgIG1f c3RhcnQgPSAwOwotICAgICAgICBtX2VuZCA9IDA7CisgICAgICAgIG1fZmlyc3QgPSAwOworICAg ICAgICBtX2xhc3QgPSAwOwogICAgIH0KIAogICAgIGludCBtX2N1cnJlbnRMZW5ndGg7CiAgICAg aW50IG1fY3VycmVudFZhbHVlOwogCi0gICAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIG1f bGFzdE1hdGNoOwotICAgIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBtX3N0YXJ0OwotICAg IGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBtX2VuZDsKKyAgICBjb25zdCBIVE1MRW50aXR5 VGFibGVFbnRyeSogbV9tb3N0UmVjZW50TWF0Y2g7CisgICAgY29uc3QgSFRNTEVudGl0eVRhYmxl RW50cnkqIG1fZmlyc3Q7CisgICAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIG1fbGFzdDsK IH07CiAKIH0KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MRW50aXR5VGFibGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTEVudGl0eVRhYmxlLmgJKHJldmlzaW9uIDY1MzUzKQorKysg V2ViQ29yZS9odG1sL0hUTUxFbnRpdHlUYWJsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCwxMSAr NDAsMTEgQEAgc3RydWN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5IHsKIAogY2xhc3MgSFRNTEVudGl0 eVRhYmxlIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkq IHN0YXJ0KCk7Ci0gICAgc3RhdGljIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBlbmQoKTsK KyAgICBzdGF0aWMgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGZpcnN0RW50cnkoKTsKKyAg ICBzdGF0aWMgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGxhc3RFbnRyeSgpOwogCi0gICAg c3RhdGljIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBzdGFydChVQ2hhcik7Ci0gICAgc3Rh dGljIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBlbmQoVUNoYXIpOworICAgIHN0YXRpYyBj b25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogZmlyc3RFbnRyeVN0YXJ0aW5nV2l0aChVQ2hhcik7 CisgICAgc3RhdGljIGNvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBsYXN0RW50cnlTdGFydGlu Z1dpdGgoVUNoYXIpOwogfTsKIAogfQpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNjUzNTYpCisrKyBXZWJL aXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0w OC0xMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBzb21lIGNvbmNlcHRzIGluIEhU TUwgZW50aXR5IHNlYXJjaCB0byBiZSBtb3JlIHNlbGYtZG9jdW1lbnRpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0MDA0CisKKyAgICAgICAgUmVm bGVjdCBuYW1lIGNoYW5nZSBpbiBnZW5lcmF0b3Igc2NyaXB0LgorCisgICAgICAgICogU2NyaXB0 cy9jcmVhdGUtaHRtbC1lbnRpdHktdGFibGU6CisKIDIwMTAtMDgtMTIgIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5k ZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvY3JlYXRlLWh0bWwtZW50aXR5LXRhYmxlCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvY3JlYXRlLWh0bWwtZW50aXR5LXRhYmxlCShyZXZp c2lvbiA2NTM1MykKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvY3JlYXRlLWh0bWwtZW50aXR5LXRh YmxlCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsNyArMTQ1LDcgQEAgcHJpbnQgPj4gb3V0cHV0X2Zp bGUsICIiIn07CiAKIH0KIAotY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhUTUxFbnRpdHlU YWJsZTo6c3RhcnQoVUNoYXIgYykKK2NvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5KiBIVE1MRW50 aXR5VGFibGU6OmZpcnN0RW50cnlTdGFydGluZ1dpdGgoVUNoYXIgYykKIHsKICAgICBpZiAoYyA+ PSAnQScgJiYgYyA8PSAnWicpCiAgICAgICAgIHJldHVybiB1cHBlcmNhc2VPZmZzZXRbYyAtICdB J107CkBAIC0xNTQsNyArMTU0LDcgQEAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhUTUxF bnRpdHlUYQogICAgIHJldHVybiAwOwogfQogCi1jb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSog SFRNTEVudGl0eVRhYmxlOjplbmQoVUNoYXIgYykKK2NvbnN0IEhUTUxFbnRpdHlUYWJsZUVudHJ5 KiBIVE1MRW50aXR5VGFibGU6Omxhc3RFbnRyeVN0YXJ0aW5nV2l0aChVQ2hhciBjKQogewogICAg IGlmIChjID49ICdBJyAmJiBjIDw9ICdaJykKICAgICAgICAgcmV0dXJuIHVwcGVyY2FzZU9mZnNl dFtjIC0gJ0EnICsgMV0gLSAxOwpAQCAtMTYzLDEyICsxNjMsMTIgQEAgY29uc3QgSFRNTEVudGl0 eVRhYmxlRW50cnkqIEhUTUxFbnRpdHlUYQogICAgIHJldHVybiAwOwogfQogCi1jb25zdCBIVE1M RW50aXR5VGFibGVFbnRyeSogSFRNTEVudGl0eVRhYmxlOjpzdGFydCgpCitjb25zdCBIVE1MRW50 aXR5VGFibGVFbnRyeSogSFRNTEVudGl0eVRhYmxlOjpmaXJzdEVudHJ5KCkKIHsKICAgICByZXR1 cm4gJnN0YXRpY0VudGl0eVRhYmxlWzBdOwogfQogCi1jb25zdCBIVE1MRW50aXR5VGFibGVFbnRy eSogSFRNTEVudGl0eVRhYmxlOjplbmQoKQorY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIEhU TUxFbnRpdHlUYWJsZTo6bGFzdEVudHJ5KCkKIHsKICAgICByZXR1cm4gJnN0YXRpY0VudGl0eVRh YmxlWyVzIC0gMV07CiB9Cg==