68375 2011-09-19 11:47:48 -0700 Rename NewSpace to MarkedSpace 2011-09-19 11:54:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 469579 0 oliver 2011-09-19 11:47:48 -0700 Rename NewSpace to MarkedSpace 469580 1 107897 oliver 2011-09-19 11:49:01 -0700 Created attachment 107897 Patch 469582 2 oliver 2011-09-19 11:54:06 -0700 Committed r95450: <http://trac.webkit.org/changeset/95450> 107897 2011-09-19 11:49:01 -0700 2011-09-19 11:52:04 -0700 Patch bug-68375-20110919114900.patch text/plain 18721 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0NDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGFj NTY3YzYyMTNiOWM4YTVlYjgyY2U4ZmQxMzZmNWYxZmEzMTM3ODYuLjkwOWIzYzRmNDExMzU5NmEz ODZlMWExMjdlNjRmYmY1MWIxNDRkMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDUzIEBACiAyMDExLTA5LTE5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAK KyAgICAgICAgUmVuYW1lIE5ld1NwYWNlIHRvIE1hcmtlZFNwYWNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM3NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBOZXdTcGFjZSB0byBhIG1vcmUg YWNjdXJhdGUgbmFtZSwgYW5kIHVwZGF0ZSBhbGwgdXNlcy4KKyAgICAgICAgVGhpcyBwYXRjaCBk b2Vzbid0IHJlbmFtZSB0aGUgZmlsZXMgdGhlbXNlbHZlcyBhcyB0aGF0IHdpbGwKKyAgICAgICAg anVzdCBtYWtlIHRoZSBwYXRjaCBhcHBlYXIgYmlnZ2VyIHRoYW4gaXQgaXMuCisKKyAgICAgICAg KiBKYXZhU2NyaXB0Q29yZS5leHA6CisgICAgICAgICogSmF2YVNjcmlwdENvcmUudmNwcm9qL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmRlZjoKKyAgICAgICAgKiBoZWFwL0hlYXAuY3Bw OgorICAgICAgICAoSlNDOjpDb3VudEZ1bmN0b3I6OlRha2VJZkVtcHR5OjpUYWtlSWZFbXB0eSk6 CisgICAgICAgIChKU0M6OkNvdW50RnVuY3Rvcjo6VGFrZUlmRW1wdHk6Om9wZXJhdG9yKCkpOgor ICAgICAgICAoSlNDOjpIZWFwOjpIZWFwKToKKyAgICAgICAgKEpTQzo6SGVhcDo6cmVwb3J0RXh0 cmFNZW1vcnlDb3N0U2xvd0Nhc2UpOgorICAgICAgICAoSlNDOjpIZWFwOjp0cnlBbGxvY2F0ZSk6 CisgICAgICAgIChKU0M6OkhlYXA6OmFsbG9jYXRlU2xvd0Nhc2UpOgorICAgICAgICAoSlNDOjpI ZWFwOjpjb2xsZWN0KToKKyAgICAgICAgKEpTQzo6SGVhcDo6Y2Fub25pY2FsaXplQmxvY2tzKToK KyAgICAgICAgKEpTQzo6SGVhcDo6cmVzZXRBbGxvY2F0b3IpOgorICAgICAgICAoSlNDOjpIZWFw Ojppc1ZhbGlkQWxsb2NhdGlvbik6CisgICAgICAgIChKU0M6OkhlYXA6OnNocmluayk6CisgICAg ICAgICogaGVhcC9IZWFwLmg6CisgICAgICAgIChKU0M6OkhlYXA6Om1hcmtlZFNwYWNlKToKKyAg ICAgICAgKEpTQzo6SGVhcDo6c2l6ZUNsYXNzRm9yKToKKyAgICAgICAgKEpTQzo6SGVhcDo6YWxs b2NhdGUpOgorICAgICAgICAqIGhlYXAvTmV3U3BhY2UuY3BwOgorICAgICAgICAoSlNDOjpNYXJr ZWRTcGFjZTo6TWFya2VkU3BhY2UpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6YWRkQmxv Y2spOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6cmVtb3ZlQmxvY2spOgorICAgICAgICAo SlNDOjpNYXJrZWRTcGFjZTo6cmVzZXRBbGxvY2F0b3IpOgorICAgICAgICAoSlNDOjpNYXJrZWRT cGFjZTo6Y2Fub25pY2FsaXplQmxvY2tzKToKKyAgICAgICAgKiBoZWFwL05ld1NwYWNlLmg6Cisg ICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjp3YXRlck1hcmspOgorICAgICAgICAoSlNDOjpNYXJr ZWRTcGFjZTo6aGlnaFdhdGVyTWFyayk6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpzZXRI aWdoV2F0ZXJNYXJrKToKKyAgICAgICAgKEpTQzo6TWFya2VkU3BhY2U6OnNpemVDbGFzc0Zvcik6 CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjphbGxvY2F0ZSk6CisgICAgICAgIChKU0M6Ok1h cmtlZFNwYWNlOjpmb3JFYWNoQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6U2l6 ZUNsYXNzOjpTaXplQ2xhc3MpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6U2l6ZUNsYXNz OjpyZXNldEFsbG9jYXRvcik6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpTaXplQ2xhc3M6 OmNhbm9uaWNhbGl6ZUJsb2NrKToKKyAgICAgICAgKiBqaXQvSklUSW5saW5lTWV0aG9kcy5oOgor ICAgICAgICAoSlNDOjpKSVQ6OmVtaXRBbGxvY2F0ZUJhc2ljSlNPYmplY3QpOgorCisyMDExLTA5 LTE5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIGRp cmVjdCBwcm9wZXJ0eSBzbG90IHBvaW50ZXJzIGZyb20gdGhlIGluc3RydWN0aW9uIHN0cmVhbQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjgzNzMKIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKaW5kZXggMTg2OTExOWJjODNk NTFiYmI5OTExN2UxOWMzMWE5OWZlZDMxMGJlYy4uY2EwMjdlZTJiOTM5NzJiNzEyZjEwMTE2M2I5 ODg3MTQ3OTVlZjE1OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLmV4cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhw CkBAIC0yMzMsNyArMjMzLDcgQEAgX19aTjNKU0MzNWNyZWF0ZUludGVycnVwdGVkRXhlY3V0aW9u RXhjZXB0aW9uRVBOU18xMkpTR2xvYmFsRGF0YUUKIF9fWk4zSlNDNDFjb25zdHJ1Y3RGdW5jdGlv blNraXBwaW5nRXZhbEVuYWJsZWRDaGVja0VQTlNfOUV4ZWNTdGF0ZUVQTlNfMTRKU0dsb2JhbE9i amVjdEVSS05TXzdBcmdMaXN0RVJLTlNfMTBJZGVudGlmaWVyRVJLTlNfN1VTdHJpbmdFaQogX19a TjNKU0M0SGVhcDExb2JqZWN0Q291bnRFdgogX19aTjNKU0M0SGVhcDE2YWN0aXZpdHlDYWxsYmFj a0V2Ci1fX1pOM0pTQzRIZWFwMTZhbGxvY2F0ZVNsb3dDYXNlRVJOU184TmV3U3BhY2U5U2l6ZUNs YXNzRQorX19aTjNKU0M0SGVhcDE2YWxsb2NhdGVTbG93Q2FzZUVSTlNfMTFNYXJrZWRTcGFjZTlT aXplQ2xhc3NFCiBfX1pOM0pTQzRIZWFwMTZvYmplY3RUeXBlQ291bnRzRXYKIF9fWk4zSlNDNEhl YXAxN2NvbGxlY3RBbGxHYXJiYWdlRXYKIF9fWk4zSlNDNEhlYXAxN2dsb2JhbE9iamVjdENvdW50 RXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3By b2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5k ZWYKaW5kZXggNGZhMzMzNTdjMjIwYmRhODEzOWYxMTM0ZDVkMWViZDk2M2QzZTU4Mi4uODVhMTU3 ZmZhMjRiZTZjOTRkY2I3NWQzYmU4YjkxNTljMzhhNDg0NiAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5kZWYKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZj cHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5kZWYKQEAgLTU5LDkgKzU5LDkgQEAg RVhQT1JUUwogICAgID9hZGRQcm9wZXJ0eVdpdGhvdXRUcmFuc2l0aW9uQFN0cnVjdHVyZUBKU0NA QFFBRUlBQVZKU0dsb2JhbERhdGFAMkBBQlZJZGVudGlmaWVyQDJASVBBVkpTQ2VsbEAyQEBaCiAg ICAgP2FkZFNsb3dDYXNlQElkZW50aWZpZXJASlNDQEBDQT9BVj8kUGFzc1JlZlB0ckBWU3RyaW5n SW1wbEBXVEZAQEBXVEZAQFBBVkV4ZWNTdGF0ZUAyQFBBVlN0cmluZ0ltcGxANEBAWgogICAgID9h ZGRTdGF0aWNHbG9iYWxzQEpTR2xvYmFsT2JqZWN0QEpTQ0BASUFFWFBBVUdsb2JhbFByb3BlcnR5 SW5mb0AxMkBIQFoKLSAgICA/YWxsb2NhdGVASGVhcEBKU0NAQFFBRVBBWEFBVVNpemVDbGFzc0BO ZXdTcGFjZUAyQEBaCisgICAgP2FsbG9jYXRlQEhlYXBASlNDQEBRQUVQQVhBQVVTaXplQ2xhc3NA TWFya2VkU3BhY2VAMkBAWgogICAgID9hbGxvY2F0ZVByb3BlcnR5U3RvcmFnZUBKU09iamVjdEBK U0NAQFFBRVhBQVZKU0dsb2JhbERhdGFAMkBJSUBaCi0gICAgP2FsbG9jYXRlU2xvd0Nhc2VASGVh cEBKU0NAQEFBRVBBWEFBVVNpemVDbGFzc0BOZXdTcGFjZUAyQEBaCisgICAgP2FsbG9jYXRlU2xv d0Nhc2VASGVhcEBKU0NAQEFBRVBBWEFBVVNpemVDbGFzc0BNYXJrZWRTcGFjZUAyQEBaCiAgICAg P2FwcGVuZEBTdHJpbmdCdWlsZGVyQFdURkBAUUFFWFBCRElAWgogICAgID9hcHBlbmRAU3RyaW5n QnVpbGRlckBXVEZAQFFBRVhQQl9XSUBaCiAgICAgP2FzY2lpQFVTdHJpbmdASlNDQEBRQkU/QVZD U3RyaW5nQFdURkBAWFoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXAuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKaW5kZXggNGQyYWEw YzFjZTJhOGRlMmFjZTdlMzAxYzQwOGYxZTI2YWVkM2U5NS4uOGE5NWNiNzJlOWY4ZjhjMzEyOTU0 ZDNiMzU3NWFiNjNjMWM5MWZiZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKQEAg LTE3OSwxNyArMTc5LDE3IEBAIGNsYXNzIFRha2VJZkVtcHR5IHsKIHB1YmxpYzoKICAgICB0eXBl ZGVmIE1hcmtlZEJsb2NrKiBSZXR1cm5UeXBlOwogCi0gICAgVGFrZUlmRW1wdHkoTmV3U3BhY2Uq KTsKKyAgICBUYWtlSWZFbXB0eShNYXJrZWRTcGFjZSopOwogICAgIHZvaWQgb3BlcmF0b3IoKShN YXJrZWRCbG9jayopOwogICAgIFJldHVyblR5cGUgcmV0dXJuVmFsdWUoKTsKIAogcHJpdmF0ZToK LSAgICBOZXdTcGFjZSogbV9uZXdTcGFjZTsKKyAgICBNYXJrZWRTcGFjZSogbV9tYXJrZWRTcGFj ZTsKICAgICBEb3VibHlMaW5rZWRMaXN0PE1hcmtlZEJsb2NrPiBtX2VtcHRpZXM7CiB9OwogCi1p bmxpbmUgVGFrZUlmRW1wdHk6OlRha2VJZkVtcHR5KE5ld1NwYWNlKiBuZXdTcGFjZSkKLSAgICA6 IG1fbmV3U3BhY2UobmV3U3BhY2UpCitpbmxpbmUgVGFrZUlmRW1wdHk6OlRha2VJZkVtcHR5KE1h cmtlZFNwYWNlKiBuZXdTcGFjZSkKKyAgICA6IG1fbWFya2VkU3BhY2UobmV3U3BhY2UpCiB7CiB9 CiAKQEAgLTE5OCw3ICsxOTgsNyBAQCBpbmxpbmUgdm9pZCBUYWtlSWZFbXB0eTo6b3BlcmF0b3Io KShNYXJrZWRCbG9jayogYmxvY2spCiAgICAgaWYgKCFibG9jay0+aXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBtX25ld1NwYWNlLT5yZW1vdmVCbG9jayhibG9jayk7CisgICAgbV9t YXJrZWRTcGFjZS0+cmVtb3ZlQmxvY2soYmxvY2spOwogICAgIG1fZW1wdGllcy5hcHBlbmQoYmxv Y2spOwogfQogCkBAIC0yNDksNyArMjQ5LDcgQEAgSGVhcDo6SGVhcChKU0dsb2JhbERhdGEqIGds b2JhbERhdGEsIEhlYXBTaXplIGhlYXBTaXplKQogICAgIDogbV9oZWFwU2l6ZShoZWFwU2l6ZSkK ICAgICAsIG1fbWluQnl0ZXNQZXJDeWNsZShoZWFwU2l6ZUZvckhpbnQoaGVhcFNpemUpKQogICAg ICwgbV9vcGVyYXRpb25JblByb2dyZXNzKE5vT3BlcmF0aW9uKQotICAgICwgbV9uZXdTcGFjZSh0 aGlzKQorICAgICwgbV9tYXJrZWRTcGFjZSh0aGlzKQogICAgICwgbV9leHRyYUNvc3QoMCkKICAg ICAsIG1fbWFya0xpc3RTZXQoMCkKICAgICAsIG1fYWN0aXZpdHlDYWxsYmFjayhEZWZhdWx0R0NB Y3Rpdml0eUNhbGxiYWNrOjpjcmVhdGUodGhpcykpCkBAIC0yNTksNyArMjU5LDcgQEAgSGVhcDo6 SGVhcChKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIEhlYXBTaXplIGhlYXBTaXplKQogICAgICwg bV9pc1NhZmVUb0NvbGxlY3QoZmFsc2UpCiAgICAgLCBtX2dsb2JhbERhdGEoZ2xvYmFsRGF0YSkK IHsKLSAgICBtX25ld1NwYWNlLnNldEhpZ2hXYXRlck1hcmsobV9taW5CeXRlc1BlckN5Y2xlKTsK KyAgICBtX21hcmtlZFNwYWNlLnNldEhpZ2hXYXRlck1hcmsobV9taW5CeXRlc1BlckN5Y2xlKTsK ICAgICAoKm1fYWN0aXZpdHlDYWxsYmFjaykoKTsKICNpZiBFTkFCTEUoTEFaWV9CTE9DS19GUkVF SU5HKQogICAgIG1fbnVtYmVyT2ZGcmVlQmxvY2tzID0gMDsKQEAgLTQwMSwyMCArNDAxLDIwIEBA IHZvaWQgSGVhcDo6cmVwb3J0RXh0cmFNZW1vcnlDb3N0U2xvd0Nhc2Uoc2l6ZV90IGNvc3QpCiAg ICAgLy8gaWYgYSBsYXJnZSB2YWx1ZSBzdXJ2aXZlcyBvbmUgZ2FyYmFnZSBjb2xsZWN0aW9uLCB0 aGVyZSBpcyBub3QgbXVjaCBwb2ludCB0bwogICAgIC8vIGNvbGxlY3RpbmcgbW9yZSBmcmVxdWVu dGx5IGFzIGxvbmcgYXMgaXQgc3RheXMgYWxpdmUuCiAKLSAgICBpZiAobV9leHRyYUNvc3QgPiBt YXhFeHRyYUNvc3QgJiYgbV9leHRyYUNvc3QgPiBtX25ld1NwYWNlLmhpZ2hXYXRlck1hcmsoKSAv IDIpCisgICAgaWYgKG1fZXh0cmFDb3N0ID4gbWF4RXh0cmFDb3N0ICYmIG1fZXh0cmFDb3N0ID4g bV9tYXJrZWRTcGFjZS5oaWdoV2F0ZXJNYXJrKCkgLyAyKQogICAgICAgICBjb2xsZWN0QWxsR2Fy YmFnZSgpOwogICAgIG1fZXh0cmFDb3N0ICs9IGNvc3Q7CiB9CiAKLWlubGluZSB2b2lkKiBIZWFw Ojp0cnlBbGxvY2F0ZShOZXdTcGFjZTo6U2l6ZUNsYXNzJiBzaXplQ2xhc3MpCitpbmxpbmUgdm9p ZCogSGVhcDo6dHJ5QWxsb2NhdGUoTWFya2VkU3BhY2U6OlNpemVDbGFzcyYgc2l6ZUNsYXNzKQog ewogICAgIG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IEFsbG9jYXRpb247Ci0gICAgdm9pZCogcmVz dWx0ID0gbV9uZXdTcGFjZS5hbGxvY2F0ZShzaXplQ2xhc3MpOworICAgIHZvaWQqIHJlc3VsdCA9 IG1fbWFya2VkU3BhY2UuYWxsb2NhdGUoc2l6ZUNsYXNzKTsKICAgICBtX29wZXJhdGlvbkluUHJv Z3Jlc3MgPSBOb09wZXJhdGlvbjsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi12b2lkKiBIZWFw OjphbGxvY2F0ZVNsb3dDYXNlKE5ld1NwYWNlOjpTaXplQ2xhc3MmIHNpemVDbGFzcykKK3ZvaWQq IEhlYXA6OmFsbG9jYXRlU2xvd0Nhc2UoTWFya2VkU3BhY2U6OlNpemVDbGFzcyYgc2l6ZUNsYXNz KQogewogI2lmIENPTExFQ1RfT05fRVZFUllfQUxMT0NBVElPTgogICAgIGNvbGxlY3RBbGxHYXJi YWdlKCk7CkBAIC00MjgsMTQgKzQyOCwxNCBAQCB2b2lkKiBIZWFwOjphbGxvY2F0ZVNsb3dDYXNl KE5ld1NwYWNlOjpTaXplQ2xhc3MmIHNpemVDbGFzcykKIAogICAgIEFsbG9jYXRpb25FZmZvcnQg YWxsb2NhdGlvbkVmZm9ydDsKICAgICAKLSAgICBpZiAobV9uZXdTcGFjZS53YXRlck1hcmsoKSA8 IG1fbmV3U3BhY2UuaGlnaFdhdGVyTWFyaygpIHx8ICFtX2lzU2FmZVRvQ29sbGVjdCkKKyAgICBp ZiAobV9tYXJrZWRTcGFjZS53YXRlck1hcmsoKSA8IG1fbWFya2VkU3BhY2UuaGlnaFdhdGVyTWFy aygpIHx8ICFtX2lzU2FmZVRvQ29sbGVjdCkKICAgICAgICAgYWxsb2NhdGlvbkVmZm9ydCA9IEFs bG9jYXRpb25NdXN0U3VjY2VlZDsKICAgICBlbHNlCiAgICAgICAgIGFsbG9jYXRpb25FZmZvcnQg PSBBbGxvY2F0aW9uQ2FuRmFpbDsKICAgICAKICAgICBNYXJrZWRCbG9jayogYmxvY2sgPSBhbGxv Y2F0ZUJsb2NrKHNpemVDbGFzcy5jZWxsU2l6ZSwgYWxsb2NhdGlvbkVmZm9ydCk7CiAgICAgaWYg KGJsb2NrKSB7Ci0gICAgICAgIG1fbmV3U3BhY2UuYWRkQmxvY2soc2l6ZUNsYXNzLCBibG9jayk7 CisgICAgICAgIG1fbWFya2VkU3BhY2UuYWRkQmxvY2soc2l6ZUNsYXNzLCBibG9jayk7CiAgICAg ICAgIHZvaWQqIHJlc3VsdCA9IHRyeUFsbG9jYXRlKHNpemVDbGFzcyk7CiAgICAgICAgIEFTU0VS VChyZXN1bHQpOwogICAgICAgICByZXR1cm4gcmVzdWx0OwpAQCAtNDQ4LDkgKzQ0OCw5IEBAIHZv aWQqIEhlYXA6OmFsbG9jYXRlU2xvd0Nhc2UoTmV3U3BhY2U6OlNpemVDbGFzcyYgc2l6ZUNsYXNz KQogICAgIGlmIChyZXN1bHQpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgCi0gICAgQVNT RVJUKG1fbmV3U3BhY2Uud2F0ZXJNYXJrKCkgPCBtX25ld1NwYWNlLmhpZ2hXYXRlck1hcmsoKSk7 CisgICAgQVNTRVJUKG1fbWFya2VkU3BhY2Uud2F0ZXJNYXJrKCkgPCBtX21hcmtlZFNwYWNlLmhp Z2hXYXRlck1hcmsoKSk7CiAgICAgCi0gICAgbV9uZXdTcGFjZS5hZGRCbG9jayhzaXplQ2xhc3Ms IGFsbG9jYXRlQmxvY2soc2l6ZUNsYXNzLmNlbGxTaXplLCBBbGxvY2F0aW9uTXVzdFN1Y2NlZWQp KTsKKyAgICBtX21hcmtlZFNwYWNlLmFkZEJsb2NrKHNpemVDbGFzcywgYWxsb2NhdGVCbG9jayhz aXplQ2xhc3MuY2VsbFNpemUsIEFsbG9jYXRpb25NdXN0U3VjY2VlZCkpOwogICAgIAogICAgIHJl c3VsdCA9IHRyeUFsbG9jYXRlKHNpemVDbGFzcyk7CiAgICAgQVNTRVJUKHJlc3VsdCk7CkBAIC02 OTEsNyArNjkxLDcgQEAgdm9pZCBIZWFwOjpjb2xsZWN0KFN3ZWVwVG9nZ2xlIHN3ZWVwVG9nZ2xl KQogICAgIC8vIHByb3BvcnRpb24gaXMgYSBiaXQgYXJiaXRyYXJ5LiBBIDJYIG11bHRpcGxpZXIg Z2l2ZXMgYSAxOjEgKGhlYXAgc2l6ZSA6CiAgICAgLy8gbmV3IGJ5dGVzIGFsbG9jYXRlZCkgcHJv cG9ydGlvbiwgYW5kIHNlZW1zIHRvIHdvcmsgd2VsbCBpbiBiZW5jaG1hcmtzLgogICAgIHNpemVf dCBwcm9wb3J0aW9uYWxCeXRlcyA9IDIgKiBzaXplKCk7Ci0gICAgbV9uZXdTcGFjZS5zZXRIaWdo V2F0ZXJNYXJrKG1heChwcm9wb3J0aW9uYWxCeXRlcywgbV9taW5CeXRlc1BlckN5Y2xlKSk7Cisg ICAgbV9tYXJrZWRTcGFjZS5zZXRIaWdoV2F0ZXJNYXJrKG1heChwcm9wb3J0aW9uYWxCeXRlcywg bV9taW5CeXRlc1BlckN5Y2xlKSk7CiAgICAgSkFWQVNDUklQVENPUkVfR0NfRU5EKCk7CiAKICAg ICAoKm1fYWN0aXZpdHlDYWxsYmFjaykoKTsKQEAgLTY5OSwxMyArNjk5LDEzIEBAIHZvaWQgSGVh cDo6Y29sbGVjdChTd2VlcFRvZ2dsZSBzd2VlcFRvZ2dsZSkKIAogdm9pZCBIZWFwOjpjYW5vbmlj YWxpemVCbG9ja3MoKQogewotICAgIG1fbmV3U3BhY2UuY2Fub25pY2FsaXplQmxvY2tzKCk7Cisg ICAgbV9tYXJrZWRTcGFjZS5jYW5vbmljYWxpemVCbG9ja3MoKTsKIH0KIAogdm9pZCBIZWFwOjpy ZXNldEFsbG9jYXRvcigpCiB7CiAgICAgbV9leHRyYUNvc3QgPSAwOwotICAgIG1fbmV3U3BhY2Uu cmVzZXRBbGxvY2F0b3IoKTsKKyAgICBtX21hcmtlZFNwYWNlLnJlc2V0QWxsb2NhdG9yKCk7CiB9 CiAKIHZvaWQgSGVhcDo6c2V0QWN0aXZpdHlDYWxsYmFjayhQYXNzT3duUHRyPEdDQWN0aXZpdHlD YWxsYmFjaz4gYWN0aXZpdHlDYWxsYmFjaykKQEAgLTcyMyw3ICs3MjMsNyBAQCBib29sIEhlYXA6 OmlzVmFsaWRBbGxvY2F0aW9uKHNpemVfdCBieXRlcykKICAgICBpZiAoIWlzVmFsaWRUaHJlYWRT dGF0ZShtX2dsb2JhbERhdGEpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoYnl0 ZXMgPiBOZXdTcGFjZTo6bWF4Q2VsbFNpemUpCisgICAgaWYgKGJ5dGVzID4gTWFya2VkU3BhY2U6 Om1heENlbGxTaXplKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAobV9vcGVyYXRp b25JblByb2dyZXNzICE9IE5vT3BlcmF0aW9uKQpAQCAtNzg1LDcgKzc4NSw3IEBAIHZvaWQgSGVh cDo6ZnJlZUJsb2NrcyhNYXJrZWRCbG9jayogaGVhZCkKIHZvaWQgSGVhcDo6c2hyaW5rKCkKIHsK ICAgICAvLyBXZSByZWNvcmQgYSB0ZW1wb3JhcnkgbGlzdCBvZiBlbXB0aWVzIHRvIGF2b2lkIG1v ZGlmeWluZyBtX2Jsb2NrcyB3aGlsZSBpdGVyYXRpbmcgaXQuCi0gICAgVGFrZUlmRW1wdHkgdGFr ZUlmRW1wdHkoJm1fbmV3U3BhY2UpOworICAgIFRha2VJZkVtcHR5IHRha2VJZkVtcHR5KCZtX21h cmtlZFNwYWNlKTsKICAgICBmcmVlQmxvY2tzKGZvckVhY2hCbG9jayh0YWtlSWZFbXB0eSkpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgKaW5kZXggNTk0Yjc2NzQ4MzVjODZiNGZjMzE5 Y2MxOTM5MDU2MjNiY2FiMzRlZi4uZWUwYzFmMGI4NzAyOTM3MzU4ZjNiMjQ2NjI1MWVhMGU5Mjhi NDI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaApAQCAtNzYsNyArNzYsNyBAQCBuYW1l c3BhY2UgSlNDIHsKICAgICAgICAgdm9pZCBkZXN0cm95KCk7IC8vIEpTR2xvYmFsRGF0YSBtdXN0 IGNhbGwgZGVzdHJveSgpIGJlZm9yZSB+SGVhcCgpLgogCiAgICAgICAgIEpTR2xvYmFsRGF0YSog Z2xvYmFsRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZ2xvYmFsRGF0YTsgfQotICAgICAgICBOZXdT cGFjZSYgbWFya2VkU3BhY2UoKSB7IHJldHVybiBtX25ld1NwYWNlOyB9CisgICAgICAgIE1hcmtl ZFNwYWNlJiBtYXJrZWRTcGFjZSgpIHsgcmV0dXJuIG1fbWFya2VkU3BhY2U7IH0KICAgICAgICAg TWFjaGluZVRocmVhZHMmIG1hY2hpbmVUaHJlYWRzKCkgeyByZXR1cm4gbV9tYWNoaW5lVGhyZWFk czsgfQogCiAgICAgICAgIEdDQWN0aXZpdHlDYWxsYmFjayogYWN0aXZpdHlDYWxsYmFjaygpOwpA QCAtODYsOCArODYsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgaW5saW5lIGJvb2wgaXNC dXN5KCk7CiAKICAgICAgICAgdm9pZCogYWxsb2NhdGUoc2l6ZV90KTsKLSAgICAgICAgTmV3U3Bh Y2U6OlNpemVDbGFzcyYgc2l6ZUNsYXNzRm9yKHNpemVfdCk7Ci0gICAgICAgIHZvaWQqIGFsbG9j YXRlKE5ld1NwYWNlOjpTaXplQ2xhc3MmKTsKKyAgICAgICAgTWFya2VkU3BhY2U6OlNpemVDbGFz cyYgc2l6ZUNsYXNzRm9yKHNpemVfdCk7CisgICAgICAgIHZvaWQqIGFsbG9jYXRlKE1hcmtlZFNw YWNlOjpTaXplQ2xhc3MmKTsKICAgICAgICAgdm9pZCBub3RpZnlJc1NhZmVUb0NvbGxlY3QoKSB7 IG1faXNTYWZlVG9Db2xsZWN0ID0gdHJ1ZTsgfQogICAgICAgICB2b2lkIGNvbGxlY3RBbGxHYXJi YWdlKCk7CiAKQEAgLTE1MSw4ICsxNTEsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9p ZCBtYXJrVGVtcFNvcnRWZWN0b3JzKEhlYXBSb290VmlzaXRvciYpOwogICAgICAgICB2b2lkIGhh cnZlc3RXZWFrUmVmZXJlbmNlcygpOwogCi0gICAgICAgIHZvaWQqIHRyeUFsbG9jYXRlKE5ld1Nw YWNlOjpTaXplQ2xhc3MmKTsKLSAgICAgICAgdm9pZCogYWxsb2NhdGVTbG93Q2FzZShOZXdTcGFj ZTo6U2l6ZUNsYXNzJik7CisgICAgICAgIHZvaWQqIHRyeUFsbG9jYXRlKE1hcmtlZFNwYWNlOjpT aXplQ2xhc3MmKTsKKyAgICAgICAgdm9pZCogYWxsb2NhdGVTbG93Q2FzZShNYXJrZWRTcGFjZTo6 U2l6ZUNsYXNzJik7CiAgICAgICAgIAogICAgICAgICBlbnVtIFN3ZWVwVG9nZ2xlIHsgRG9Ob3RT d2VlcCwgRG9Td2VlcCB9OwogICAgICAgICB2b2lkIGNvbGxlY3QoU3dlZXBUb2dnbGUpOwpAQCAt MTc1LDcgKzE3NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBjb25zdCBzaXplX3QgbV9t aW5CeXRlc1BlckN5Y2xlOwogICAgICAgICAKICAgICAgICAgT3BlcmF0aW9uSW5Qcm9ncmVzcyBt X29wZXJhdGlvbkluUHJvZ3Jlc3M7Ci0gICAgICAgIE5ld1NwYWNlIG1fbmV3U3BhY2U7CisgICAg ICAgIE1hcmtlZFNwYWNlIG1fbWFya2VkU3BhY2U7CiAgICAgICAgIE1hcmtlZEJsb2NrU2V0IG1f YmxvY2tzOwogCiAjaWYgRU5BQkxFKExBWllfQkxPQ0tfRlJFRUlORykKQEAgLTMzNiwxMiArMzM2 LDEyIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICByZXR1cm4gZm9yRWFjaEJsb2NrKGZ1bmN0 b3IpOwogICAgIH0KICAgICAKLSAgICBpbmxpbmUgTmV3U3BhY2U6OlNpemVDbGFzcyYgSGVhcDo6 c2l6ZUNsYXNzRm9yKHNpemVfdCBieXRlcykKKyAgICBpbmxpbmUgTWFya2VkU3BhY2U6OlNpemVD bGFzcyYgSGVhcDo6c2l6ZUNsYXNzRm9yKHNpemVfdCBieXRlcykKICAgICB7Ci0gICAgICAgIHJl dHVybiBtX25ld1NwYWNlLnNpemVDbGFzc0ZvcihieXRlcyk7CisgICAgICAgIHJldHVybiBtX21h cmtlZFNwYWNlLnNpemVDbGFzc0ZvcihieXRlcyk7CiAgICAgfQogICAgIAotICAgIGlubGluZSB2 b2lkKiBIZWFwOjphbGxvY2F0ZShOZXdTcGFjZTo6U2l6ZUNsYXNzJiBzaXplQ2xhc3MpCisgICAg aW5saW5lIHZvaWQqIEhlYXA6OmFsbG9jYXRlKE1hcmtlZFNwYWNlOjpTaXplQ2xhc3MmIHNpemVD bGFzcykKICAgICB7CiAgICAgICAgIC8vIFRoaXMgaXMgYSBsaWdodC13ZWlnaHQgZmFzdCBwYXRo IHRvIGNvdmVyIHRoZSBtb3N0IGNvbW1vbiBjYXNlLgogICAgICAgICBNYXJrZWRCbG9jazo6RnJl ZUNlbGwqIGZpcnN0RnJlZUNlbGwgPSBzaXplQ2xhc3MuZmlyc3RGcmVlQ2VsbDsKQEAgLTM1NSw3 ICszNTUsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBpbmxpbmUgdm9pZCogSGVhcDo6YWxsb2Nh dGUoc2l6ZV90IGJ5dGVzKQogICAgIHsKICAgICAgICAgQVNTRVJUKGlzVmFsaWRBbGxvY2F0aW9u KGJ5dGVzKSk7Ci0gICAgICAgIE5ld1NwYWNlOjpTaXplQ2xhc3MmIHNpemVDbGFzcyA9IHNpemVD bGFzc0ZvcihieXRlcyk7CisgICAgICAgIE1hcmtlZFNwYWNlOjpTaXplQ2xhc3MmIHNpemVDbGFz cyA9IHNpemVDbGFzc0ZvcihieXRlcyk7CiAgICAgICAgIHJldHVybiBhbGxvY2F0ZShzaXplQ2xh c3MpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTmV3 U3BhY2UuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTmV3U3BhY2UuY3BwCmluZGV4 IDJmMTZmOTk2YzJiZmZiMDY1ZjRmNjhkN2Y3YmE2YjMzZjIxNzQxOWUuLmJiZjM4MzM4OWRkMWYx MDhjNzY5ZDBiYjJhYmVmZmYxZDBhNTI1MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL05ld1NwYWNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9O ZXdTcGFjZS5jcHAKQEAgLTMxLDcgKzMxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKIGNsYXNzIFN0 cnVjdHVyZTsKIAotTmV3U3BhY2U6Ok5ld1NwYWNlKEhlYXAqIGhlYXApCitNYXJrZWRTcGFjZTo6 TWFya2VkU3BhY2UoSGVhcCogaGVhcCkKICAgICA6IG1fd2F0ZXJNYXJrKDApCiAgICAgLCBtX2hp Z2hXYXRlck1hcmsoMCkKICAgICAsIG1faGVhcChoZWFwKQpAQCAtNDMsNyArNDMsNyBAQCBOZXdT cGFjZTo6TmV3U3BhY2UoSGVhcCogaGVhcCkKICAgICAgICAgc2l6ZUNsYXNzRm9yKGNlbGxTaXpl KS5jZWxsU2l6ZSA9IGNlbGxTaXplOwogfQogCi12b2lkIE5ld1NwYWNlOjphZGRCbG9jayhTaXpl Q2xhc3MmIHNpemVDbGFzcywgTWFya2VkQmxvY2sqIGJsb2NrKQordm9pZCBNYXJrZWRTcGFjZTo6 YWRkQmxvY2soU2l6ZUNsYXNzJiBzaXplQ2xhc3MsIE1hcmtlZEJsb2NrKiBibG9jaykKIHsKICAg ICBibG9jay0+c2V0SW5OZXdTcGFjZSh0cnVlKTsKICAgICBzaXplQ2xhc3MubmV4dEJsb2NrID0g YmxvY2s7CkBAIC01NCw3ICs1NCw3IEBAIHZvaWQgTmV3U3BhY2U6OmFkZEJsb2NrKFNpemVDbGFz cyYgc2l6ZUNsYXNzLCBNYXJrZWRCbG9jayogYmxvY2spCiAgICAgc2l6ZUNsYXNzLmZpcnN0RnJl ZUNlbGwgPSBibG9jay0+Ymxlc3NOZXdCbG9ja0ZvckZhc3RQYXRoKCk7CiB9CiAKLXZvaWQgTmV3 U3BhY2U6OnJlbW92ZUJsb2NrKE1hcmtlZEJsb2NrKiBibG9jaykKK3ZvaWQgTWFya2VkU3BhY2U6 OnJlbW92ZUJsb2NrKE1hcmtlZEJsb2NrKiBibG9jaykKIHsKICAgICBibG9jay0+c2V0SW5OZXdT cGFjZShmYWxzZSk7CiAgICAgU2l6ZUNsYXNzJiBzaXplQ2xhc3MgPSBzaXplQ2xhc3NGb3IoYmxv Y2stPmNlbGxTaXplKCkpOwpAQCAtNjMsNyArNjMsNyBAQCB2b2lkIE5ld1NwYWNlOjpyZW1vdmVC bG9jayhNYXJrZWRCbG9jayogYmxvY2spCiAgICAgc2l6ZUNsYXNzLmJsb2NrTGlzdC5yZW1vdmUo YmxvY2spOwogfQogCi12b2lkIE5ld1NwYWNlOjpyZXNldEFsbG9jYXRvcigpCit2b2lkIE1hcmtl ZFNwYWNlOjpyZXNldEFsbG9jYXRvcigpCiB7CiAgICAgbV93YXRlck1hcmsgPSAwOwogCkBAIC03 NCw3ICs3NCw3IEBAIHZvaWQgTmV3U3BhY2U6OnJlc2V0QWxsb2NhdG9yKCkKICAgICAgICAgc2l6 ZUNsYXNzRm9yKGNlbGxTaXplKS5yZXNldEFsbG9jYXRvcigpOwogfQogCi12b2lkIE5ld1NwYWNl OjpjYW5vbmljYWxpemVCbG9ja3MoKQordm9pZCBNYXJrZWRTcGFjZTo6Y2Fub25pY2FsaXplQmxv Y2tzKCkKIHsKICAgICBmb3IgKHNpemVfdCBjZWxsU2l6ZSA9IHByZWNpc2VTdGVwOyBjZWxsU2l6 ZSA8IHByZWNpc2VDdXRvZmY7IGNlbGxTaXplICs9IHByZWNpc2VTdGVwKQogICAgICAgICBzaXpl Q2xhc3NGb3IoY2VsbFNpemUpLmNhbm9uaWNhbGl6ZUJsb2NrKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9OZXdTcGFjZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvTmV3U3BhY2UuaAppbmRleCA5MGNmODgxMTJjYWZjODhlNjk3NjY5YmU5NTM2MmNlNmMz ZDVjOThiLi41YWViYmM3M2I5N2Y5Y2Q0OTg0ZDE2MDdkODgzNDZhZDc1OTgxMzY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9OZXdTcGFjZS5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL05ld1NwYWNlLmgKQEAgLTMyLDcgKzMyLDcgQEAKICNpbmNsdWRl IDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLSNkZWZpbmUg QVNTRVJUX0NMQVNTX0ZJVFNfSU5fQ0VMTChjbGFzcykgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKGNs YXNzKSA8IE5ld1NwYWNlOjptYXhDZWxsU2l6ZSwgY2xhc3NfZml0c19pbl9jZWxsKQorI2RlZmlu ZSBBU1NFUlRfQ0xBU1NfRklUU19JTl9DRUxMKGNsYXNzKSBDT01QSUxFX0FTU0VSVChzaXplb2Yo Y2xhc3MpIDwgTWFya2VkU3BhY2U6Om1heENlbGxTaXplLCBjbGFzc19maXRzX2luX2NlbGwpCiAK IG5hbWVzcGFjZSBKU0MgewogCkBAIC00Miw4ICs0Miw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAg IGNsYXNzIFdlYWtHQ0hhbmRsZTsKICAgICBjbGFzcyBTbG90VmlzaXRvcjsKIAotICAgIGNsYXNz IE5ld1NwYWNlIHsKLSAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTmV3U3BhY2UpOworICAg IGNsYXNzIE1hcmtlZFNwYWNlIHsKKyAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTWFya2Vk U3BhY2UpOwogICAgIHB1YmxpYzoKICAgICAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBtYXhDZWxs U2l6ZSA9IDEwMjQ7CiAKQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg ICAgICBzaXplX3QgY2VsbFNpemU7CiAgICAgICAgIH07CiAKLSAgICAgICAgTmV3U3BhY2UoSGVh cCopOworICAgICAgICBNYXJrZWRTcGFjZShIZWFwKik7CiAKICAgICAgICAgU2l6ZUNsYXNzJiBz aXplQ2xhc3NGb3Ioc2l6ZV90KTsKICAgICAgICAgdm9pZCogYWxsb2NhdGUoU2l6ZUNsYXNzJik7 CkBAIC05NywyMiArOTcsMjIgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIEhlYXAqIG1faGVh cDsKICAgICB9OwogCi0gICAgaW5saW5lIHNpemVfdCBOZXdTcGFjZTo6d2F0ZXJNYXJrKCkKKyAg ICBpbmxpbmUgc2l6ZV90IE1hcmtlZFNwYWNlOjp3YXRlck1hcmsoKQogICAgIHsKICAgICAgICAg cmV0dXJuIG1fd2F0ZXJNYXJrOwogICAgIH0KIAotICAgIGlubGluZSBzaXplX3QgTmV3U3BhY2U6 OmhpZ2hXYXRlck1hcmsoKQorICAgIGlubGluZSBzaXplX3QgTWFya2VkU3BhY2U6OmhpZ2hXYXRl ck1hcmsoKQogICAgIHsKICAgICAgICAgcmV0dXJuIG1faGlnaFdhdGVyTWFyazsKICAgICB9CiAK LSAgICBpbmxpbmUgdm9pZCBOZXdTcGFjZTo6c2V0SGlnaFdhdGVyTWFyayhzaXplX3QgaGlnaFdh dGVyTWFyaykKKyAgICBpbmxpbmUgdm9pZCBNYXJrZWRTcGFjZTo6c2V0SGlnaFdhdGVyTWFyayhz aXplX3QgaGlnaFdhdGVyTWFyaykKICAgICB7CiAgICAgICAgIG1faGlnaFdhdGVyTWFyayA9IGhp Z2hXYXRlck1hcms7CiAgICAgfQogCi0gICAgaW5saW5lIE5ld1NwYWNlOjpTaXplQ2xhc3MmIE5l d1NwYWNlOjpzaXplQ2xhc3NGb3Ioc2l6ZV90IGJ5dGVzKQorICAgIGlubGluZSBNYXJrZWRTcGFj ZTo6U2l6ZUNsYXNzJiBNYXJrZWRTcGFjZTo6c2l6ZUNsYXNzRm9yKHNpemVfdCBieXRlcykKICAg ICB7CiAgICAgICAgIEFTU0VSVChieXRlcyAmJiBieXRlcyA8IG1heENlbGxTaXplKTsKICAgICAg ICAgaWYgKGJ5dGVzIDw9IG1heGltdW1QcmVjaXNlQWxsb2NhdGlvblNpemUpCkBAIC0xMjAsNyAr MTIwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJldHVybiBtX2ltcHJlY2lzZVNpemVD bGFzc2VzWyhieXRlcyAtIDEpIC8gaW1wcmVjaXNlU3RlcF07CiAgICAgfQogCi0gICAgaW5saW5l IHZvaWQqIE5ld1NwYWNlOjphbGxvY2F0ZShTaXplQ2xhc3MmIHNpemVDbGFzcykKKyAgICBpbmxp bmUgdm9pZCogTWFya2VkU3BhY2U6OmFsbG9jYXRlKFNpemVDbGFzcyYgc2l6ZUNsYXNzKQogICAg IHsKICAgICAgICAgTWFya2VkQmxvY2s6OkZyZWVDZWxsKiBmaXJzdEZyZWVDZWxsID0gc2l6ZUNs YXNzLmZpcnN0RnJlZUNlbGw7CiAgICAgICAgIGlmICghZmlyc3RGcmVlQ2VsbCkgewpAQCAtMTYx LDcgKzE2MSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICByZXR1cm4gZmlyc3RGcmVlQ2Vs bDsKICAgICB9CiAgICAgCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIEZ1bmN0b3I+IGlubGluZSB0 eXBlbmFtZSBGdW5jdG9yOjpSZXR1cm5UeXBlIE5ld1NwYWNlOjpmb3JFYWNoQmxvY2soRnVuY3Rv ciYgZnVuY3RvcikKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgRnVuY3Rvcj4gaW5saW5lIHR5cGVu YW1lIEZ1bmN0b3I6OlJldHVyblR5cGUgTWFya2VkU3BhY2U6OmZvckVhY2hCbG9jayhGdW5jdG9y JiBmdW5jdG9yKQogICAgIHsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwcmVjaXNl Q291bnQ7ICsraSkgewogICAgICAgICAgICAgU2l6ZUNsYXNzJiBzaXplQ2xhc3MgPSBtX3ByZWNp c2VTaXplQ2xhc3Nlc1tpXTsKQEAgLTE4NCwxMyArMTg0LDEzIEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICByZXR1cm4gZnVuY3Rvci5yZXR1cm5WYWx1ZSgpOwogICAgIH0KIAotICAgIHRlbXBs YXRlIDx0eXBlbmFtZSBGdW5jdG9yPiBpbmxpbmUgdHlwZW5hbWUgRnVuY3Rvcjo6UmV0dXJuVHlw ZSBOZXdTcGFjZTo6Zm9yRWFjaEJsb2NrKCkKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgRnVuY3Rv cj4gaW5saW5lIHR5cGVuYW1lIEZ1bmN0b3I6OlJldHVyblR5cGUgTWFya2VkU3BhY2U6OmZvckVh Y2hCbG9jaygpCiAgICAgewogICAgICAgICBGdW5jdG9yIGZ1bmN0b3I7CiAgICAgICAgIHJldHVy biBmb3JFYWNoQmxvY2soZnVuY3Rvcik7CiAgICAgfQogCi0gICAgaW5saW5lIE5ld1NwYWNlOjpT aXplQ2xhc3M6OlNpemVDbGFzcygpCisgICAgaW5saW5lIE1hcmtlZFNwYWNlOjpTaXplQ2xhc3M6 OlNpemVDbGFzcygpCiAgICAgICAgIDogZmlyc3RGcmVlQ2VsbCgwKQogICAgICAgICAsIGN1cnJl bnRCbG9jaygwKQogICAgICAgICAsIG5leHRCbG9jaygwKQpAQCAtMTk4LDEyICsxOTgsMTIgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgewogICAgIH0KIAotICAgIGlubGluZSB2b2lkIE5ld1NwYWNl OjpTaXplQ2xhc3M6OnJlc2V0QWxsb2NhdG9yKCkKKyAgICBpbmxpbmUgdm9pZCBNYXJrZWRTcGFj ZTo6U2l6ZUNsYXNzOjpyZXNldEFsbG9jYXRvcigpCiAgICAgewogICAgICAgICBuZXh0QmxvY2sg PSBibG9ja0xpc3QuaGVhZCgpOwogICAgIH0KICAgICAKLSAgICBpbmxpbmUgdm9pZCBOZXdTcGFj ZTo6U2l6ZUNsYXNzOjpjYW5vbmljYWxpemVCbG9jaygpCisgICAgaW5saW5lIHZvaWQgTWFya2Vk U3BhY2U6OlNpemVDbGFzczo6Y2Fub25pY2FsaXplQmxvY2soKQogICAgIHsKICAgICAgICAgaWYg KGN1cnJlbnRCbG9jaykgewogICAgICAgICAgICAgY3VycmVudEJsb2NrLT5jYW5vbmljYWxpemVC bG9jayhmaXJzdEZyZWVDZWxsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUSW5saW5lTWV0aG9kcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxp bmVNZXRob2RzLmgKaW5kZXggNDI4MDlhM2E1Mzc0YjgzZDk5MTYzZWNiMTdhMTg1OGM0YzdjOGQ5 Mi4uOTVlNTE0MzBmZjExMzY5NjdkMDViMzc0MzAyZjY4NTMzZTE0ZGQzMiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVNZXRob2RzLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVNZXRob2RzLmgKQEAgLTM4Niw3ICszODYsNyBA QCBBTFdBWVNfSU5MSU5FIGJvb2wgSklUOjppc09wZXJhbmRDb25zdGFudEltbWVkaWF0ZUNoYXIo dW5zaWduZWQgc3JjKQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2xhc3NUeXBlLCB0eXBlbmFtZSBT dHJ1Y3R1cmVUeXBlPiBpbmxpbmUgdm9pZCBKSVQ6OmVtaXRBbGxvY2F0ZUJhc2ljSlNPYmplY3Qo U3RydWN0dXJlVHlwZSBzdHJ1Y3R1cmUsIHZvaWQqIHZ0YWJsZSwgUmVnaXN0ZXJJRCByZXN1bHQs IFJlZ2lzdGVySUQgc3RvcmFnZVB0cikKIHsKLSAgICBOZXdTcGFjZTo6U2l6ZUNsYXNzKiBzaXpl Q2xhc3MgPSAmbV9nbG9iYWxEYXRhLT5oZWFwLnNpemVDbGFzc0ZvcihzaXplb2YoQ2xhc3NUeXBl KSk7CisgICAgTWFya2VkU3BhY2U6OlNpemVDbGFzcyogc2l6ZUNsYXNzID0gJm1fZ2xvYmFsRGF0 YS0+aGVhcC5zaXplQ2xhc3NGb3Ioc2l6ZW9mKENsYXNzVHlwZSkpOwogICAgIGxvYWRQdHIoJnNp emVDbGFzcy0+Zmlyc3RGcmVlQ2VsbCwgcmVzdWx0KTsKICAgICBhZGRTbG93Q2FzZShicmFuY2hU ZXN0UHRyKFplcm8sIHJlc3VsdCkpOwogCg==