29662 2009-09-22 17:27:06 -0700 Code sampling builds are broken. 2009-09-22 17:41:31 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver webkit-unassigned oldest_to_newest 149286 0 oliver 2009-09-22 17:27:06 -0700 as above 149288 1 39966 oliver 2009-09-22 17:29:11 -0700 Created attachment 39966 Patch v1 149293 2 39966 ggaren 2009-09-22 17:35:59 -0700 Comment on attachment 39966 Patch v1 r=me 149296 3 oliver 2009-09-22 17:41:31 -0700 Committed r48662 39966 2009-09-22 17:29:11 -0700 2009-09-22 17:35:58 -0700 Patch v1 bug-29662-20090922172910.patch text/plain 23040 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBjYTk1N2NjLi4yZjRmMzU4IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEg QEAKKzIwMDktMDktMjIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb2RlIHNhbXBsaW5nIGJ1 aWxkcyBhcmUgYnJva2VuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjk2NjIKKworICAgICAgICBGaXggYnVpbGQuCisKKyAgICAgICAgKiBieXRlY29k ZS9FdmFsQ29kZUNhY2hlLmg6CisgICAgICAgIChKU0M6OkV2YWxDb2RlQ2FjaGU6OmdldCk6Cisg ICAgICAgICogYnl0ZWNvZGUvU2FtcGxpbmdUb29sLmNwcDoKKyAgICAgICAgKEpTQzo6U2NyaXB0 U2FtcGxlUmVjb3JkOjpzYW1wbGUpOgorICAgICAgICAoSlNDOjpTYW1wbGluZ1Rvb2w6OmRvUnVu KToKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdUb29sOjpub3RpZnlPZlNjb3BlKToKKyAgICAgICAg KEpTQzo6Y29tcGFyZVNjcmlwdFNhbXBsZVJlY29yZHMpOgorICAgICAgICAoSlNDOjpTYW1wbGlu Z1Rvb2w6OmR1bXApOgorICAgICAgICAqIGJ5dGVjb2RlL1NhbXBsaW5nVG9vbC5oOgorICAgICAg ICAoSlNDOjpTY3JpcHRTYW1wbGVSZWNvcmQ6OlNjcmlwdFNhbXBsZVJlY29yZCk6CisgICAgICAg IChKU0M6OlNjcmlwdFNhbXBsZVJlY29yZDo6flNjcmlwdFNhbXBsZVJlY29yZCk6CisgICAgICAg IChKU0M6OlNhbXBsaW5nVG9vbDo6U2FtcGxpbmdUb29sKToKKyAgICAgICAgKiBieXRlY29tcGls ZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRv cjo6Qnl0ZWNvZGVHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6 ZW1pdE5ld0Z1bmN0aW9uKToKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRO ZXdGdW5jdGlvbkV4cHJlc3Npb24pOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5oOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6bWFrZUZ1bmN0aW9u KToKKyAgICAgICAgKiBkZWJ1Z2dlci9EZWJ1Z2dlci5jcHA6CisgICAgICAgIChKU0M6OmV2YWx1 YXRlSW5HbG9iYWxDYWxsRnJhbWUpOgorICAgICAgICAqIGRlYnVnZ2VyL0RlYnVnZ2VyQ2FsbEZy YW1lLmNwcDoKKyAgICAgICAgKEpTQzo6RGVidWdnZXJDYWxsRnJhbWU6OmV2YWx1YXRlKToKKyAg ICAgICAgKiBwYXJzZXIvTm9kZXMuY3BwOgorICAgICAgICAoSlNDOjpTY29wZU5vZGU6OlNjb3Bl Tm9kZSk6CisgICAgICAgICogcnVudGltZS9Db21wbGV0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6 Y2hlY2tTeW50YXgpOgorICAgICAgICAoSlNDOjpldmFsdWF0ZSk6CisgICAgICAgICogcnVudGlt ZS9FeGVjdXRhYmxlLmNwcDoKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpmcm9t R2xvYmFsQ29kZSk6CisgICAgICAgICogcnVudGltZS9FeGVjdXRhYmxlLmg6CisgICAgICAgIChK U0M6OlNjcmlwdEV4ZWN1dGFibGU6OlNjcmlwdEV4ZWN1dGFibGUpOgorICAgICAgICAoSlNDOjpF dmFsRXhlY3V0YWJsZTo6RXZhbEV4ZWN1dGFibGUpOgorICAgICAgICAoSlNDOjpFdmFsRXhlY3V0 YWJsZTo6Y3JlYXRlKToKKyAgICAgICAgKEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6OlByb2dyYW1F eGVjdXRhYmxlKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpjcmVhdGUpOgor ICAgICAgICAoSlNDOjpGdW5jdGlvbkV4ZWN1dGFibGU6OkZ1bmN0aW9uRXhlY3V0YWJsZSk6Cisg ICAgICAgICogcnVudGltZS9KU0dsb2JhbE9iamVjdEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChK U0M6Omdsb2JhbEZ1bmNFdmFsKToKKwogMjAwOS0wOS0yMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBh L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0V2YWxDb2RlQ2FjaGUuaCBiL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0V2YWxDb2RlQ2FjaGUuaAppbmRleCAwZTFmYjFlLi4wNTgzNGZjIDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9FdmFsQ29kZUNhY2hlLmgKKysrIGIvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvRXZhbENvZGVDYWNoZS5oCkBAIC01MCw3ICs1MCw3IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICAgICAgICAgIGV2YWxFeGVjdXRhYmxlID0gbV9jYWNoZU1hcC5n ZXQoZXZhbFNvdXJjZS5yZXAoKSk7CiAKICAgICAgICAgICAgIGlmICghZXZhbEV4ZWN1dGFibGUp IHsKLSAgICAgICAgICAgICAgICBldmFsRXhlY3V0YWJsZSA9IEV2YWxFeGVjdXRhYmxlOjpjcmVh dGUobWFrZVNvdXJjZShldmFsU291cmNlKSk7CisgICAgICAgICAgICAgICAgZXZhbEV4ZWN1dGFi bGUgPSBFdmFsRXhlY3V0YWJsZTo6Y3JlYXRlKGV4ZWMsIG1ha2VTb3VyY2UoZXZhbFNvdXJjZSkp OwogICAgICAgICAgICAgICAgIGV4Y2VwdGlvblZhbHVlID0gZXZhbEV4ZWN1dGFibGUtPmNvbXBp bGUoZXhlYywgc2NvcGVDaGFpbik7CiAgICAgICAgICAgICAgICAgaWYgKGV4Y2VwdGlvblZhbHVl KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL1NhbXBsaW5nVG9vbC5jcHAgYi9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9T YW1wbGluZ1Rvb2wuY3BwCmluZGV4IDhkMGZhYTEuLjg2NWM5MTkgMTAwNjQ0Ci0tLSBhL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL1NhbXBsaW5nVG9vbC5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvU2FtcGxpbmdUb29sLmNwcApAQCAtMTU3LDcgKzE1Nyw3IEBAIHZvaWQgU2FtcGxp bmdUaHJlYWQ6OnN0b3AoKQogfQogCiAKLXZvaWQgU2NvcGVTYW1wbGVSZWNvcmQ6OnNhbXBsZShD b2RlQmxvY2sqIGNvZGVCbG9jaywgSW5zdHJ1Y3Rpb24qIHZQQykKK3ZvaWQgU2NyaXB0U2FtcGxl UmVjb3JkOjpzYW1wbGUoQ29kZUJsb2NrKiBjb2RlQmxvY2ssIEluc3RydWN0aW9uKiB2UEMpCiB7 CiAgICAgaWYgKCFtX3NhbXBsZXMpIHsKICAgICAgICAgbV9zaXplID0gY29kZUJsb2NrLT5pbnN0 cnVjdGlvbnMoKS5zaXplKCk7CkBAIC0xOTYsOCArMTk2LDggQEAgdm9pZCBTYW1wbGluZ1Rvb2w6 OmRvUnVuKCkKIAogI2lmIEVOQUJMRShDT0RFQkxPQ0tfU0FNUExJTkcpCiAgICAgaWYgKENvZGVC bG9jayogY29kZUJsb2NrID0gc2FtcGxlLmNvZGVCbG9jaygpKSB7Ci0gICAgICAgIE11dGV4TG9j a2VyIGxvY2tlcihtX3Njb3BlU2FtcGxlTWFwTXV0ZXgpOwotICAgICAgICBTY29wZVNhbXBsZVJl Y29yZCogcmVjb3JkID0gbV9zY29wZVNhbXBsZU1hcC0+Z2V0KGNvZGVCbG9jay0+b3duZXJFeGVj dXRhYmxlKCkpOworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9zY3JpcHRTYW1wbGVNYXBN dXRleCk7CisgICAgICAgIFNjcmlwdFNhbXBsZVJlY29yZCogcmVjb3JkID0gbV9zY29wZVNhbXBs ZU1hcC0+Z2V0KGNvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCkpOwogICAgICAgICBBU1NFUlQo cmVjb3JkKTsKICAgICAgICAgcmVjb3JkLT5zYW1wbGUoY29kZUJsb2NrLCBzYW1wbGUudlBDKCkp OwogICAgIH0KQEAgLTIwOSwxMyArMjA5LDEzIEBAIHZvaWQgU2FtcGxpbmdUb29sOjpzYW1wbGUo KQogICAgIHNfc2FtcGxpbmdUb29sLT5kb1J1bigpOwogfQogCi12b2lkIFNhbXBsaW5nVG9vbDo6 bm90aWZ5T2ZTY29wZShTY29wZU5vZGUqIHNjb3BlKQordm9pZCBTYW1wbGluZ1Rvb2w6Om5vdGlm eU9mU2NvcGUoU2NyaXB0RXhlY3V0YWJsZSogc2NyaXB0KQogewogI2lmIEVOQUJMRShDT0RFQkxP Q0tfU0FNUExJTkcpCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fc2NvcGVTYW1wbGVNYXBNdXRl eCk7Ci0gICAgbV9zY29wZVNhbXBsZU1hcC0+c2V0KHNjb3BlLCBuZXcgU2NvcGVTYW1wbGVSZWNv cmQoc2NvcGUpKTsKKyAgICBNdXRleExvY2tlciBsb2NrZXIobV9zY3JpcHRTYW1wbGVNYXBNdXRl eCk7CisgICAgbV9zY29wZVNhbXBsZU1hcC0+c2V0KHNjcmlwdCwgbmV3IFNjcmlwdFNhbXBsZVJl Y29yZChzY3JpcHQpKTsKICNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHNjb3BlKTsKKyAgICBVTlVT RURfUEFSQU0oc2NyaXB0KTsKICNlbmRpZgogfQogCkBAIC0yNTQsMTAgKzI1NCwxMCBAQCBzdGF0 aWMgaW50IGNvbXBhcmVMaW5lQ291bnRJbmZvU2FtcGxpbmcoY29uc3Qgdm9pZCogbGVmdCwgY29u c3Qgdm9pZCogcmlnaHQpCiAgICAgcmV0dXJuIChsZWZ0TGluZUNvdW50LT5saW5lID4gcmlnaHRM aW5lQ291bnQtPmxpbmUpID8gMSA6IChsZWZ0TGluZUNvdW50LT5saW5lIDwgcmlnaHRMaW5lQ291 bnQtPmxpbmUpID8gLTEgOiAwOwogfQogCi1zdGF0aWMgaW50IGNvbXBhcmVTY29wZVNhbXBsZVJl Y29yZHMoY29uc3Qgdm9pZCogbGVmdCwgY29uc3Qgdm9pZCogcmlnaHQpCitzdGF0aWMgaW50IGNv bXBhcmVTY3JpcHRTYW1wbGVSZWNvcmRzKGNvbnN0IHZvaWQqIGxlZnQsIGNvbnN0IHZvaWQqIHJp Z2h0KQogewotICAgIGNvbnN0IFNjb3BlU2FtcGxlUmVjb3JkKiBjb25zdCBsZWZ0VmFsdWUgPSAq c3RhdGljX2Nhc3Q8Y29uc3QgU2NvcGVTYW1wbGVSZWNvcmQqIGNvbnN0ICo+KGxlZnQpOwotICAg IGNvbnN0IFNjb3BlU2FtcGxlUmVjb3JkKiBjb25zdCByaWdodFZhbHVlID0gKnN0YXRpY19jYXN0 PGNvbnN0IFNjb3BlU2FtcGxlUmVjb3JkKiBjb25zdCAqPihyaWdodCk7CisgICAgY29uc3QgU2Ny aXB0U2FtcGxlUmVjb3JkKiBjb25zdCBsZWZ0VmFsdWUgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgU2Ny aXB0U2FtcGxlUmVjb3JkKiBjb25zdCAqPihsZWZ0KTsKKyAgICBjb25zdCBTY3JpcHRTYW1wbGVS ZWNvcmQqIGNvbnN0IHJpZ2h0VmFsdWUgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgU2NyaXB0U2FtcGxl UmVjb3JkKiBjb25zdCAqPihyaWdodCk7CiAKICAgICByZXR1cm4gKGxlZnRWYWx1ZS0+bV9zYW1w bGVDb3VudCA8IHJpZ2h0VmFsdWUtPm1fc2FtcGxlQ291bnQpID8gMSA6IChsZWZ0VmFsdWUtPm1f c2FtcGxlQ291bnQgPiByaWdodFZhbHVlLT5tX3NhbXBsZUNvdW50KSA/IC0xIDogMDsKIH0KQEAg LTMxOCwyNiArMzE4LDI2IEBAIHZvaWQgU2FtcGxpbmdUb29sOjpkdW1wKEV4ZWNTdGF0ZSogZXhl YykKICAgICAvLyAoMykgQnVpbGQgYW5kIHNvcnQgJ2NvZGVCbG9ja1NhbXBsZXMnIGFycmF5Lgog CiAgICAgaW50IHNjb3BlQ291bnQgPSBtX3Njb3BlU2FtcGxlTWFwLT5zaXplKCk7Ci0gICAgVmVj dG9yPFNjb3BlU2FtcGxlUmVjb3JkKj4gY29kZUJsb2NrU2FtcGxlcyhzY29wZUNvdW50KTsKLSAg ICBTY29wZVNhbXBsZVJlY29yZE1hcDo6aXRlcmF0b3IgaXRlciA9IG1fc2NvcGVTYW1wbGVNYXAt PmJlZ2luKCk7CisgICAgVmVjdG9yPFNjcmlwdFNhbXBsZVJlY29yZCo+IGNvZGVCbG9ja1NhbXBs ZXMoc2NvcGVDb3VudCk7CisgICAgU2NyaXB0U2FtcGxlUmVjb3JkTWFwOjppdGVyYXRvciBpdGVy ID0gbV9zY29wZVNhbXBsZU1hcC0+YmVnaW4oKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IHNj b3BlQ291bnQ7ICsraSwgKytpdGVyKQogICAgICAgICBjb2RlQmxvY2tTYW1wbGVzW2ldID0gaXRl ci0+c2Vjb25kOwogCi0gICAgcXNvcnQoY29kZUJsb2NrU2FtcGxlcy5iZWdpbigpLCBzY29wZUNv dW50LCBzaXplb2YoU2NvcGVTYW1wbGVSZWNvcmQqKSwgY29tcGFyZVNjb3BlU2FtcGxlUmVjb3Jk cyk7CisgICAgcXNvcnQoY29kZUJsb2NrU2FtcGxlcy5iZWdpbigpLCBzY29wZUNvdW50LCBzaXpl b2YoU2NyaXB0U2FtcGxlUmVjb3JkKiksIGNvbXBhcmVTY3JpcHRTYW1wbGVSZWNvcmRzKTsKIAog ICAgIC8vICg0KSBQcmludCBkYXRhIGZyb20gJ2NvZGVCbG9ja1NhbXBsZXMnIGFycmF5LgogCiAg ICAgcHJpbnRmKCJcbkNvZGVCbG9jayBzYW1wbGVzXG5cbiIpOyAKIAogICAgIGZvciAoaW50IGkg PSAwOyBpIDwgc2NvcGVDb3VudDsgKytpKSB7Ci0gICAgICAgIFNjb3BlU2FtcGxlUmVjb3JkKiBy ZWNvcmQgPSBjb2RlQmxvY2tTYW1wbGVzW2ldOworICAgICAgICBTY3JpcHRTYW1wbGVSZWNvcmQq IHJlY29yZCA9IGNvZGVCbG9ja1NhbXBsZXNbaV07CiAgICAgICAgIENvZGVCbG9jayogY29kZUJs b2NrID0gcmVjb3JkLT5tX2NvZGVCbG9jazsKIAogICAgICAgICBkb3VibGUgYmxvY2tQZXJjZW50 ID0gKHJlY29yZC0+bV9zYW1wbGVDb3VudCAqIDEwMC4wKSAvIG1fc2FtcGxlQ291bnQ7CiAKICAg ICAgICAgaWYgKGJsb2NrUGVyY2VudCA+PSAxKSB7CiAgICAgICAgICAgICAvL0luc3RydWN0aW9u KiBjb2RlID0gY29kZUJsb2NrLT5pbnN0cnVjdGlvbnMoKS5iZWdpbigpOwotICAgICAgICAgICAg cHJpbnRmKCIjJWQ6ICVzOiVkOiAlZCAvICVsbGQgKCUuM2YlJSlcbiIsIGkgKyAxLCByZWNvcmQt Pm1fc2NvcGUtPnNvdXJjZVVSTCgpLlVURjhTdHJpbmcoKS5jX3N0cigpLCBjb2RlQmxvY2stPmxp bmVOdW1iZXJGb3JCeXRlY29kZU9mZnNldChleGVjLCAwKSwgcmVjb3JkLT5tX3NhbXBsZUNvdW50 LCBtX3NhbXBsZUNvdW50LCBibG9ja1BlcmNlbnQpOworICAgICAgICAgICAgcHJpbnRmKCIjJWQ6 ICVzOiVkOiAlZCAvICVsbGQgKCUuM2YlJSlcbiIsIGkgKyAxLCByZWNvcmQtPm1fZXhlY3V0YWJs ZS0+c291cmNlVVJMKCkuVVRGOFN0cmluZygpLmNfc3RyKCksIGNvZGVCbG9jay0+bGluZU51bWJl ckZvckJ5dGVjb2RlT2Zmc2V0KGV4ZWMsIDApLCByZWNvcmQtPm1fc2FtcGxlQ291bnQsIG1fc2Ft cGxlQ291bnQsIGJsb2NrUGVyY2VudCk7CiAgICAgICAgICAgICBpZiAoaSA8IDEwKSB7CiAgICAg ICAgICAgICAgICAgSGFzaE1hcDx1bnNpZ25lZCx1bnNpZ25lZD4gbGluZUNvdW50czsKICAgICAg ICAgICAgICAgICBjb2RlQmxvY2stPmR1bXAoZXhlYyk7CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9TYW1wbGluZ1Rvb2wuaCBiL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1Nh bXBsaW5nVG9vbC5oCmluZGV4IDFhM2Y3Y2YuLjcxMWIwODYgMTAwNjQ0Ci0tLSBhL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL1NhbXBsaW5nVG9vbC5oCisrKyBiL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL1NhbXBsaW5nVG9vbC5oCkBAIC0zOCw2ICszOCw4IEBACiAKIG5hbWVzcGFjZSBKU0Mgewog CisgICAgY2xhc3MgU2NyaXB0RXhlY3V0YWJsZTsKKwogICAgIGNsYXNzIFNhbXBsaW5nRmxhZ3Mg ewogICAgICAgICBmcmllbmQgY2xhc3MgSklUOwogICAgIHB1YmxpYzoKQEAgLTkyLDkgKzk0LDkg QEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgY2xhc3MgU2NvcGVOb2RlOwogICAgIHN0cnVjdCBJbnN0 cnVjdGlvbjsKIAotICAgIHN0cnVjdCBTY29wZVNhbXBsZVJlY29yZCB7Ci0gICAgICAgIFNjb3Bl U2FtcGxlUmVjb3JkKFNjb3BlTm9kZSogc2NvcGUpCi0gICAgICAgICAgICA6IG1fc2NvcGUoc2Nv cGUpCisgICAgc3RydWN0IFNjcmlwdFNhbXBsZVJlY29yZCB7CisgICAgICAgIFNjcmlwdFNhbXBs ZVJlY29yZChTY3JpcHRFeGVjdXRhYmxlKiBleGVjdXRhYmxlKQorICAgICAgICAgICAgOiBtX2V4 ZWN1dGFibGUoZXhlY3V0YWJsZSkKICAgICAgICAgICAgICwgbV9jb2RlQmxvY2soMCkKICAgICAg ICAgICAgICwgbV9zYW1wbGVDb3VudCgwKQogICAgICAgICAgICAgLCBtX29wY29kZVNhbXBsZUNv dW50KDApCkBAIC0xMDMsNyArMTA1LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHsKICAg ICAgICAgfQogICAgICAgICAKLSAgICAgICAgflNjb3BlU2FtcGxlUmVjb3JkKCkKKyAgICAgICAg flNjcmlwdFNhbXBsZVJlY29yZCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChtX3NhbXBs ZXMpCiAgICAgICAgICAgICAgICAgZnJlZShtX3NhbXBsZXMpOwpAQCAtMTExLDcgKzExMyw3IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICAKICAgICAgICAgdm9pZCBzYW1wbGUoQ29kZUJsb2Nr KiwgSW5zdHJ1Y3Rpb24qKTsKIAotICAgICAgICBSZWZQdHI8U2NvcGVOb2RlPiBtX3Njb3BlOwor ICAgICAgICBTY3JpcHRFeGVjdXRhYmxlKiBtX2V4ZWN1dGFibGU7CiAgICAgICAgIENvZGVCbG9j ayogbV9jb2RlQmxvY2s7CiAgICAgICAgIGludCBtX3NhbXBsZUNvdW50OwogICAgICAgICBpbnQg bV9vcGNvZGVTYW1wbGVDb3VudDsKQEAgLTExOSw3ICsxMjEsNyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICAgICAgdW5zaWduZWQgbV9zaXplOwogICAgIH07CiAKLSAgICB0eXBlZGVmIFdURjo6SGFz aE1hcDxTY29wZU5vZGUqLCBTY29wZVNhbXBsZVJlY29yZCo+IFNjb3BlU2FtcGxlUmVjb3JkTWFw OworICAgIHR5cGVkZWYgV1RGOjpIYXNoTWFwPFNjcmlwdEV4ZWN1dGFibGUqLCBTY3JpcHRTYW1w bGVSZWNvcmQqPiBTY3JpcHRTYW1wbGVSZWNvcmRNYXA7CiAKICAgICBjbGFzcyBTYW1wbGluZ1Ro cmVhZCB7CiAgICAgcHVibGljOgpAQCAtMTkzLDcgKzE5NSw3IEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICAgICAgLCBtX3NhbXBsZUNvdW50KDApCiAgICAgICAgICAgICAsIG1fb3Bjb2RlU2Ft cGxlQ291bnQoMCkKICNpZiBFTkFCTEUoQ09ERUJMT0NLX1NBTVBMSU5HKQotICAgICAgICAgICAg LCBtX3Njb3BlU2FtcGxlTWFwKG5ldyBTY29wZVNhbXBsZVJlY29yZE1hcCgpKQorICAgICAgICAg ICAgLCBtX3Njb3BlU2FtcGxlTWFwKG5ldyBTY3JpcHRTYW1wbGVSZWNvcmRNYXAoKSkKICNlbmRp ZgogICAgICAgICB7CiAgICAgICAgICAgICBtZW1zZXQobV9vcGNvZGVTYW1wbGVzLCAwLCBzaXpl b2YobV9vcGNvZGVTYW1wbGVzKSk7CkBAIC0yMTAsNyArMjEyLDcgQEAgbmFtZXNwYWNlIEpTQyB7 CiAgICAgICAgIHZvaWQgc2V0dXAoKTsKICAgICAgICAgdm9pZCBkdW1wKEV4ZWNTdGF0ZSopOwog Ci0gICAgICAgIHZvaWQgbm90aWZ5T2ZTY29wZShTY29wZU5vZGUqIHNjb3BlKTsKKyAgICAgICAg dm9pZCBub3RpZnlPZlNjb3BlKFNjcmlwdEV4ZWN1dGFibGUqIHNjb3BlKTsKIAogICAgICAgICB2 b2lkIHNhbXBsZShDb2RlQmxvY2sqIGNvZGVCbG9jaywgSW5zdHJ1Y3Rpb24qIHZQQykKICAgICAg ICAgewpAQCAtMjY2LDggKzI2OCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB1bnNpZ25l ZCBtX29wY29kZVNhbXBsZXNJbkNUSUZ1bmN0aW9uc1tudW1PcGNvZGVJRHNdOwogICAgICAgICAK ICNpZiBFTkFCTEUoQ09ERUJMT0NLX1NBTVBMSU5HKQotICAgICAgICBNdXRleCBtX3Njb3BlU2Ft cGxlTWFwTXV0ZXg7Ci0gICAgICAgIE93blB0cjxTY29wZVNhbXBsZVJlY29yZE1hcD4gbV9zY29w ZVNhbXBsZU1hcDsKKyAgICAgICAgTXV0ZXggbV9zY3JpcHRTYW1wbGVNYXBNdXRleDsKKyAgICAg ICAgT3duUHRyPFNjcmlwdFNhbXBsZVJlY29yZE1hcD4gbV9zY29wZVNhbXBsZU1hcDsKICNlbmRp ZgogICAgIH07CiAKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRl Y29kZUdlbmVyYXRvci5jcHAgYi9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwCmluZGV4IGFmOGY3ODQuLjg5NTFjZTMgMTAwNjQ0Ci0tLSBhL0phdmFTY3Jp cHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAKKysrIGIvSmF2YVNjcmlw dENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcApAQCAtMjczLDcgKzI3Myw3 IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihQcm9ncmFtTm9kZSogcHJv Z3JhbU5vZGUsIGNvbnN0IERlYnVnZ2VyKiBkCiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBmdW5jdGlvblN0YWNrLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAg ICBGdW5jdGlvbkJvZHlOb2RlKiBmdW5jdGlvbiA9IGZ1bmN0aW9uU3RhY2tbaV07Ci0gICAgICAg ICAgICBnbG9iYWxPYmplY3QtPnB1dFdpdGhBdHRyaWJ1dGVzKGV4ZWMsIGZ1bmN0aW9uLT5pZGVu dCgpLCBuZXcgKGV4ZWMpIEpTRnVuY3Rpb24oZXhlYywgbWFrZUZ1bmN0aW9uKGZ1bmN0aW9uKSwg c2NvcGVDaGFpbi5ub2RlKCkpLCBEb250RGVsZXRlKTsKKyAgICAgICAgICAgIGdsb2JhbE9iamVj dC0+cHV0V2l0aEF0dHJpYnV0ZXMoZXhlYywgZnVuY3Rpb24tPmlkZW50KCksIG5ldyAoZXhlYykg SlNGdW5jdGlvbihleGVjLCBtYWtlRnVuY3Rpb24oZXhlYywgZnVuY3Rpb24pLCBzY29wZUNoYWlu Lm5vZGUoKSksIERvbnREZWxldGUpOwogICAgICAgICB9CiAgICAgICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgdmFyU3RhY2suc2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIGlmIChnbG9iYWxP YmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsICp2YXJTdGFja1tpXS5maXJzdCkpCkBAIC0zOTksNyAr Mzk5LDcgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKEV2YWxOb2RlKiBl dmFsTm9kZSwgY29uc3QgRGVidWdnZXIqIGRlYnVnZ2UKIAogICAgIGNvbnN0IERlY2xhcmF0aW9u U3RhY2tzOjpGdW5jdGlvblN0YWNrJiBmdW5jdGlvblN0YWNrID0gZXZhbE5vZGUtPmZ1bmN0aW9u U3RhY2soKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZ1bmN0aW9uU3RhY2suc2l6ZSgp OyArK2kpCi0gICAgICAgIG1fY29kZUJsb2NrLT5hZGRGdW5jdGlvbkRlY2wobWFrZUZ1bmN0aW9u KGZ1bmN0aW9uU3RhY2tbaV0pKTsKKyAgICAgICAgbV9jb2RlQmxvY2stPmFkZEZ1bmN0aW9uRGVj bChtYWtlRnVuY3Rpb24obV9nbG9iYWxEYXRhLCBmdW5jdGlvblN0YWNrW2ldKSk7CiAKICAgICBj b25zdCBEZWNsYXJhdGlvblN0YWNrczo6VmFyU3RhY2smIHZhclN0YWNrID0gZXZhbE5vZGUtPnZh clN0YWNrKCk7CiAgICAgdW5zaWduZWQgbnVtVmFyaWFibGVzID0gdmFyU3RhY2suc2l6ZSgpOwpA QCAtMTMxNiw3ICsxMzE2LDcgQEAgUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRO ZXdBcnJheShSZWdpc3RlcklEKiBkc3QsIEVsZW1lbnROb2RlKiBlbGVtZW4KIAogUmVnaXN0ZXJJ RCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXROZXdGdW5jdGlvbihSZWdpc3RlcklEKiBkc3QsIEZ1 bmN0aW9uQm9keU5vZGUqIGZ1bmN0aW9uKQogewotICAgIHVuc2lnbmVkIGluZGV4ID0gbV9jb2Rl QmxvY2stPmFkZEZ1bmN0aW9uRGVjbChtYWtlRnVuY3Rpb24oZnVuY3Rpb24pKTsKKyAgICB1bnNp Z25lZCBpbmRleCA9IG1fY29kZUJsb2NrLT5hZGRGdW5jdGlvbkRlY2wobWFrZUZ1bmN0aW9uKG1f Z2xvYmFsRGF0YSwgZnVuY3Rpb24pKTsKIAogICAgIGVtaXRPcGNvZGUob3BfbmV3X2Z1bmMpOwog ICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChkc3QtPmluZGV4KCkpOwpAQCAtMTMzNiw3ICsxMzM2 LDcgQEAgUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXROZXdSZWdFeHAoUmVnaXN0 ZXJJRCogZHN0LCBSZWdFeHAqIHJlZ0V4cCkKIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9y OjplbWl0TmV3RnVuY3Rpb25FeHByZXNzaW9uKFJlZ2lzdGVySUQqIHIwLCBGdW5jRXhwck5vZGUq IG4pCiB7CiAgICAgRnVuY3Rpb25Cb2R5Tm9kZSogZnVuY3Rpb24gPSBuLT5ib2R5KCk7Ci0gICAg dW5zaWduZWQgaW5kZXggPSBtX2NvZGVCbG9jay0+YWRkRnVuY3Rpb25FeHByKG1ha2VGdW5jdGlv bihmdW5jdGlvbikpOworICAgIHVuc2lnbmVkIGluZGV4ID0gbV9jb2RlQmxvY2stPmFkZEZ1bmN0 aW9uRXhwcihtYWtlRnVuY3Rpb24obV9nbG9iYWxEYXRhLCBmdW5jdGlvbikpOwogCiAgICAgZW1p dE9wY29kZShvcF9uZXdfZnVuY19leHApOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChyMC0+ aW5kZXgoKSk7CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNv ZGVHZW5lcmF0b3IuaCBiL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVy YXRvci5oCmluZGV4IDY1MGIzNjIuLjFhODNjZTkgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3Jl L2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCisrKyBiL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCkBAIC00MTcsOSArNDE3LDE0IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICBSZWdpc3RlcklEKiBhZGRDb25zdGFudFZhbHVlKEpTVmFsdWUp OwogICAgICAgICB1bnNpZ25lZCBhZGRSZWdFeHAoUmVnRXhwKik7CiAKLSAgICAgICAgUGFzc1Jl ZlB0cjxGdW5jdGlvbkV4ZWN1dGFibGU+IG1ha2VGdW5jdGlvbihGdW5jdGlvbkJvZHlOb2RlKiBi b2R5KQorICAgICAgICBQYXNzUmVmUHRyPEZ1bmN0aW9uRXhlY3V0YWJsZT4gbWFrZUZ1bmN0aW9u KEV4ZWNTdGF0ZSogZXhlYywgRnVuY3Rpb25Cb2R5Tm9kZSogYm9keSkKICAgICAgICAgewotICAg ICAgICAgICAgcmV0dXJuIEZ1bmN0aW9uRXhlY3V0YWJsZTo6Y3JlYXRlKGJvZHktPmlkZW50KCks IGJvZHktPnNvdXJjZSgpLCBib2R5LT51c2VzQXJndW1lbnRzKCksIGJvZHktPnBhcmFtZXRlcnMo KSwgYm9keS0+bGluZU5vKCksIGJvZHktPmxhc3RMaW5lKCkpOworICAgICAgICAgICAgcmV0dXJu IEZ1bmN0aW9uRXhlY3V0YWJsZTo6Y3JlYXRlKGV4ZWMsIGJvZHktPmlkZW50KCksIGJvZHktPnNv dXJjZSgpLCBib2R5LT51c2VzQXJndW1lbnRzKCksIGJvZHktPnBhcmFtZXRlcnMoKSwgYm9keS0+ bGluZU5vKCksIGJvZHktPmxhc3RMaW5lKCkpOworICAgICAgICB9CisKKyAgICAgICAgUGFzc1Jl ZlB0cjxGdW5jdGlvbkV4ZWN1dGFibGU+IG1ha2VGdW5jdGlvbihKU0dsb2JhbERhdGEqIGdsb2Jh bERhdGEsIEZ1bmN0aW9uQm9keU5vZGUqIGJvZHkpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJl dHVybiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNyZWF0ZShnbG9iYWxEYXRhLCBib2R5LT5pZGVudCgp LCBib2R5LT5zb3VyY2UoKSwgYm9keS0+dXNlc0FyZ3VtZW50cygpLCBib2R5LT5wYXJhbWV0ZXJz KCksIGJvZHktPmxpbmVObygpLCBib2R5LT5sYXN0TGluZSgpKTsKICAgICAgICAgfQogCiAgICAg ICAgIFZlY3RvcjxJbnN0cnVjdGlvbj4mIGluc3RydWN0aW9ucygpIHsgcmV0dXJuIG1fY29kZUJs b2NrLT5pbnN0cnVjdGlvbnMoKTsgfQpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvZGVidWdn ZXIvRGVidWdnZXIuY3BwIGIvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuY3BwCmlu ZGV4IDYxMTY3ZDQuLmRiMDIzMjkgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2Vy L0RlYnVnZ2VyLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5jcHAK QEAgLTEwMCw3ICsxMDAsNyBAQCBKU1ZhbHVlIGV2YWx1YXRlSW5HbG9iYWxDYWxsRnJhbWUoY29u c3QgVVN0cmluZyYgc2NyaXB0LCBKU1ZhbHVlJiBleGNlcHRpb24sIEpTRwogewogICAgIENhbGxG cmFtZSogZ2xvYmFsQ2FsbEZyYW1lID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAKLSAg ICBFdmFsRXhlY3V0YWJsZSBldmFsKG1ha2VTb3VyY2Uoc2NyaXB0KSk7CisgICAgRXZhbEV4ZWN1 dGFibGUgZXZhbChnbG9iYWxDYWxsRnJhbWUsIG1ha2VTb3VyY2Uoc2NyaXB0KSk7CiAgICAgSlNP YmplY3QqIGVycm9yID0gZXZhbC5jb21waWxlKGdsb2JhbENhbGxGcmFtZSwgZ2xvYmFsQ2FsbEZy YW1lLT5zY29wZUNoYWluKCkpOwogICAgIGlmIChlcnJvcikKICAgICAgICAgcmV0dXJuIGVycm9y OwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJDYWxsRnJhbWUu Y3BwIGIvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJDYWxsRnJhbWUuY3BwCmluZGV4 IDljOGNhMmEuLjg4YjE0ZTYgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0Rl YnVnZ2VyQ2FsbEZyYW1lLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dl ckNhbGxGcmFtZS5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgSlNWYWx1ZSBEZWJ1Z2dlckNhbGxGcmFt ZTo6ZXZhbHVhdGUoY29uc3QgVVN0cmluZyYgc2NyaXB0LCBKU1ZhbHVlJiBleGNlcHRpb24pIGMK ICAgICBpZiAoIW1fY2FsbEZyYW1lLT5jb2RlQmxvY2soKSkKICAgICAgICAgcmV0dXJuIEpTVmFs dWUoKTsKIAotICAgIEV2YWxFeGVjdXRhYmxlIGV2YWwobWFrZVNvdXJjZShzY3JpcHQpKTsKKyAg ICBFdmFsRXhlY3V0YWJsZSBldmFsKG1fY2FsbEZyYW1lLCBtYWtlU291cmNlKHNjcmlwdCkpOwog ICAgIEpTT2JqZWN0KiBlcnJvciA9IGV2YWwuY29tcGlsZShtX2NhbGxGcmFtZSwgbV9jYWxsRnJh bWUtPnNjb3BlQ2hhaW4oKSk7CiAgICAgaWYgKGVycm9yKQogICAgICAgICByZXR1cm4gZXJyb3I7 CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuY3BwIGIvSmF2YVNjcmlw dENvcmUvcGFyc2VyL05vZGVzLmNwcAppbmRleCAxNGEzOThhLi4zYmQzMThhIDEwMDY0NAotLS0g YS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3Bh cnNlci9Ob2Rlcy5jcHAKQEAgLTE4ODYsMTAgKzE4ODYsNiBAQCBTY29wZU5vZGU6OlNjb3BlTm9k ZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEpCiAgICAgLCBQYXJzZXJBcmVuYVJlZkNvdW50ZWQo Z2xvYmFsRGF0YSkKICAgICAsIG1fZmVhdHVyZXMoTm9GZWF0dXJlcykKIHsKLSNpZiBFTkFCTEUo Q09ERUJMT0NLX1NBTVBMSU5HKQotICAgIGlmIChTYW1wbGluZ1Rvb2wqIHNhbXBsZXIgPSBnbG9i YWxEYXRhLT5pbnRlcnByZXRlci0+c2FtcGxlcigpKQotICAgICAgICBzYW1wbGVyLT5ub3RpZnlP ZlNjb3BlKHRoaXMpOwotI2VuZGlmCiB9CiAKIFNjb3BlTm9kZTo6U2NvcGVOb2RlKEpTR2xvYmFs RGF0YSogZ2xvYmFsRGF0YSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBTb3VyY2VFbGVtZW50 cyogY2hpbGRyZW4sIFZhclN0YWNrKiB2YXJTdGFjaywgRnVuY3Rpb25TdGFjayogZnVuY1N0YWNr LCBDb2RlRmVhdHVyZXMgZmVhdHVyZXMsIGludCBudW1Db25zdGFudHMpCkBAIC0xODk5LDEwICsx ODk1LDYgQEAgU2NvcGVOb2RlOjpTY29wZU5vZGUoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBj b25zdCBTb3VyY2VDb2RlJiBzb3VyY2UsIFNvdXJjZUUKICAgICAsIG1fZmVhdHVyZXMoZmVhdHVy ZXMpCiAgICAgLCBtX3NvdXJjZShzb3VyY2UpCiB7Ci0jaWYgRU5BQkxFKENPREVCTE9DS19TQU1Q TElORykKLSAgICBpZiAoU2FtcGxpbmdUb29sKiBzYW1wbGVyID0gZ2xvYmFsRGF0YS0+aW50ZXJw cmV0ZXItPnNhbXBsZXIoKSkKLSAgICAgICAgc2FtcGxlci0+bm90aWZ5T2ZTY29wZSh0aGlzKTsK LSNlbmRpZgogfQogCiBpbmxpbmUgdm9pZCBTY29wZU5vZGU6OmVtaXRTdGF0ZW1lbnRzQnl0ZWNv ZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogZHN0KQpkaWZmIC0t Z2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21wbGV0aW9uLmNwcCBiL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvQ29tcGxldGlvbi5jcHAKaW5kZXggZjM2ZGU1NC4uZWMzZTAwMCAxMDA2NDQK LS0tIGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21wbGV0aW9uLmNwcAorKysgYi9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24uY3BwCkBAIC0zNyw3ICszNyw3IEBAIENvbXBsZXRp b24gY2hlY2tTeW50YXgoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2Up CiB7CiAgICAgSlNMb2NrIGxvY2soZXhlYyk7CiAKLSAgICBQcm9ncmFtRXhlY3V0YWJsZSBwcm9n cmFtKHNvdXJjZSk7CisgICAgUHJvZ3JhbUV4ZWN1dGFibGUgcHJvZ3JhbShleGVjLCBzb3VyY2Up OwogICAgIEpTT2JqZWN0KiBlcnJvciA9IHByb2dyYW0uY2hlY2tTeW50YXgoZXhlYyk7CiAgICAg aWYgKGVycm9yKQogICAgICAgICByZXR1cm4gQ29tcGxldGlvbihUaHJvdywgZXJyb3IpOwpAQCAt NDksNyArNDksNyBAQCBDb21wbGV0aW9uIGV2YWx1YXRlKEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVD aGFpbiYgc2NvcGVDaGFpbiwgY29uc3QgU291cmNlQ29kZSYgcwogewogICAgIEpTTG9jayBsb2Nr KGV4ZWMpOwogCi0gICAgUHJvZ3JhbUV4ZWN1dGFibGUgcHJvZ3JhbShzb3VyY2UpOworICAgIFBy b2dyYW1FeGVjdXRhYmxlIHByb2dyYW0oZXhlYywgc291cmNlKTsKICAgICBKU09iamVjdCogZXJy b3IgPSBwcm9ncmFtLmNvbXBpbGUoZXhlYywgc2NvcGVDaGFpbi5ub2RlKCkpOwogICAgIGlmIChl cnJvcikKICAgICAgICAgcmV0dXJuIENvbXBsZXRpb24oVGhyb3csIGVycm9yKTsKZGlmZiAtLWdp dCBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhlY3V0YWJsZS5jcHAgYi9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCmluZGV4IDVlNzk3OTQuLjc1ODY3NDYgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhlY3V0YWJsZS5jcHAKKysrIGIvSmF2YVNjcmlw dENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmNwcApAQCAtMjU5LDcgKzI1OSw3IEBAIFBhc3NSZWZQ dHI8RnVuY3Rpb25FeGVjdXRhYmxlPiBGdW5jdGlvbkV4ZWN1dGFibGU6OmZyb21HbG9iYWxDb2Rl KGNvbnN0IElkZW50aWZpCiAKICAgICBGdW5jdGlvbkJvZHlOb2RlKiBib2R5ID0gc3RhdGljX2Nh c3Q8RnVuY0V4cHJOb2RlKj4oZnVuY0V4cHIpLT5ib2R5KCk7CiAgICAgQVNTRVJUKGJvZHkpOwot ICAgIHJldHVybiBGdW5jdGlvbkV4ZWN1dGFibGU6OmNyZWF0ZShmdW5jdGlvbk5hbWUsIGJvZHkt PnNvdXJjZSgpLCBib2R5LT51c2VzQXJndW1lbnRzKCksIGJvZHktPnBhcmFtZXRlcnMoKSwgYm9k eS0+bGluZU5vKCksIGJvZHktPmxhc3RMaW5lKCkpOworICAgIHJldHVybiBGdW5jdGlvbkV4ZWN1 dGFibGU6OmNyZWF0ZSgmZXhlYy0+Z2xvYmFsRGF0YSgpLCBmdW5jdGlvbk5hbWUsIGJvZHktPnNv dXJjZSgpLCBib2R5LT51c2VzQXJndW1lbnRzKCksIGJvZHktPnBhcmFtZXRlcnMoKSwgYm9keS0+ bGluZU5vKCksIGJvZHktPmxhc3RMaW5lKCkpOwogfQogCiBVU3RyaW5nIEZ1bmN0aW9uRXhlY3V0 YWJsZTo6cGFyYW1TdHJpbmcoKSBjb25zdApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9FeGVjdXRhYmxlLmggYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuaApp bmRleCBkNDM3ZDQ2Li45NzI4Nzc1IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0V4ZWN1dGFibGUuaAorKysgYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuaApA QCAtMjcsNyArMjcsOSBAQAogI2RlZmluZSBFeGVjdXRhYmxlX2gKIAogI2luY2x1ZGUgIkpTRnVu Y3Rpb24uaCIKKyNpbmNsdWRlICJJbnRlcnByZXRlci5oIgogI2luY2x1ZGUgIk5vZGVzLmgiCisj aW5jbHVkZSAiU2FtcGxpbmdUb29sLmgiCiAKIG5hbWVzcGFjZSBKU0MgewogCkBAIC0xMDIsMTEg KzEwNCwzMCBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgIGNsYXNzIFNjcmlwdEV4ZWN1dGFibGUg OiBwdWJsaWMgRXhlY3V0YWJsZUJhc2UgewogICAgIHB1YmxpYzoKLSAgICAgICAgU2NyaXB0RXhl Y3V0YWJsZShjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UpCisgICAgICAgIFNjcmlwdEV4ZWN1dGFi bGUoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UpCiAg ICAgICAgICAgICA6IEV4ZWN1dGFibGVCYXNlKE5VTV9QQVJBTUVURVJTX05PVF9DT01QSUxFRCkK ICAgICAgICAgICAgICwgbV9zb3VyY2Uoc291cmNlKQogICAgICAgICAgICAgLCBtX2ZlYXR1cmVz KDApCiAgICAgICAgIHsKKyNpZiBFTkFCTEUoQ09ERUJMT0NLX1NBTVBMSU5HKQorICAgICAgICAg ICAgaWYgKFNhbXBsaW5nVG9vbCogc2FtcGxlciA9IGdsb2JhbERhdGEtPmludGVycHJldGVyLT5z YW1wbGVyKCkpCisgICAgICAgICAgICAgICAgc2FtcGxlci0+bm90aWZ5T2ZTY29wZSh0aGlzKTsK KyNlbHNlCisgICAgICAgICAgICBVTlVTRURfUEFSQU0oZ2xvYmFsRGF0YSk7CisjZW5kaWYKKyAg ICAgICAgfQorCisgICAgICAgIFNjcmlwdEV4ZWN1dGFibGUoRXhlY1N0YXRlKiBleGVjLCBjb25z dCBTb3VyY2VDb2RlJiBzb3VyY2UpCisgICAgICAgICAgICA6IEV4ZWN1dGFibGVCYXNlKE5VTV9Q QVJBTUVURVJTX05PVF9DT01QSUxFRCkKKyAgICAgICAgICAgICwgbV9zb3VyY2Uoc291cmNlKQor ICAgICAgICAgICAgLCBtX2ZlYXR1cmVzKDApCisgICAgICAgIHsKKyNpZiBFTkFCTEUoQ09ERUJM T0NLX1NBTVBMSU5HKQorICAgICAgICAgICAgaWYgKFNhbXBsaW5nVG9vbCogc2FtcGxlciA9IGV4 ZWMtPmdsb2JhbERhdGEoKS5pbnRlcnByZXRlci0+c2FtcGxlcigpKQorICAgICAgICAgICAgICAg IHNhbXBsZXItPm5vdGlmeU9mU2NvcGUodGhpcyk7CisjZWxzZQorICAgICAgICAgICAgVU5VU0VE X1BBUkFNKGV4ZWMpOworI2VuZGlmCiAgICAgICAgIH0KIAogICAgICAgICBjb25zdCBTb3VyY2VD b2RlJiBzb3VyY2UoKSB7IHJldHVybiBtX3NvdXJjZTsgfQpAQCAtMTM3LDggKzE1OCw4IEBAIG5h bWVzcGFjZSBKU0MgewogCiAgICAgY2xhc3MgRXZhbEV4ZWN1dGFibGUgOiBwdWJsaWMgU2NyaXB0 RXhlY3V0YWJsZSB7CiAgICAgcHVibGljOgotICAgICAgICBFdmFsRXhlY3V0YWJsZShjb25zdCBT b3VyY2VDb2RlJiBzb3VyY2UpCi0gICAgICAgICAgICA6IFNjcmlwdEV4ZWN1dGFibGUoc291cmNl KQorICAgICAgICBFdmFsRXhlY3V0YWJsZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNv ZGUmIHNvdXJjZSkKKyAgICAgICAgICAgIDogU2NyaXB0RXhlY3V0YWJsZShleGVjLCBzb3VyY2Up CiAgICAgICAgICAgICAsIG1fZXZhbENvZGVCbG9jaygwKQogICAgICAgICB7CiAgICAgICAgIH0K QEAgLTE1Nyw3ICsxNzgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgSlNPYmplY3QqIGNv bXBpbGUoRXhlY1N0YXRlKiwgU2NvcGVDaGFpbk5vZGUqKTsKIAogICAgICAgICBFeGNlcHRpb25J bmZvKiByZXBhcnNlRXhjZXB0aW9uSW5mbyhKU0dsb2JhbERhdGEqLCBTY29wZUNoYWluTm9kZSos IENvZGVCbG9jayopOwotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxFdmFsRXhlY3V0YWJsZT4g Y3JlYXRlKGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkgeyByZXR1cm4gYWRvcHRSZWYobmV3IEV2 YWxFeGVjdXRhYmxlKHNvdXJjZSkpOyB9CisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV2YWxF eGVjdXRhYmxlPiBjcmVhdGUoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBTb3VyY2VDb2RlJiBzb3Vy Y2UpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBFdmFsRXhlY3V0YWJsZShleGVjLCBzb3VyY2UpKTsg fQogCiAgICAgcHJpdmF0ZToKICAgICAgICAgRXZhbENvZGVCbG9jayogbV9ldmFsQ29kZUJsb2Nr OwpAQCAtMTc4LDggKzE5OSw4IEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgY2xhc3MgUHJvZ3Jh bUV4ZWN1dGFibGUgOiBwdWJsaWMgU2NyaXB0RXhlY3V0YWJsZSB7CiAgICAgcHVibGljOgotICAg ICAgICBQcm9ncmFtRXhlY3V0YWJsZShjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UpCi0gICAgICAg ICAgICA6IFNjcmlwdEV4ZWN1dGFibGUoc291cmNlKQorICAgICAgICBQcm9ncmFtRXhlY3V0YWJs ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSkKKyAgICAgICAgICAg IDogU2NyaXB0RXhlY3V0YWJsZShleGVjLCBzb3VyY2UpCiAgICAgICAgICAgICAsIG1fcHJvZ3Jh bUNvZGVCbG9jaygwKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTIyMSw5ICsyNDIsMTQgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgY2xhc3MgRnVuY3Rpb25FeGVjdXRhYmxlIDogcHVibGljIFNj cmlwdEV4ZWN1dGFibGUgewogICAgICAgICBmcmllbmQgY2xhc3MgSklUOwogICAgIHB1YmxpYzoK LSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RnVuY3Rpb25FeGVjdXRhYmxlPiBjcmVhdGUoY29u c3QgSWRlbnRpZmllciYgbmFtZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBib29sIGZvcmNl VXNlc0FyZ3VtZW50cywgRnVuY3Rpb25QYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBpbnQgZmlyc3RM aW5lLCBpbnQgbGFzdExpbmUpCisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZ1bmN0aW9uRXhl Y3V0YWJsZT4gY3JlYXRlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgbmFtZSwg Y29uc3QgU291cmNlQ29kZSYgc291cmNlLCBib29sIGZvcmNlVXNlc0FyZ3VtZW50cywgRnVuY3Rp b25QYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBpbnQgZmlyc3RMaW5lLCBpbnQgbGFzdExpbmUpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRnVuY3Rpb25FeGVjdXRh YmxlKGV4ZWMsIG5hbWUsIHNvdXJjZSwgZm9yY2VVc2VzQXJndW1lbnRzLCBwYXJhbWV0ZXJzLCBm aXJzdExpbmUsIGxhc3RMaW5lKSk7CisgICAgICAgIH0KKworICAgICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxGdW5jdGlvbkV4ZWN1dGFibGU+IGNyZWF0ZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEs IGNvbnN0IElkZW50aWZpZXImIG5hbWUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgYm9vbCBm b3JjZVVzZXNBcmd1bWVudHMsIEZ1bmN0aW9uUGFyYW1ldGVycyogcGFyYW1ldGVycywgaW50IGZp cnN0TGluZSwgaW50IGxhc3RMaW5lKQogICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gYWRv cHRSZWYobmV3IEZ1bmN0aW9uRXhlY3V0YWJsZShuYW1lLCBzb3VyY2UsIGZvcmNlVXNlc0FyZ3Vt ZW50cywgcGFyYW1ldGVycywgZmlyc3RMaW5lLCBsYXN0TGluZSkpOworICAgICAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBGdW5jdGlvbkV4ZWN1dGFibGUoZ2xvYmFsRGF0YSwgbmFtZSwgc291 cmNlLCBmb3JjZVVzZXNBcmd1bWVudHMsIHBhcmFtZXRlcnMsIGZpcnN0TGluZSwgbGFzdExpbmUp KTsKICAgICAgICAgfQogCiAgICAgICAgIH5GdW5jdGlvbkV4ZWN1dGFibGUoKTsKQEAgLTI2Myw4 ICsyODksMjAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZ1 bmN0aW9uRXhlY3V0YWJsZT4gZnJvbUdsb2JhbENvZGUoY29uc3QgSWRlbnRpZmllciYsIEV4ZWNT dGF0ZSosIERlYnVnZ2VyKiwgY29uc3QgU291cmNlQ29kZSYsIGludCogZXJyTGluZSA9IDAsIFVT dHJpbmcqIGVyck1zZyA9IDApOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgRnVuY3Rpb25FeGVj dXRhYmxlKGNvbnN0IElkZW50aWZpZXImIG5hbWUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwg Ym9vbCBmb3JjZVVzZXNBcmd1bWVudHMsIEZ1bmN0aW9uUGFyYW1ldGVycyogcGFyYW1ldGVycywg aW50IGZpcnN0TGluZSwgaW50IGxhc3RMaW5lKQotICAgICAgICAgICAgOiBTY3JpcHRFeGVjdXRh YmxlKHNvdXJjZSkKKyAgICAgICAgRnVuY3Rpb25FeGVjdXRhYmxlKEpTR2xvYmFsRGF0YSogZ2xv YmFsRGF0YSwgY29uc3QgSWRlbnRpZmllciYgbmFtZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNl LCBib29sIGZvcmNlVXNlc0FyZ3VtZW50cywgRnVuY3Rpb25QYXJhbWV0ZXJzKiBwYXJhbWV0ZXJz LCBpbnQgZmlyc3RMaW5lLCBpbnQgbGFzdExpbmUpCisgICAgICAgICAgICA6IFNjcmlwdEV4ZWN1 dGFibGUoZ2xvYmFsRGF0YSwgc291cmNlKQorICAgICAgICAgICAgLCBtX2ZvcmNlVXNlc0FyZ3Vt ZW50cyhmb3JjZVVzZXNBcmd1bWVudHMpCisgICAgICAgICAgICAsIG1fcGFyYW1ldGVycyhwYXJh bWV0ZXJzKQorICAgICAgICAgICAgLCBtX2NvZGVCbG9jaygwKQorICAgICAgICAgICAgLCBtX25h bWUobmFtZSkKKyAgICAgICAgICAgICwgbV9udW1WYXJpYWJsZXMoMCkKKyAgICAgICAgeworICAg ICAgICAgICAgbV9maXJzdExpbmUgPSBmaXJzdExpbmU7CisgICAgICAgICAgICBtX2xhc3RMaW5l ID0gbGFzdExpbmU7CisgICAgICAgIH0KKworICAgICAgICBGdW5jdGlvbkV4ZWN1dGFibGUoRXhl Y1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBuYW1lLCBjb25zdCBTb3VyY2VDb2RlJiBz b3VyY2UsIGJvb2wgZm9yY2VVc2VzQXJndW1lbnRzLCBGdW5jdGlvblBhcmFtZXRlcnMqIHBhcmFt ZXRlcnMsIGludCBmaXJzdExpbmUsIGludCBsYXN0TGluZSkKKyAgICAgICAgICAgIDogU2NyaXB0 RXhlY3V0YWJsZShleGVjLCBzb3VyY2UpCiAgICAgICAgICAgICAsIG1fZm9yY2VVc2VzQXJndW1l bnRzKGZvcmNlVXNlc0FyZ3VtZW50cykKICAgICAgICAgICAgICwgbV9wYXJhbWV0ZXJzKHBhcmFt ZXRlcnMpCiAgICAgICAgICAgICAsIG1fY29kZUJsb2NrKDApCmRpZmYgLS1naXQgYS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0RnVuY3Rpb25zLmNwcCBiL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3RGdW5jdGlvbnMuY3BwCmluZGV4IGIxMTA3MGYuLjVk ZWQzNzAgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3RG dW5jdGlvbnMuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3RG dW5jdGlvbnMuY3BwCkBAIC0yODYsNyArMjg2LDcgQEAgSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGds b2JhbEZ1bmNFdmFsKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIGZ1bmN0aW9uLCBKU1ZhbHUK ICAgICBpZiAoSlNWYWx1ZSBwYXJzZWRPYmplY3QgPSBwcmVwYXJzZXIudHJ5TGl0ZXJhbFBhcnNl KCkpCiAgICAgICAgIHJldHVybiBwYXJzZWRPYmplY3Q7CiAKLSAgICBFdmFsRXhlY3V0YWJsZSBl dmFsKG1ha2VTb3VyY2UocykpOworICAgIEV2YWxFeGVjdXRhYmxlIGV2YWwoZXhlYywgbWFrZVNv dXJjZShzKSk7CiAgICAgSlNPYmplY3QqIGVycm9yID0gZXZhbC5jb21waWxlKGV4ZWMsIHN0YXRp Y19jYXN0PEpTR2xvYmFsT2JqZWN0Kj4odW53cmFwcGVkT2JqZWN0KS0+Z2xvYmFsU2NvcGVDaGFp bigpLm5vZGUoKSk7CiAgICAgaWYgKGVycm9yKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihl eGVjLCBlcnJvcik7