118632 2013-07-12 19:20:45 -0700 Avoid upconverting strings in various places in WebCore 2013-07-13 18:12:28 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 118641 1 rniwa rniwa abarth benjamin commit-queue darin esprehn+autocc ggaren glenn kangil.han kling koivisto macpherson menard msaboff oldest_to_newest 908114 0 rniwa 2013-07-12 19:20:45 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/a6162e2ad7c7870e22445d3c463d17e7ac871e80 https://chromium.googlesource.com/chromium/blink/+/18095209b3f467758b83894e7b14f813f6953f81 https://chromium.googlesource.com/chromium/blink/+/fefcf2b95d55f24c60fd2e95978cf4544f3c92ca https://chromium.googlesource.com/chromium/blink/+/8e0527b0fb33998318aedfd74b3511025f7ff294 https://chromium.googlesource.com/chromium/blink/+/feaf798b04597b0849b4000fc305264895d3eac5 908115 1 rniwa 2013-07-12 19:25:50 -0700 And https://chromium.googlesource.com/chromium/blink/+/bd1a49103a6e07b1023d2c742d8217769efbffb4 908116 2 206585 rniwa 2013-07-12 19:28:13 -0700 Created attachment 206585 Fixes the bug 908213 3 206585 commit-queue 2013-07-13 18:12:24 -0700 Comment on attachment 206585 Fixes the bug Clearing flags on attachment: 206585 Committed r152611: <http://trac.webkit.org/changeset/152611> 908214 4 commit-queue 2013-07-13 18:12:28 -0700 All reviewed patches have been landed. Closing bug. 206585 2013-07-12 19:28:13 -0700 2013-07-13 18:12:24 -0700 Fixes the bug bug-118632-20130712192556.patch text/plain 12303 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjYwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDEzLTA3LTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEF2b2lkIHVwY29udmVydGluZyBz dHJpbmdzIGluIHZhcmlvdXMgcGxhY2VzIGluIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODYzMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF2b2lkIGNhbGxpbmcgU3RyaW5nOjpjaGFyYWN0 ZXJzKCkgaW4gdmFyaW91cyBwbGFjZXMgc2luY2UgaXQgdXBjb252ZXJ0cyA4LWJpdCBzdHJpbmdz IHRvIDE2LWJpdCBzdHJpbmdzLgorCisgICAgICAgIE1lcmdlCisgICAgICAgIGh0dHBzOi8vY2hy b21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rL2E2MTYyZTJhZDdjNzg3MGUy MjQ0NWQzYzQ2M2QxN2U3YWM4NzFlODAKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVz b3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvMTgwOTUyMDliM2Y0Njc3NThiODM4OTRlN2IxNGY4 MTNmNjk1M2Y4MQorICAgICAgICBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hy b21pdW0vYmxpbmsvKy9mZWZjZjJiOTVkNTVmMjRjNjBmZDJlOTU5NzhjZjQ1NDRmM2M5MmNhCisg ICAgICAgIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8r LzhlMDUyN2IwZmIzMzk5ODMxOGFlZGZkNzRiMzUxMTAyNWY3ZmYyOTQKKyAgICAgICAgaHR0cHM6 Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvZmVhZjc5OGIwNDU5 N2IwODQ5YjQwMDBmYzMwNTI2NDg5NWQzZWFjNQorICAgICAgICBodHRwczovL2Nocm9taXVtLmdv b2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxpbmsvKy9iZDFhNDkxMDNhNmUwN2IxMDIzZDJjNzQy ZDgyMTc3NjllZmJmZmI0CisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNTU1BhcnNlcjo6c2V0dXBQYXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT UGFyc2VyOjpwYXJzZUltYWdlU2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cmV3 cml0ZVNwZWNpZmllcnMpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXJWYWx1ZXMuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1BhcnNlclN0cmluZzo6aW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpD U1NQYXJzZXJTdHJpbmc6OmNsZWFyKToKKyAgICAgICAgKiBkb20vRGF0YXNldERPTVN0cmluZ01h cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1ZhbGlkQXR0cmlidXRlTmFtZSk6CisgICAgICAg IChXZWJDb3JlOjpjb252ZXJ0QXR0cmlidXRlTmFtZVRvUHJvcGVydHlOYW1lKToKKyAgICAgICAg KFdlYkNvcmU6OnByb3BlcnR5TmFtZU1hdGNoZXNBdHRyaWJ1dGVOYW1lKToKKyAgICAgICAgKFdl YkNvcmU6OmlzVmFsaWRQcm9wZXJ0eU5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydFBy b3BlcnR5TmFtZVRvQXR0cmlidXRlTmFtZSk6CisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJhbmdlOjp0b1N0cmluZyk6CisgICAgICAgICogZG9tL1NlY3VyaXR5 Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eUNvbnRleHQ6OnBhcnNlU2Fu ZGJveFBvbGljeSk6CisgICAgICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6bWVh c3VyZVRleHQpOgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6bWFya0Z1dHVyZUFuZFBhc3ROb2Rlcyk6CisKIDIw MTMtMDctMTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW2lPU10gVGV4dFRyYWNrUmVwcmVzZW50YXRpb24gbm90IGNsZWFyZWQgd2hlbiBjYXB0aW9u cyBhcmUgZGlzYWJsZWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiAx NTI2MDUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDM2LDcgKzQzNiw4IEBAIHZvaWQgQ1NTUGFyc2VyOjpzZXR1cFBhcnNlcihjb25zdCBj aGFyKiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9wYXJzZWRUZXh0UHJlZml4TGVu Z3RoOyBpKyspCiAgICAgICAgIG1fZGF0YVN0YXJ0MTZbaV0gPSBwcmVmaXhbaV07CiAKLSAgICBt ZW1jcHkobV9kYXRhU3RhcnQxNi5nZXQoKSArIG1fcGFyc2VkVGV4dFByZWZpeExlbmd0aCwgc3Ry aW5nLmNoYXJhY3RlcnMoKSwgc3RyaW5nTGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7CisgICAgQVNT RVJUKHN0cmluZ0xlbmd0aCk7CisgICAgbWVtY3B5KG1fZGF0YVN0YXJ0MTYuZ2V0KCkgKyBtX3Bh cnNlZFRleHRQcmVmaXhMZW5ndGgsIHN0cmluZy5jaGFyYWN0ZXJzMTYoKSwgc3RyaW5nTGVuZ3Ro ICogc2l6ZW9mKFVDaGFyKSk7CiAKICAgICB1bnNpZ25lZCBzdGFydCA9IG1fcGFyc2VkVGV4dFBy ZWZpeExlbmd0aCArIHN0cmluZ0xlbmd0aDsKICAgICB1bnNpZ25lZCBlbmQgPSBzdGFydCArIHN1 ZmZpeExlbmd0aDsKQEAgLTgwNTksNyArODA2MCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENT U1BhcnNlcjo6cGFyc2VJbWEKICAgICAgICAgICAgIGNvbnN0IExDaGFyKiBzdGFydCA9IHN0cmlu Zy5jaGFyYWN0ZXJzOCgpOwogICAgICAgICAgICAgcGFyc2VEb3VibGUoc3RhcnQsIHN0YXJ0ICsg bGVuZ3RoLCAneCcsIGltYWdlU2NhbGVGYWN0b3IpOwogICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgY29uc3QgVUNoYXIqIHN0YXJ0ID0gc3RyaW5nLmNoYXJhY3RlcnMoKTsKKyAgICAgICAg ICAgIGNvbnN0IFVDaGFyKiBzdGFydCA9IHN0cmluZy5jaGFyYWN0ZXJzMTYoKTsKICAgICAgICAg ICAgIHBhcnNlRG91YmxlKHN0YXJ0LCBzdGFydCArIGxlbmd0aCwgJ3gnLCBpbWFnZVNjYWxlRmFj dG9yKTsKICAgICAgICAgfQogICAgICAgICBpZiAoaW1hZ2VTY2FsZUZhY3RvciA8PSAwKQpAQCAt MTIyMDIsNyArMTIyMDMsNyBAQCBDU1NQcm9wZXJ0eUlEIGNzc1Byb3BlcnR5SUQoY29uc3QgU3Ry aW5nCiAgICAgaWYgKGxlbmd0aCA+IG1heENTU1Byb3BlcnR5TmFtZUxlbmd0aCkKICAgICAgICAg cmV0dXJuIENTU1Byb3BlcnR5SW52YWxpZDsKICAgICAKLSAgICByZXR1cm4gc3RyaW5nLmlzOEJp dCgpID8gY3NzUHJvcGVydHlJRChzdHJpbmcuY2hhcmFjdGVyczgoKSwgbGVuZ3RoKSA6IGNzc1By b3BlcnR5SUQoc3RyaW5nLmNoYXJhY3RlcnMoKSwgbGVuZ3RoKTsKKyAgICByZXR1cm4gc3RyaW5n LmlzOEJpdCgpID8gY3NzUHJvcGVydHlJRChzdHJpbmcuY2hhcmFjdGVyczgoKSwgbGVuZ3RoKSA6 IGNzc1Byb3BlcnR5SUQoc3RyaW5nLmNoYXJhY3RlcnMxNigpLCBsZW5ndGgpOwogfQogCiBDU1NQ cm9wZXJ0eUlEIGNzc1Byb3BlcnR5SUQoY29uc3QgQ1NTUGFyc2VyU3RyaW5nJiBzdHJpbmcpCkBA IC0xMjMwMCw3ICsxMjMwMSw3IEBAIHN0YXRpYyBib29sIGlzQ1NTVG9rZW5pemVySWRlbnRpZmll cihjb24KIAogICAgIGlmIChzdHJpbmcuaXM4Qml0KCkpCiAgICAgICAgIHJldHVybiBpc0NTU1Rv a2VuaXplcklkZW50aWZpZXIoc3RyaW5nLmNoYXJhY3RlcnM4KCksIGxlbmd0aCk7Ci0gICAgcmV0 dXJuIGlzQ1NTVG9rZW5pemVySWRlbnRpZmllcihzdHJpbmcuY2hhcmFjdGVycygpLCBsZW5ndGgp OworICAgIHJldHVybiBpc0NTU1Rva2VuaXplcklkZW50aWZpZXIoc3RyaW5nLmNoYXJhY3RlcnMx NigpLCBsZW5ndGgpOwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KQEAg LTEyMzQwLDcgKzEyMzQxLDcgQEAgc3RhdGljIGJvb2wgaXNDU1NUb2tlbml6ZXJVUkwoY29uc3Qg U3RyaQogCiAgICAgaWYgKHN0cmluZy5pczhCaXQoKSkKICAgICAgICAgcmV0dXJuIGlzQ1NTVG9r ZW5pemVyVVJMKHN0cmluZy5jaGFyYWN0ZXJzOCgpLCBsZW5ndGgpOwotICAgIHJldHVybiBpc0NT U1Rva2VuaXplclVSTChzdHJpbmcuY2hhcmFjdGVycygpLCBsZW5ndGgpOworICAgIHJldHVybiBp c0NTU1Rva2VuaXplclVSTChzdHJpbmcuY2hhcmFjdGVyczE2KCksIGxlbmd0aCk7CiB9CiAKIApJ bmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlclZhbHVlcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXJWYWx1ZXMuaAkocmV2aXNpb24gMTUyNjA1KQor KysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlclZhbHVlcy5oCSh3b3JraW5nIGNvcHkpCkBA IC01MCwxMSArNTAsMTEgQEAgc3RydWN0IENTU1BhcnNlclN0cmluZyB7CiAgICAgdm9pZCBpbml0 KGNvbnN0IFN0cmluZyYgc3RyaW5nKQogICAgIHsKICAgICAgICAgbV9sZW5ndGggPSBzdHJpbmcu bGVuZ3RoKCk7Ci0gICAgICAgIGlmIChtX2xlbmd0aCAmJiBzdHJpbmcuaXM4Qml0KCkpIHsKKyAg ICAgICAgaWYgKCFtX2xlbmd0aCB8fCBzdHJpbmcuaXM4Qml0KCkpIHsKICAgICAgICAgICAgIG1f ZGF0YS5jaGFyYWN0ZXJzOCA9IGNvbnN0X2Nhc3Q8TENoYXIqPihzdHJpbmcuY2hhcmFjdGVyczgo KSk7CiAgICAgICAgICAgICBtX2lzOEJpdCA9IHRydWU7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBtX2RhdGEuY2hhcmFjdGVyczE2ID0gY29uc3RfY2FzdDxVQ2hhcio+KHN0cmluZy5j aGFyYWN0ZXJzKCkpOworICAgICAgICAgICAgbV9kYXRhLmNoYXJhY3RlcnMxNiA9IGNvbnN0X2Nh c3Q8VUNoYXIqPihzdHJpbmcuY2hhcmFjdGVyczE2KCkpOwogICAgICAgICAgICAgbV9pczhCaXQg PSBmYWxzZTsKICAgICAgICAgfQogICAgIH0KQEAgLTYzLDcgKzYzLDcgQEAgc3RydWN0IENTU1Bh cnNlclN0cmluZyB7CiAgICAgewogICAgICAgICBtX2RhdGEuY2hhcmFjdGVyczggPSAwOwogICAg ICAgICBtX2xlbmd0aCA9IDA7Ci0gICAgICAgIG1faXM4Qml0ID0gZmFsc2U7CisgICAgICAgIG1f aXM4Qml0ID0gdHJ1ZTsKICAgICB9CiAKICAgICBib29sIGlzOEJpdCgpIGNvbnN0IHsgcmV0dXJu IG1faXM4Qml0OyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRGF0YXNldERPTVN0cmluZ01h cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RhdGFzZXRET01TdHJpbmdN YXAuY3BwCShyZXZpc2lvbiAxNTI2MDUpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRGF0YXNldERP TVN0cmluZ01hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDEwICszOSw5IEBAIHN0YXRpYyBi b29sIGlzVmFsaWRBdHRyaWJ1dGVOYW1lKGNvbnN0IFMKICAgICBpZiAoIW5hbWUuc3RhcnRzV2l0 aCgiZGF0YS0iKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY29uc3QgVUNoYXIqIGNo YXJhY3RlcnMgPSBuYW1lLmNoYXJhY3RlcnMoKTsKICAgICB1bnNpZ25lZCBsZW5ndGggPSBuYW1l Lmxlbmd0aCgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDU7IGkgPCBsZW5ndGg7ICsraSkgewot ICAgICAgICBpZiAoaXNBU0NJSVVwcGVyKGNoYXJhY3RlcnNbaV0pKQorICAgICAgICBpZiAoaXNB U0NJSVVwcGVyKG5hbWVbaV0pKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIApA QCAtNTMsMTUgKzUyLDE0IEBAIHN0YXRpYyBTdHJpbmcgY29udmVydEF0dHJpYnV0ZU5hbWVUb1By b3AKIHsKICAgICBTdHJpbmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CiAKLSAgICBjb25zdCBVQ2hh ciogY2hhcmFjdGVycyA9IG5hbWUuY2hhcmFjdGVycygpOwogICAgIHVuc2lnbmVkIGxlbmd0aCA9 IG5hbWUubGVuZ3RoKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gNTsgaSA8IGxlbmd0aDsgKytp KSB7Ci0gICAgICAgIFVDaGFyIGNoYXJhY3RlciA9IGNoYXJhY3RlcnNbaV07CisgICAgICAgIFVD aGFyIGNoYXJhY3RlciA9IG5hbWVbaV07CiAgICAgICAgIGlmIChjaGFyYWN0ZXIgIT0gJy0nKQog ICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoY2hhcmFjdGVyKTsKICAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICBpZiAoKGkgKyAxIDwgbGVuZ3RoKSAmJiBpc0FTQ0lJTG93ZXIoY2hh cmFjdGVyc1tpICsgMV0pKSB7Ci0gICAgICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQo dG9BU0NJSVVwcGVyKGNoYXJhY3RlcnNbaSArIDFdKSk7CisgICAgICAgICAgICBpZiAoKGkgKyAx IDwgbGVuZ3RoKSAmJiBpc0FTQ0lJTG93ZXIobmFtZVtpICsgMV0pKSB7CisgICAgICAgICAgICAg ICAgc3RyaW5nQnVpbGRlci5hcHBlbmQodG9BU0NJSVVwcGVyKG5hbWVbaSArIDFdKSk7CiAgICAg ICAgICAgICAgICAgKytpOwogICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgc3Ry aW5nQnVpbGRlci5hcHBlbmQoY2hhcmFjdGVyKTsKQEAgLTc2LDE5ICs3NCwxOCBAQCBzdGF0aWMg Ym9vbCBwcm9wZXJ0eU5hbWVNYXRjaGVzQXR0cmlidXRlCiAgICAgaWYgKCFhdHRyaWJ1dGVOYW1l LnN0YXJ0c1dpdGgoImRhdGEtIikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNvbnN0 IFVDaGFyKiBwcm9wZXJ0eSA9IHByb3BlcnR5TmFtZS5jaGFyYWN0ZXJzKCk7Ci0gICAgY29uc3Qg VUNoYXIqIGF0dHJpYnV0ZSA9IGF0dHJpYnV0ZU5hbWUuY2hhcmFjdGVycygpOwogICAgIHVuc2ln bmVkIHByb3BlcnR5TGVuZ3RoID0gcHJvcGVydHlOYW1lLmxlbmd0aCgpOwogICAgIHVuc2lnbmVk IGF0dHJpYnV0ZUxlbmd0aCA9IGF0dHJpYnV0ZU5hbWUubGVuZ3RoKCk7Ci0gICAKKwogICAgIHVu c2lnbmVkIGEgPSA1OwogICAgIHVuc2lnbmVkIHAgPSAwOwogICAgIGJvb2wgd29yZEJvdW5kYXJ5 ID0gZmFsc2U7CiAgICAgd2hpbGUgKGEgPCBhdHRyaWJ1dGVMZW5ndGggJiYgcCA8IHByb3BlcnR5 TGVuZ3RoKSB7Ci0gICAgICAgIGlmIChhdHRyaWJ1dGVbYV0gPT0gJy0nICYmIGEgKyAxIDwgYXR0 cmlidXRlTGVuZ3RoICYmIGF0dHJpYnV0ZVthICsgMV0gIT0gJy0nKQorICAgICAgICBjb25zdCBV Q2hhciBjdXJyZW50QXR0cmlidXRlTmFtZUNoYXIgPSBhdHRyaWJ1dGVOYW1lW2FdOworICAgICAg ICBpZiAoY3VycmVudEF0dHJpYnV0ZU5hbWVDaGFyID09ICctJyAmJiBhICsgMSA8IGF0dHJpYnV0 ZUxlbmd0aCAmJiBhdHRyaWJ1dGVOYW1lW2EgKyAxXSAhPSAnLScpCiAgICAgICAgICAgICB3b3Jk Qm91bmRhcnkgPSB0cnVlOwogICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmICgod29yZEJv dW5kYXJ5ID8gdG9BU0NJSVVwcGVyKGF0dHJpYnV0ZVthXSkgOiBhdHRyaWJ1dGVbYV0pICE9IHBy b3BlcnR5W3BdKQorICAgICAgICAgICAgaWYgKCh3b3JkQm91bmRhcnkgPyB0b0FTQ0lJVXBwZXIo Y3VycmVudEF0dHJpYnV0ZU5hbWVDaGFyKSA6IGN1cnJlbnRBdHRyaWJ1dGVOYW1lQ2hhcikgIT0g cHJvcGVydHlOYW1lW3BdKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAg ICAgIHArKzsKICAgICAgICAgICAgIHdvcmRCb3VuZGFyeSA9IGZhbHNlOwpAQCAtMTAxLDEwICs5 OCw5IEBAIHN0YXRpYyBib29sIHByb3BlcnR5TmFtZU1hdGNoZXNBdHRyaWJ1dGUKIAogc3RhdGlj IGJvb2wgaXNWYWxpZFByb3BlcnR5TmFtZShjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAgY29u c3QgVUNoYXIqIGNoYXJhY3RlcnMgPSBuYW1lLmNoYXJhY3RlcnMoKTsKICAgICB1bnNpZ25lZCBs ZW5ndGggPSBuYW1lLmxlbmd0aCgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5n dGg7ICsraSkgewotICAgICAgICBpZiAoY2hhcmFjdGVyc1tpXSA9PSAnLScgJiYgKGkgKyAxIDwg bGVuZ3RoKSAmJiBpc0FTQ0lJTG93ZXIoY2hhcmFjdGVyc1tpICsgMV0pKQorICAgICAgICBpZiAo bmFtZVtpXSA9PSAnLScgJiYgKGkgKyAxIDwgbGVuZ3RoKSAmJiBpc0FTQ0lJTG93ZXIobmFtZVtp ICsgMV0pKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1 ZTsKQEAgLTExNSwxMCArMTExLDkgQEAgc3RhdGljIFN0cmluZyBjb252ZXJ0UHJvcGVydHlOYW1l VG9BdHRyaQogICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKICAgICBidWlsZGVyLmFwcGVuZCgi ZGF0YS0iKTsKIAotICAgIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzID0gbmFtZS5jaGFyYWN0ZXJz KCk7CiAgICAgdW5zaWduZWQgbGVuZ3RoID0gbmFtZS5sZW5ndGgoKTsKICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKLSAgICAgICAgVUNoYXIgY2hhcmFjdGVyID0g Y2hhcmFjdGVyc1tpXTsKKyAgICAgICAgVUNoYXIgY2hhcmFjdGVyID0gbmFtZVtpXTsKICAgICAg ICAgaWYgKGlzQVNDSUlVcHBlcihjaGFyYWN0ZXIpKSB7CiAgICAgICAgICAgICBidWlsZGVyLmFw cGVuZCgnLScpOwogICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQodG9BU0NJSUxvd2VyKGNoYXJh Y3RlcikpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCShyZXZpc2lvbiAxNTI2MDUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDY2LDExICsxMDY2 LDExIEBAIFN0cmluZyBSYW5nZTo6dG9TdHJpbmcoRXhjZXB0aW9uQ29kZSYgZWMKICAgICBOb2Rl KiBwYXN0TGFzdCA9IHBhc3RMYXN0Tm9kZSgpOwogICAgIGZvciAoTm9kZSogbiA9IGZpcnN0Tm9k ZSgpOyBuICE9IHBhc3RMYXN0OyBuID0gTm9kZVRyYXZlcnNhbDo6bmV4dChuKSkgewogICAgICAg ICBpZiAobi0+bm9kZVR5cGUoKSA9PSBOb2RlOjpURVhUX05PREUgfHwgbi0+bm9kZVR5cGUoKSA9 PSBOb2RlOjpDREFUQV9TRUNUSU9OX05PREUpIHsKLSAgICAgICAgICAgIFN0cmluZyBkYXRhID0g c3RhdGljX2Nhc3Q8Q2hhcmFjdGVyRGF0YSo+KG4pLT5kYXRhKCk7CisgICAgICAgICAgICBjb25z dCBTdHJpbmcmIGRhdGEgPSBzdGF0aWNfY2FzdDxDaGFyYWN0ZXJEYXRhKj4obiktPmRhdGEoKTsK ICAgICAgICAgICAgIGludCBsZW5ndGggPSBkYXRhLmxlbmd0aCgpOwogICAgICAgICAgICAgaW50 IHN0YXJ0ID0gKG4gPT0gbV9zdGFydC5jb250YWluZXIoKSkgPyBtaW4obWF4KDAsIG1fc3RhcnQu b2Zmc2V0KCkpLCBsZW5ndGgpIDogMDsKICAgICAgICAgICAgIGludCBlbmQgPSAobiA9PSBtX2Vu ZC5jb250YWluZXIoKSkgPyBtaW4obWF4KHN0YXJ0LCBtX2VuZC5vZmZzZXQoKSksIGxlbmd0aCkg OiBsZW5ndGg7Ci0gICAgICAgICAgICBidWlsZGVyLmFwcGVuZChkYXRhLmNoYXJhY3RlcnMoKSAr IHN0YXJ0LCBlbmQgLSBzdGFydCk7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChkYXRhLCBz dGFydCwgZW5kIC0gc3RhcnQpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9kb20vU2VjdXJpdHlDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vU2VjdXJpdHlDb250ZXh0LmNwcAkocmV2aXNpb24gMTUyNjA1KQorKysgU291cmNlL1dl YkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgyLDE4ICs4 MiwxNyBAQCBTYW5kYm94RmxhZ3MgU2VjdXJpdHlDb250ZXh0OjpwYXJzZVNhbmRiCiAgICAgLy8g aHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDUvdGhlLWlmcmFtZS1lbGVtZW50Lmh0bWwjYXR0ci1p ZnJhbWUtc2FuZGJveAogICAgIC8vIFBhcnNlIHRoZSB1bm9yZGVyZWQgc2V0IG9mIHVuaXF1ZSBz cGFjZS1zZXBhcmF0ZWQgdG9rZW5zLgogICAgIFNhbmRib3hGbGFncyBmbGFncyA9IFNhbmRib3hB bGw7Ci0gICAgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMgPSBwb2xpY3kuY2hhcmFjdGVycygpOwog ICAgIHVuc2lnbmVkIGxlbmd0aCA9IHBvbGljeS5sZW5ndGgoKTsKICAgICB1bnNpZ25lZCBzdGFy dCA9IDA7CiAgICAgdW5zaWduZWQgbnVtYmVyT2ZUb2tlbkVycm9ycyA9IDA7CiAgICAgU3RyaW5n QnVpbGRlciB0b2tlbkVycm9yczsKICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICB3aGlsZSAo c3RhcnQgPCBsZW5ndGggJiYgaXNIVE1MU3BhY2UoY2hhcmFjdGVyc1tzdGFydF0pKQorICAgICAg ICB3aGlsZSAoc3RhcnQgPCBsZW5ndGggJiYgaXNIVE1MU3BhY2UocG9saWN5W3N0YXJ0XSkpCiAg ICAgICAgICAgICArK3N0YXJ0OwogICAgICAgICBpZiAoc3RhcnQgPj0gbGVuZ3RoKQogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIHVuc2lnbmVkIGVuZCA9IHN0YXJ0ICsgMTsKLSAgICAgICAg d2hpbGUgKGVuZCA8IGxlbmd0aCAmJiAhaXNIVE1MU3BhY2UoY2hhcmFjdGVyc1tlbmRdKSkKKyAg ICAgICAgd2hpbGUgKGVuZCA8IGxlbmd0aCAmJiAhaXNIVE1MU3BhY2UocG9saWN5W2VuZF0pKQog ICAgICAgICAgICAgKytlbmQ7CiAKICAgICAgICAgLy8gVHVybiBvZmYgdGhlIGNvcnJlc3BvbmRp bmcgc2FuZGJveCBmbGFnIGlmIGl0J3Mgc2V0IGFzICJhbGxvd2VkIi4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE LmNwcAkocmV2aXNpb24gMTUyNjA1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjExMyw3ICsyMTEz LDcgQEAgUGFzc1JlZlB0cjxUZXh0TWV0cmljcz4gQ2FudmFzUmVuZGVyaW5nQwogICAgIEZvbnQ6 OnNldENvZGVQYXRoKEZvbnQ6OkNvbXBsZXgpOwogI2VuZGlmCiAKLSAgICBtZXRyaWNzLT5zZXRX aWR0aChhY2Nlc3NGb250KCkud2lkdGgoVGV4dFJ1bih0ZXh0LmNoYXJhY3RlcnMoKSwgdGV4dC5s ZW5ndGgoKSkpKTsKKyAgICBtZXRyaWNzLT5zZXRXaWR0aChhY2Nlc3NGb250KCkud2lkdGgoVGV4 dFJ1bih0ZXh0KSkpOwogCiAjaWYgUExBVEZPUk0oUVQpCiAgICAgRm9udDo6c2V0Q29kZVBhdGgo b2xkQ29kZVBhdGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tD dWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNr Q3VlLmNwcAkocmV2aXNpb24gMTUyNjA1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9U ZXh0VHJhY2tDdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NzYsNyArNzc2LDcgQEAgdm9pZCBU ZXh0VHJhY2tDdWU6Om1hcmtGdXR1cmVBbmRQYXN0Tm9kZQogICAgICAgICAgICAgdG9XZWJWVFRF bGVtZW50KGNoaWxkKS0+c2V0SXNQYXN0Tm9kZShpc1Bhc3ROb2RlKTsKICAgICAgICAgICAgIC8v IE1ha2UgYW4gZWxlbWVuZXQgaWQgbWF0Y2ggYSBjdWUgaWQgZm9yIHN0eWxlIG1hdGNoaW5nIHB1 cnBvc2VzLgogICAgICAgICAgICAgaWYgKCFtX2lkLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAg ICB0b0VsZW1lbnQoY2hpbGQpLT5zZXRJZEF0dHJpYnV0ZShBdG9taWNTdHJpbmcobV9pZC5jaGFy YWN0ZXJzKCksIG1faWQubGVuZ3RoKCkpKTsKKyAgICAgICAgICAgICAgICB0b0VsZW1lbnQoY2hp bGQpLT5zZXRJZEF0dHJpYnV0ZShtX2lkKTsKICAgICAgICAgfQogICAgIH0KIH0K