72314 2011-11-14 14:42:22 -0800 A little bit of function call cleanup 2011-11-14 15:16:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 502327 0 ggaren 2011-11-14 14:42:22 -0800 A little bit of function call cleanup 502332 1 115034 ggaren 2011-11-14 14:46:48 -0800 Created attachment 115034 Patch 502369 2 ggaren 2011-11-14 15:16:32 -0800 Committed r100200: <http://trac.webkit.org/changeset/100200> 115034 2011-11-14 14:46:48 -0800 2011-11-14 14:52:43 -0800 Patch bug-72314-20111114144647.patch text/plain 9460 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAwMTk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDExLTExLTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQSBsaXR0bGUgYml0IG9mIGZ1bmN0aW9uIGNhbGwgY2xlYW51cAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0Q2FsbCk6 IFJlbmFtZWQgY2FsbEZyYW1lIHRvIHJlZ2lzdGVyT2Zmc2V0CisgICAgICAgIGJlY2F1c2UgdGhp cyB2YWx1ZSBkb2Vzbid0IGdpdmUgeW91IHRoZSBvZmZzZXQgb2YgdGhlIGNhbGxlZSdzIGNhbGwg ZnJhbWUuCisKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRSZXR1cm4pOiBU aWdodGVuZWQgdG8gdXNlIGVxdWFsaXR5IGluc3RlYWQKKyAgICAgICAgb2YgZ3JlYXRlci10aGFu LiBSZW1vdmVkIGNvbW1lbnQgc2luY2UgaXRzIHJlYXNvbmluZyB3YXMgd3JvbmcuCisgICAgICAg IAorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdENvbnN0cnVjdCk6IFVwZGF0 ZWQgZm9yIHJlbmFtZSBtZW50aW9uZWQgYWJvdmUuCisKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVH ZW5lcmF0b3I6OmlzQXJndW1lbnROdW1iZXIpOiBQcm92aWRlZCBhIG1vcmUgcHJlY2lzZSB3YXkK KyAgICAgICAgdG8gYXNrIHRoaXMgcXVlc3Rpb24sIGdpdmluZyB0aGUgYnl0ZWNvZGUgZ2VuZXJh dG9yIG1vcmUgZnJlZWRvbSB0byBjaGFuZ2UKKyAgICAgICAgaW50ZXJuYWwgaW1wbGVtZW50YXRp b24gZGV0YWlscy4KKyAgICAgICAgCisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2Vu ZXJhdG9yLmg6IFJlZHVjZWQgZGVmYXVsdCB2ZWN0b3IgY2FwYWNpdHkgYmVjYXVzZQorICAgICAg ICAxNiB3YXMgb3ZlcmtpbGwuCisgICAgICAgIChKU0M6OkNhbGxBcmd1bWVudHM6OnJlZ2lzdGVy T2Zmc2V0KTogVXBkYXRlZCBmb3IgcmVuYW1lIG1lbnRpb25lZCBhYm92ZS4KKworICAgICAgICAq IGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpDYWxsQXJndW1l bnRzOjpDYWxsQXJndW1lbnRzKToKKyAgICAgICAgKEpTQzo6Q2FsbEFyZ3VtZW50czo6bmV3QXJn dW1lbnQpOiBGYWN0b3JlZCBvdXQgYXJndW1lbnQgYWxsb2NhdGlvbiBpbnRvCisgICAgICAgIGEg aGVscGVyIGZ1bmN0aW9uLCBzbyBJIGNhbiBjaGFuZ2UgaXQgbGF0ZXIuCisKKyAgICAgICAgKEpT Qzo6Q2FsbEZ1bmN0aW9uQ2FsbERvdE5vZGU6OmVtaXRCeXRlY29kZSk6CisgICAgICAgIChKU0M6 OkZ1bmN0aW9uQm9keU5vZGU6OmVtaXRCeXRlY29kZSk6IFVzZSBoZWxwZXIgZnVuY3Rpb24gbWVu dGlvbmVkIGFib3ZlLgorCiAyMDExLTExLTE0ICBWaW5jZW50IFNjaGVpYiAgPHNjaGVpYkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgTW91c2UgTG9jazogUmVuYW1pbmcgdG8gJ1BvaW50ZXIgTG9j ayc6IEVOQUJMRSBGbGFncwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDEwMDE2NSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODIxLDcgKzE4MjEsNyBAQCBSZWdpc3RlcklEKiBCeXRl Y29kZUdlbmVyYXRvcjo6ZW1pdENhbGwoCiAgICAgZW1pdE9wY29kZShvcGNvZGVJRCk7CiAgICAg aW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKGZ1bmMtPmluZGV4KCkpOyAvLyBmdW5jCiAgICAgaW5zdHJ1 Y3Rpb25zKCkuYXBwZW5kKGNhbGxBcmd1bWVudHMuY291bnQoKSk7IC8vIGFyZ0NvdW50Ci0gICAg aW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKGNhbGxBcmd1bWVudHMuY2FsbEZyYW1lKCkpOyAvLyByZWdp c3Rlck9mZnNldAorICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChjYWxsQXJndW1lbnRzLnJlZ2lz dGVyT2Zmc2V0KCkpOyAvLyByZWdpc3Rlck9mZnNldAogICAgIGlmIChkc3QgIT0gaWdub3JlZFJl c3VsdCgpKSB7CiAgICAgICAgIGVtaXRPcGNvZGUob3BfY2FsbF9wdXRfcmVzdWx0KTsKICAgICAg ICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKGRzdC0+aW5kZXgoKSk7IC8vIGRzdApAQCAtMTg2OCw4 ICsxODY4LDcgQEAgUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRSZXR1cgogICAg ICAgICBlbWl0T3Bjb2RlKG9wX3RlYXJfb2ZmX2FjdGl2YXRpb24pOwogICAgICAgICBpbnN0cnVj dGlvbnMoKS5hcHBlbmQobV9hY3RpdmF0aW9uUmVnaXN0ZXItPmluZGV4KCkpOwogICAgICAgICBp bnN0cnVjdGlvbnMoKS5hcHBlbmQobV9jb2RlQmxvY2stPmFyZ3VtZW50c1JlZ2lzdGVyKCkpOwot ICAgIH0gZWxzZSBpZiAobV9jb2RlQmxvY2stPnVzZXNBcmd1bWVudHMoKSAmJiBtX2NvZGVCbG9j ay0+bV9udW1QYXJhbWV0ZXJzID4gMQotICAgICAgICAgICAgICAgJiYgIW1fY29kZUJsb2NrLT5p c1N0cmljdE1vZGUoKSkgeyAvLyBJZiB0aGVyZSBhcmUgbm8gbmFtZWQgcGFyYW1ldGVycywgdGhl cmUncyBub3RoaW5nIHRvIHRlYXIgb2ZmLCBzaW5jZSBleHRyYSAvIHVubmFtZWQgcGFyYW1ldGVy cyBnZXQgY29waWVkIHRvIHRoZSBhcmd1bWVudHMgb2JqZWN0IGF0IGNvbnN0cnVjdCB0aW1lLgor ICAgIH0gZWxzZSBpZiAobV9jb2RlQmxvY2stPnVzZXNBcmd1bWVudHMoKSAmJiBtX2NvZGVCbG9j ay0+bV9udW1QYXJhbWV0ZXJzICE9IDEgJiYgIW1fY29kZUJsb2NrLT5pc1N0cmljdE1vZGUoKSkg ewogICAgICAgICBlbWl0T3Bjb2RlKG9wX3RlYXJfb2ZmX2FyZ3VtZW50cyk7CiAgICAgICAgIGlu c3RydWN0aW9ucygpLmFwcGVuZChtX2NvZGVCbG9jay0+YXJndW1lbnRzUmVnaXN0ZXIoKSk7CiAg ICAgfQpAQCAtMTkyMiw3ICsxOTIxLDcgQEAgUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6 OmVtaXRDb25zdAogICAgIGVtaXRPcGNvZGUob3BfY29uc3RydWN0KTsKICAgICBpbnN0cnVjdGlv bnMoKS5hcHBlbmQoZnVuYy0+aW5kZXgoKSk7IC8vIGZ1bmMKICAgICBpbnN0cnVjdGlvbnMoKS5h cHBlbmQoY2FsbEFyZ3VtZW50cy5jb3VudCgpKTsgLy8gYXJnQ291bnQKLSAgICBpbnN0cnVjdGlv bnMoKS5hcHBlbmQoY2FsbEFyZ3VtZW50cy5jYWxsRnJhbWUoKSk7IC8vIHJlZ2lzdGVyT2Zmc2V0 CisgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKGNhbGxBcmd1bWVudHMucmVnaXN0ZXJPZmZzZXQo KSk7IC8vIHJlZ2lzdGVyT2Zmc2V0CiAgICAgaWYgKGRzdCAhPSBpZ25vcmVkUmVzdWx0KCkpIHsK ICAgICAgICAgZW1pdE9wY29kZShvcF9jYWxsX3B1dF9yZXN1bHQpOwogICAgICAgICBpbnN0cnVj dGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRleCgpKTsgLy8gZHN0CkBAIC0yMzU4LDE0ICsyMzU3LDEy IEBAIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OnNldElzTnVtZXJpY0NvbXAKICAgICBtX2NvZGVC bG9jay0+c2V0SXNOdW1lcmljQ29tcGFyZUZ1bmN0aW9uKGlzTnVtZXJpY0NvbXBhcmVGdW5jdGlv bik7CiB9CiAKLWludCBCeXRlY29kZUdlbmVyYXRvcjo6YXJndW1lbnROdW1iZXJGb3IoY29uc3Qg SWRlbnRpZmllciYgaWRlbnQpCitib29sIEJ5dGVjb2RlR2VuZXJhdG9yOjppc0FyZ3VtZW50TnVt YmVyKGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBpbnQgYXJndW1lbnROdW1iZXIpCiB7Ci0gICAg aW50IHBhcmFtZXRlckNvdW50ID0gbV9wYXJhbWV0ZXJzLnNpemUoKTsgLy8gaW5jbHVkZXMgJ3Ro aXMnCiAgICAgUmVnaXN0ZXJJRCogcmVnaXN0ZXJJRCA9IHJlZ2lzdGVyRm9yKGlkZW50KTsKLSAg ICBpZiAoIXJlZ2lzdGVySUQpCi0gICAgICAgIHJldHVybiAwOwotICAgIGludCBpbmRleCA9IHJl Z2lzdGVySUQtPmluZGV4KCkgKyBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhlYWRlclNpemUgKyBw YXJhbWV0ZXJDb3VudDsKLSAgICByZXR1cm4gKGluZGV4ID4gMCAmJiBpbmRleCA8IHBhcmFtZXRl ckNvdW50KSA/IGluZGV4IDogMDsKKyAgICBpZiAoIXJlZ2lzdGVySUQgfHwgcmVnaXN0ZXJJRC0+ aW5kZXgoKSA+PSAwKQorICAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHJlZ2lzdGVySUQt PmluZGV4KCkgLSBtX3RoaXNSZWdpc3Rlci5pbmRleCgpIC0gMSA9PSBhcmd1bWVudE51bWJlcjsK IH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCShyZXZpc2lvbiAxMDAx NjUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJh dG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDE1ICs1NSwxNyBAQCBuYW1lc3BhY2UgSlNDIHsK IAogICAgICAgICBSZWdpc3RlcklEKiB0aGlzUmVnaXN0ZXIoKSB7IHJldHVybiBtX2FyZ3ZbMF0u Z2V0KCk7IH0KICAgICAgICAgUmVnaXN0ZXJJRCogYXJndW1lbnRSZWdpc3Rlcih1bnNpZ25lZCBp KSB7IHJldHVybiBtX2FyZ3ZbaSArIDFdLmdldCgpOyB9Ci0gICAgICAgIHVuc2lnbmVkIGNhbGxG cmFtZSgpIHsgcmV0dXJuIHRoaXNSZWdpc3RlcigpLT5pbmRleCgpICsgY291bnQoKSArIFJlZ2lz dGVyRmlsZTo6Q2FsbEZyYW1lSGVhZGVyU2l6ZTsgfQorICAgICAgICB1bnNpZ25lZCByZWdpc3Rl ck9mZnNldCgpIHsgcmV0dXJuIHRoaXNSZWdpc3RlcigpLT5pbmRleCgpICsgY291bnQoKSArIFJl Z2lzdGVyRmlsZTo6Q2FsbEZyYW1lSGVhZGVyU2l6ZTsgfQogICAgICAgICB1bnNpZ25lZCBjb3Vu dCgpIHsgcmV0dXJuIG1fYXJndi5zaXplKCk7IH0KICAgICAgICAgUmVnaXN0ZXJJRCogcHJvZmls ZUhvb2tSZWdpc3RlcigpIHsgcmV0dXJuIG1fcHJvZmlsZUhvb2tSZWdpc3Rlci5nZXQoKTsgfQog ICAgICAgICBBcmd1bWVudHNOb2RlKiBhcmd1bWVudHNOb2RlKCkgeyByZXR1cm4gbV9hcmd1bWVu dHNOb2RlOyB9CiAKICAgICBwcml2YXRlOgorICAgICAgICB2b2lkIG5ld0FyZ3VtZW50KEJ5dGVj b2RlR2VuZXJhdG9yJik7CisKICAgICAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IG1fcHJvZmlsZUhv b2tSZWdpc3RlcjsKICAgICAgICAgQXJndW1lbnRzTm9kZSogbV9hcmd1bWVudHNOb2RlOwotICAg ICAgICBWZWN0b3I8UmVmUHRyPFJlZ2lzdGVySUQ+LCAxNj4gbV9hcmd2OworICAgICAgICBWZWN0 b3I8UmVmUHRyPFJlZ2lzdGVySUQ+LCA4PiBtX2FyZ3Y7CiAgICAgfTsKIAogICAgIHN0cnVjdCBG aW5hbGx5Q29udGV4dCB7CkBAIC0xMTAsOCArMTEyLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg ICAgIC8vIHJlcXVpcmUgZXhwbGljaXQgcmVmZXJlbmNlIGNvdW50aW5nLgogICAgICAgICBSZWdp c3RlcklEKiByZWdpc3RlckZvcihjb25zdCBJZGVudGlmaWVyJik7CiAKLSAgICAgICAgLy8gUmV0 dXJucyB0aGUgYWd1bWVudCBudW1iZXIgaWYgdGhpcyBpcyBhbiBhcmd1bWVudCwgb3IgMCBpZiBu b3QuCi0gICAgICAgIGludCBhcmd1bWVudE51bWJlckZvcihjb25zdCBJZGVudGlmaWVyJik7Cisg ICAgICAgIGJvb2wgaXNBcmd1bWVudE51bWJlcihjb25zdCBJZGVudGlmaWVyJiwgaW50KTsKIAog ICAgICAgICB2b2lkIHNldElzTnVtZXJpY0NvbXBhcmVGdW5jdGlvbihib29sIGlzTnVtZXJpY0Nv bXBhcmVGdW5jdGlvbik7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGls ZXIvTm9kZXNDb2RlZ2VuLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAJKHJldmlzaW9uIDEwMDE2NSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzEzLDE5ICszMTMsMjQgQEAgUmVnaXN0ZXJJRCogTmV3RXhwck5vZGU6OmVtaXRC eXRlY29kZShCeQogICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdENvbnN0cnVjdChnZW5lcmF0b3Iu ZmluYWxEZXN0aW5hdGlvbk9ySWdub3JlZChkc3QpLCBmdW5jLmdldCgpLCBjYWxsQXJndW1lbnRz LCBkaXZvdCgpLCBzdGFydE9mZnNldCgpLCBlbmRPZmZzZXQoKSk7CiB9CiAKLUNhbGxBcmd1bWVu dHM6OkNhbGxBcmd1bWVudHMoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgQXJndW1lbnRz Tm9kZSogYXJndW1lbnRzTm9kZSkKK2lubGluZSBDYWxsQXJndW1lbnRzOjpDYWxsQXJndW1lbnRz KEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIEFyZ3VtZW50c05vZGUqIGFyZ3VtZW50c05v ZGUpCiAgICAgOiBtX2FyZ3VtZW50c05vZGUoYXJndW1lbnRzTm9kZSkKIHsKICAgICBpZiAoZ2Vu ZXJhdG9yLnNob3VsZEVtaXRQcm9maWxlSG9va3MoKSkKICAgICAgICAgbV9wcm9maWxlSG9va1Jl Z2lzdGVyID0gZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpOwotICAgIG1fYXJndi5hcHBlbmQoZ2Vu ZXJhdG9yLm5ld1RlbXBvcmFyeSgpKTsKLSAgICBpZiAoYXJndW1lbnRzTm9kZSkgewotICAgICAg ICBmb3IgKEFyZ3VtZW50TGlzdE5vZGUqIG4gPSBhcmd1bWVudHNOb2RlLT5tX2xpc3ROb2RlOyBu OyBuID0gbi0+bV9uZXh0KSB7Ci0gICAgICAgICAgICBtX2FyZ3YuYXBwZW5kKGdlbmVyYXRvci5u ZXdUZW1wb3JhcnkoKSk7Ci0gICAgICAgICAgICAvLyBvcF9jYWxsIHJlcXVpcmVzIHRoZSBhcmd1 bWVudHMgdG8gYmUgYSBzZXF1ZW50aWFsIHJhbmdlIG9mIHJlZ2lzdGVycwotICAgICAgICAgICAg QVNTRVJUKG1fYXJndlttX2FyZ3Yuc2l6ZSgpIC0gMV0tPmluZGV4KCkgPT0gbV9hcmd2W21fYXJn di5zaXplKCkgLSAyXS0+aW5kZXgoKSArIDEpOwotICAgICAgICB9Ci0gICAgfQorCisgICAgbmV3 QXJndW1lbnQoZ2VuZXJhdG9yKTsgLy8gJ3RoaXMnIHJlZ2lzdGVyLgorICAgIGlmICghYXJndW1l bnRzTm9kZSkKKyAgICAgICAgcmV0dXJuOworICAgIGZvciAoQXJndW1lbnRMaXN0Tm9kZSogbiA9 IGFyZ3VtZW50c05vZGUtPm1fbGlzdE5vZGU7IG47IG4gPSBuLT5tX25leHQpCisgICAgICAgIG5l d0FyZ3VtZW50KGdlbmVyYXRvcik7Cit9CisKK2lubGluZSB2b2lkIENhbGxBcmd1bWVudHM6Om5l d0FyZ3VtZW50KEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IpCit7CisgICAgUmVmUHRyPFJl Z2lzdGVySUQ+IHRtcCA9IGdlbmVyYXRvci5uZXdUZW1wb3JhcnkoKTsKKyAgICBBU1NFUlQobV9h cmd2LmlzRW1wdHkoKSB8fCB0bXAtPmluZGV4KCkgPT0gbV9hcmd2Lmxhc3QoKS0+aW5kZXgoKSAr IDEpOyAvLyBDYWxsaW5nIGNvbnZlbnRpb24gYXNzdW1lcyB0aGF0IGFsbCBhcmd1bWVudHMgYXJl IGNvbnRpZ3VvdXMuCisgICAgbV9hcmd2LmFwcGVuZCh0bXAucmVsZWFzZSgpKTsKIH0KIAogLy8g LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIEV2YWxGdW5jdGlvbkNhbGxOb2RlIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTQyNSw3ICs0MzAsNiBAQCBSZWdpc3Rl cklEKiBDYWxsRnVuY3Rpb25DYWxsRG90Tm9kZTo6ZW1pCiAgICAgICAgICAgICBnZW5lcmF0b3Iu ZW1pdEp1bXAoZW5kLmdldCgpKTsKIAogICAgICAgICAgICAgbV9hcmdzLT5tX2xpc3ROb2RlID0g b2xkTGlzdDsKLQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgUmVmUHRyPFJlZ2lzdGVy SUQ+IHJlYWxGdW5jdGlvbiA9IGdlbmVyYXRvci5lbWl0TW92ZShnZW5lcmF0b3IudGVtcERlc3Rp bmF0aW9uKGRzdCksIGJhc2UuZ2V0KCkpOwogICAgICAgICAgICAgQ2FsbEFyZ3VtZW50cyBjYWxs QXJndW1lbnRzKGdlbmVyYXRvciwgbV9hcmdzKTsKQEAgLTIwMzEsOSArMjAzNSwxMiBAQCBSZWdp c3RlcklEKiBGdW5jdGlvbkJvZHlOb2RlOjplbWl0Qnl0ZWNvCiAgICAgICAgIGlmIChyZXR1cm5W YWx1ZUV4cHJlc3Npb24gJiYgcmV0dXJuVmFsdWVFeHByZXNzaW9uLT5pc1N1YnRyYWN0KCkpIHsK ICAgICAgICAgICAgIEV4cHJlc3Npb25Ob2RlKiBsaHNFeHByZXNzaW9uID0gc3RhdGljX2Nhc3Q8 U3ViTm9kZSo+KHJldHVyblZhbHVlRXhwcmVzc2lvbiktPmxocygpOwogICAgICAgICAgICAgRXhw cmVzc2lvbk5vZGUqIHJoc0V4cHJlc3Npb24gPSBzdGF0aWNfY2FzdDxTdWJOb2RlKj4ocmV0dXJu VmFsdWVFeHByZXNzaW9uKS0+cmhzKCk7Ci0gICAgICAgICAgICBpZiAobGhzRXhwcmVzc2lvbi0+ aXNSZXNvbHZlTm9kZSgpICYmIHJoc0V4cHJlc3Npb24tPmlzUmVzb2x2ZU5vZGUoKSkgewotICAg ICAgICAgICAgICAgIGdlbmVyYXRvci5zZXRJc051bWVyaWNDb21wYXJlRnVuY3Rpb24oZ2VuZXJh dG9yLmFyZ3VtZW50TnVtYmVyRm9yKHN0YXRpY19jYXN0PFJlc29sdmVOb2RlKj4obGhzRXhwcmVz c2lvbiktPmlkZW50aWZpZXIoKSkgPT0gMQotICAgICAgICAgICAgICAgICAgICAmJiBnZW5lcmF0 b3IuYXJndW1lbnROdW1iZXJGb3Ioc3RhdGljX2Nhc3Q8UmVzb2x2ZU5vZGUqPihyaHNFeHByZXNz aW9uKS0+aWRlbnRpZmllcigpKSA9PSAyKTsKKyAgICAgICAgICAgIGlmIChsaHNFeHByZXNzaW9u LT5pc1Jlc29sdmVOb2RlKCkKKyAgICAgICAgICAgICAgICAmJiByaHNFeHByZXNzaW9uLT5pc1Jl c29sdmVOb2RlKCkKKyAgICAgICAgICAgICAgICAmJiBnZW5lcmF0b3IuaXNBcmd1bWVudE51bWJl cihzdGF0aWNfY2FzdDxSZXNvbHZlTm9kZSo+KGxoc0V4cHJlc3Npb24pLT5pZGVudGlmaWVyKCks IDApCisgICAgICAgICAgICAgICAgJiYgZ2VuZXJhdG9yLmlzQXJndW1lbnROdW1iZXIoc3RhdGlj X2Nhc3Q8UmVzb2x2ZU5vZGUqPihyaHNFeHByZXNzaW9uKS0+aWRlbnRpZmllcigpLCAxKSkgewor ICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGdlbmVyYXRvci5zZXRJc051bWVyaWND b21wYXJlRnVuY3Rpb24odHJ1ZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Cg==