232074 2021-10-21 04:49:43 -0700 Move Style::Resolver::State out of header 2021-10-21 07:30:17 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto graouts webkit-bug-importer oldest_to_newest 1807086 0 koivisto 2021-10-21 04:49:43 -0700 It is an internal detail. 1807090 1 442010 koivisto 2021-10-21 04:55:30 -0700 Created attachment 442010 Patch 1807117 2 442010 graouts 2021-10-21 06:46:19 -0700 Comment on attachment 442010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442010&action=review > Source/WebCore/style/StyleResolver.h:149 > + Get rid of those stray spaces. 1807118 3 442015 koivisto 2021-10-21 06:56:54 -0700 Created attachment 442015 Patch 1807119 4 koivisto 2021-10-21 06:57:47 -0700 > Get rid of those stray spaces. Did better and removed the unneeded friend too. 1807128 5 ews-feeder 2021-10-21 07:29:21 -0700 Committed r284604 (243333@main): <https://commits.webkit.org/243333@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442015. 1807129 6 webkit-bug-importer 2021-10-21 07:30:17 -0700 <rdar://problem/84506807> 442010 2021-10-21 04:55:30 -0700 2021-10-21 06:56:51 -0700 Patch bug-232074-20211021145528.patch text/plain 10133 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uNjY2NTFhMzEzYjA1ZGUyZGMwMjI2ZjhjZWFkYzJl ZjhhNDBmMTkzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIxLTEwLTIxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFN0eWxlOjpSZXNv bHZlcjo6U3RhdGUgb3V0IG9mIGhlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSXQgaXMgYW4gaW1wbGVtZW50YXRpb24gZGV0YWlsLgorCisgICAg ICAgICogc3R5bGUvUGFnZVJ1bGVDb2xsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OlBhZ2VSdWxlQ29sbGVjdG9yOjppc0xlZnRQYWdlIGNvbnN0KToKKyAgICAgICAgKiBzdHls ZS9QYWdlUnVsZUNvbGxlY3Rvci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlBhZ2VSdWxl Q29sbGVjdG9yOjpQYWdlUnVsZUNvbGxlY3Rvcik6CisKKyAgICAgICAgUHJvdmlkZSBqdXN0IHRo ZSByb290IHRleHQgZGlyZWN0aW9uIGluc3RlYWQgb2YgdGhlIFN0YXRlLgorCisgICAgICAgICog c3R5bGUvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2 ZXI6OlN0YXRlOjpTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0 YXRlOjplbGVtZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6 U3RhdGU6OnNldFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3Rh dGU6OnN0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3Rh dGU6OnRha2VTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0YXRl OjpzZXRQYXJlbnRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0 YXRlOjpwYXJlbnRTdHlsZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2 ZXI6OlN0YXRlOjpyb290RWxlbWVudFN0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlOjpSZXNvbHZlcjo6U3RhdGU6OnVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0YXRlOjpzZXRVc2VyQWdlbnRBcHBl YXJhbmNlU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpzdHlsZUZv clBhZ2UpOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6OlN0eWxlOjpSZXNvbHZlcjo6U3RhdGU6OlN0YXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3RhdGU6OmVsZW1lbnQgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6c3R5bGUgY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6dGFrZVN0 eWxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3RhdGU6 OnBhcmVudFN0eWxlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpS ZXNvbHZlcjo6U3RhdGU6OnJvb3RFbGVtZW50U3R5bGUgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6dXNlckFnZW50QXBwZWFyYW5jZVN0 eWxlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6 U3RhdGU6OnNldFVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSk6IERlbGV0ZWQuCisKIDIwMjEtMTAt MjAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPiBhbmQgRGFuYSBFc3RyYSA8ZGVzdHJh QGFwcGxlLmNvbT4KIAogICAgICAgICBtYWNPUyBrZXktZHJpdmVuIHNtb290aCBzY3JvbGxpbmcg ZG9lcyBub3Qgc3RvcCB3aGVuIGZvY3VzIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1BhZ2VSdWxlQ29sbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Bh Z2VSdWxlQ29sbGVjdG9yLmNwcAppbmRleCBiZGRkMzMwNWUwYWI5YTc3NDZlYzc4MzIyNTRhYzdm MjJjMWU4ZDVjLi4yMjk5ZjhjNjM3OWI1MDk0OTJhMWExZmZhNTIzMDZhMWFhMTY4OWI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9QYWdlUnVsZUNvbGxlY3Rvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvUGFnZVJ1bGVDb2xsZWN0b3IuY3BwCkBAIC00MywxMCArNDMs NyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY29tcGFyZVBhZ2VSdWxlcyhjb25zdCBTdHlsZVJ1bGVQ YWdlKiByMSwgY29uc3QgU3R5bGVSdWxlUGFnZQogCiBib29sIFBhZ2VSdWxlQ29sbGVjdG9yOjpp c0xlZnRQYWdlKGludCBwYWdlSW5kZXgpIGNvbnN0CiB7Ci0gICAgYm9vbCBpc0ZpcnN0UGFnZUxl ZnQgPSBmYWxzZTsKLSAgICBpZiAoIW1fc3RhdGUucm9vdEVsZW1lbnRTdHlsZSgpLT5pc0xlZnRU b1JpZ2h0RGlyZWN0aW9uKCkpCi0gICAgICAgIGlzRmlyc3RQYWdlTGVmdCA9IHRydWU7Ci0KKyAg ICBib29sIGlzRmlyc3RQYWdlTGVmdCA9IG1fcm9vdERpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9u OjpSVEw7CiAgICAgcmV0dXJuIChwYWdlSW5kZXggKyAoaXNGaXJzdFBhZ2VMZWZ0ID8gMSA6IDAp KSAlIDI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1BhZ2VSdWxlQ29s bGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9QYWdlUnVsZUNvbGxlY3Rvci5oCmluZGV4 IGMzZGE4OGVmZDBhMjJhODg3MTY2MzZmZDQ2NDA4ZWU2YjhjNWFkNWEuLjhhMGUyYTEyNGI2YWU0 Y2RiNDJlYmEzZThkMGQxYjVmOTc3YThhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1BhZ2VSdWxlQ29sbGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUGFnZVJ1 bGVDb2xsZWN0b3IuaApAQCAtMjEsNyArMjEsNiBAQAogCiAjcHJhZ21hIG9uY2UKIAotI2luY2x1 ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJTdHlsZVNjb3BlUnVsZVNldHMuaCIKICNp bmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCkBAIC0zMyw5ICszMiwxMCBAQCBuYW1lc3BhY2UgU3R5 bGUgewogCiBjbGFzcyBQYWdlUnVsZUNvbGxlY3RvciB7CiBwdWJsaWM6Ci0gICAgUGFnZVJ1bGVD b2xsZWN0b3IoUmVzb2x2ZXI6OlN0YXRlJiBzdGF0ZSwgU2NvcGVSdWxlU2V0cyYgcnVsZVNldHMp Ci0gICAgICAgIDogbV9zdGF0ZShzdGF0ZSkKLSAgICAgICAgLCBtX3J1bGVTZXRzKHJ1bGVTZXRz KSB7IH0KKyAgICBQYWdlUnVsZUNvbGxlY3RvcihTY29wZVJ1bGVTZXRzJiBydWxlU2V0cywgVGV4 dERpcmVjdGlvbiByb290RGlyZWN0aW9uKQorICAgICAgICA6IG1fcnVsZVNldHMocnVsZVNldHMp CisgICAgICAgICwgbV9yb290RGlyZWN0aW9uKHJvb3REaXJlY3Rpb24pCisgICAgeyB9CiAKICAg ICB2b2lkIG1hdGNoQWxsUGFnZVJ1bGVzKGludCBwYWdlSW5kZXgpOwogICAgIGNvbnN0IE1hdGNo UmVzdWx0JiBtYXRjaFJlc3VsdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzdWx0OyB9CkBAIC00OSw4 ICs0OSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtYXRjaFBhZ2VSdWxlcyhSdWxlU2V0KiBydWxl cywgYm9vbCBpc0xlZnRQYWdlLCBib29sIGlzRmlyc3RQYWdlLCBjb25zdCBTdHJpbmcmIHBhZ2VO YW1lKTsKICAgICB2b2lkIG1hdGNoUGFnZVJ1bGVzRm9yTGlzdChWZWN0b3I8U3R5bGVSdWxlUGFn ZSo+JiBtYXRjaGVkUnVsZXMsIGNvbnN0IFZlY3RvcjxTdHlsZVJ1bGVQYWdlKj4mIHJ1bGVzLCBi b29sIGlzTGVmdFBhZ2UsIGJvb2wgaXNGaXJzdFBhZ2UsIGNvbnN0IFN0cmluZyYgcGFnZU5hbWUp OwogCi0gICAgY29uc3QgUmVzb2x2ZXI6OlN0YXRlJiBtX3N0YXRlOwogICAgIFNjb3BlUnVsZVNl dHMmIG1fcnVsZVNldHM7CisgICAgVGV4dERpcmVjdGlvbiBtX3Jvb3REaXJlY3Rpb247CiAKICAg ICBNYXRjaFJlc3VsdCBtX3Jlc3VsdDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2 ZXIuY3BwCmluZGV4IGM0ZGM4ZThhZDQ1MDRhODBmMTI1MjA2NWE3OGMzYzE1Yjg4YjYwNDAuLjNm ZWRlYzJiZmIxODU1MGFlNzZjNzQzNGU4NGI5NDFhYzY0MmFkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC04OCw2ICs4OCw1MiBAQCB1c2luZyBuYW1lc3BhY2Ug SFRNTE5hbWVzOwogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoUmVzb2x2ZXIpOwogCitj bGFzcyBSZXNvbHZlcjo6U3RhdGUgeworcHVibGljOgorICAgIFN0YXRlKCkgeyB9CisgICAgU3Rh dGUoY29uc3QgRWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxl LCBjb25zdCBSZW5kZXJTdHlsZSogZG9jdW1lbnRFbGVtZW50U3R5bGUgPSBudWxscHRyKQorICAg ICAgICA6IG1fZWxlbWVudCgmZWxlbWVudCkKKyAgICAgICAgLCBtX3BhcmVudFN0eWxlKHBhcmVu dFN0eWxlKQorICAgIHsKKyAgICAgICAgYm9vbCByZXNldFN0eWxlSW5oZXJpdGFuY2UgPSBoYXNT aGFkb3dSb290UGFyZW50KGVsZW1lbnQpICYmIGRvd25jYXN0PFNoYWRvd1Jvb3Q+KGVsZW1lbnQu cGFyZW50Tm9kZSgpKS0+cmVzZXRTdHlsZUluaGVyaXRhbmNlKCk7CisgICAgICAgIGlmIChyZXNl dFN0eWxlSW5oZXJpdGFuY2UpCisgICAgICAgICAgICBtX3BhcmVudFN0eWxlID0gbnVsbHB0cjsK KworICAgICAgICBhdXRvJiBkb2N1bWVudCA9IGVsZW1lbnQuZG9jdW1lbnQoKTsKKyAgICAgICAg YXV0byogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCk7CisgICAg ICAgIGlmICghZG9jdW1lbnRFbGVtZW50IHx8IGRvY3VtZW50RWxlbWVudCA9PSAmZWxlbWVudCkK KyAgICAgICAgICAgIG1fcm9vdEVsZW1lbnRTdHlsZSA9IGRvY3VtZW50LnJlbmRlclN0eWxlKCk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fcm9vdEVsZW1lbnRTdHlsZSA9IGRvY3VtZW50 RWxlbWVudFN0eWxlID8gZG9jdW1lbnRFbGVtZW50U3R5bGUgOiBkb2N1bWVudEVsZW1lbnQtPnJl bmRlclN0eWxlKCk7CisgICAgfQorCisgICAgY29uc3QgRWxlbWVudCogZWxlbWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1fZWxlbWVudDsgfQorCisgICAgdm9pZCBzZXRTdHlsZShzdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IHN0eWxlKSB7IG1fc3R5bGUgPSBXVEZNb3ZlKHN0eWxlKTsgfQorICAg IFJlbmRlclN0eWxlKiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUuZ2V0KCk7IH0KKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IHRha2VTdHlsZSgpIHsgcmV0dXJuIFdURk1v dmUobV9zdHlsZSk7IH0KKworICAgIHZvaWQgc2V0UGFyZW50U3R5bGUoc3RkOjp1bmlxdWVfcHRy PFJlbmRlclN0eWxlPiBwYXJlbnRTdHlsZSkKKyAgICB7CisgICAgICAgIG1fb3duZWRQYXJlbnRT dHlsZSA9IFdURk1vdmUocGFyZW50U3R5bGUpOworICAgICAgICBtX3BhcmVudFN0eWxlID0gbV9v d25lZFBhcmVudFN0eWxlLmdldCgpOworICAgIH0KKyAgICBjb25zdCBSZW5kZXJTdHlsZSogcGFy ZW50U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudFN0eWxlOyB9CisgICAgY29uc3QgUmVu ZGVyU3R5bGUqIHJvb3RFbGVtZW50U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RFbGVtZW50 U3R5bGU7IH0KKworICAgIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNlU3R5 bGUoKSBjb25zdCB7IHJldHVybiBtX3VzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZS5nZXQoKTsgfQor ICAgIHZvaWQgc2V0VXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKHN0ZDo6dW5pcXVlX3B0cjxSZW5k ZXJTdHlsZT4gc3R5bGUpIHsgbV91c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUgPSBXVEZNb3ZlKHN0 eWxlKTsgfQorCitwcml2YXRlOgorICAgIGNvbnN0IEVsZW1lbnQqIG1fZWxlbWVudCB7IG51bGxw dHIgfTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IG1fc3R5bGU7CisgICAgY29u c3QgUmVuZGVyU3R5bGUqIG1fcGFyZW50U3R5bGUgeyBudWxscHRyIH07CisgICAgc3RkOjp1bmlx dWVfcHRyPGNvbnN0IFJlbmRlclN0eWxlPiBtX293bmVkUGFyZW50U3R5bGU7CisgICAgY29uc3Qg UmVuZGVyU3R5bGUqIG1fcm9vdEVsZW1lbnRTdHlsZSB7IG51bGxwdHIgfTsKKworICAgIHN0ZDo6 dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gbV91c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGU7Cit9Owor CiBSZWY8UmVzb2x2ZXI+IFJlc29sdmVyOjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQogewog ICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFJlc29sdmVyKGRvY3VtZW50KSk7CkBAIC0xNTksMzMg KzIwNSw2IEBAIFJlc29sdmVyOjp+UmVzb2x2ZXIoKQogICAgIG1faXNEZWxldGVkID0gdHJ1ZTsK IH0KIAotUmVzb2x2ZXI6OlN0YXRlOjpTdGF0ZShjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25z dCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBkb2N1bWVudEVs ZW1lbnRTdHlsZSkKLSAgICA6IG1fZWxlbWVudCgmZWxlbWVudCkKLSAgICAsIG1fcGFyZW50U3R5 bGUocGFyZW50U3R5bGUpCi17Ci0gICAgYm9vbCByZXNldFN0eWxlSW5oZXJpdGFuY2UgPSBoYXNT aGFkb3dSb290UGFyZW50KGVsZW1lbnQpICYmIGRvd25jYXN0PFNoYWRvd1Jvb3Q+KGVsZW1lbnQu cGFyZW50Tm9kZSgpKS0+cmVzZXRTdHlsZUluaGVyaXRhbmNlKCk7Ci0gICAgaWYgKHJlc2V0U3R5 bGVJbmhlcml0YW5jZSkKLSAgICAgICAgbV9wYXJlbnRTdHlsZSA9IG51bGxwdHI7Ci0KLSAgICBh dXRvJiBkb2N1bWVudCA9IGVsZW1lbnQuZG9jdW1lbnQoKTsKLSAgICBhdXRvKiBkb2N1bWVudEVs ZW1lbnQgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKTsKLSAgICBpZiAoIWRvY3VtZW50RWxl bWVudCB8fCBkb2N1bWVudEVsZW1lbnQgPT0gJmVsZW1lbnQpCi0gICAgICAgIG1fcm9vdEVsZW1l bnRTdHlsZSA9IGRvY3VtZW50LnJlbmRlclN0eWxlKCk7Ci0gICAgZWxzZQotICAgICAgICBtX3Jv b3RFbGVtZW50U3R5bGUgPSBkb2N1bWVudEVsZW1lbnRTdHlsZSA/IGRvY3VtZW50RWxlbWVudFN0 eWxlIDogZG9jdW1lbnRFbGVtZW50LT5yZW5kZXJTdHlsZSgpOwotfQotCi1pbmxpbmUgdm9pZCBS ZXNvbHZlcjo6U3RhdGU6OnNldFN0eWxlKHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gc3R5 bGUpCi17Ci0gICAgbV9zdHlsZSA9IFdURk1vdmUoc3R5bGUpOwotfQotCi1pbmxpbmUgdm9pZCBS ZXNvbHZlcjo6U3RhdGU6OnNldFBhcmVudFN0eWxlKHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHls ZT4gcGFyZW50U3R5bGUpCi17Ci0gICAgbV9vd25lZFBhcmVudFN0eWxlID0gV1RGTW92ZShwYXJl bnRTdHlsZSk7Ci0gICAgbV9wYXJlbnRTdHlsZSA9IG1fb3duZWRQYXJlbnRTdHlsZS5nZXQoKTsK LX0KLQogc3RhdGljIGlubGluZSBib29sIGlzQXRTaGFkb3dCb3VuZGFyeShjb25zdCBFbGVtZW50 JiBlbGVtZW50KQogewogICAgIHJldHVybiBpczxTaGFkb3dSb290PihlbGVtZW50LnBhcmVudE5v ZGUoKSk7CkBAIC00MjAsNyArNDM5LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBS ZXNvbHZlcjo6c3R5bGVGb3JQYWdlKGludCBwYWdlSW5kZXgpCiAgICAgc3RhdGUuc2V0U3R5bGUo UmVuZGVyU3R5bGU6OmNyZWF0ZVB0cigpKTsKICAgICBzdGF0ZS5zdHlsZSgpLT5pbmhlcml0RnJv bSgqc3RhdGUucm9vdEVsZW1lbnRTdHlsZSgpKTsKIAotICAgIFBhZ2VSdWxlQ29sbGVjdG9yIGNv bGxlY3RvcihzdGF0ZSwgbV9ydWxlU2V0cyk7CisgICAgUGFnZVJ1bGVDb2xsZWN0b3IgY29sbGVj dG9yKG1fcnVsZVNldHMsIHN0YXRlLnJvb3RFbGVtZW50U3R5bGUoKS0+ZGlyZWN0aW9uKCkpOwog ICAgIGNvbGxlY3Rvci5tYXRjaEFsbFBhZ2VSdWxlcyhwYWdlSW5kZXgpOwogCiAgICAgYXV0byYg cmVzdWx0ID0gY29sbGVjdG9yLm1hdGNoUmVzdWx0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJl c29sdmVyLmgKaW5kZXggNzczNTIzOTUyZTczNTk5NjE5ZWY1NmI4YWI4MjU4YmU0NWNkYmEwMy4u N2Q5MGE3YmQxMmNmOTljZmJlYWU3YjgyZmFmMWRkZjY5N2JjY2QyNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlUmVzb2x2ZXIuaApAQCAtMTQ2LDM3ICsxNDYsMTAgQEAgcHVibGljOgogCiBwcml2 YXRlOgogICAgIGZyaWVuZCBjbGFzcyBQYWdlUnVsZUNvbGxlY3RvcjsKLQorICAgIAogICAgIFJl c29sdmVyKERvY3VtZW50Jik7CiAKLSAgICBjbGFzcyBTdGF0ZSB7Ci0gICAgcHVibGljOgotICAg ICAgICBTdGF0ZSgpIHsgfQotICAgICAgICBTdGF0ZShjb25zdCBFbGVtZW50JiwgY29uc3QgUmVu ZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogZG9jdW1lbnRFbGVtZW50 U3R5bGUgPSBudWxscHRyKTsKLQotICAgIHB1YmxpYzoKLSAgICAgICAgY29uc3QgRWxlbWVudCog ZWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudDsgfQotCi0gICAgICAgIHZvaWQgc2V0 U3R5bGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPik7Ci0gICAgICAgIFJlbmRlclN0eWxl KiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUuZ2V0KCk7IH0KLSAgICAgICAgc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiB0YWtlU3R5bGUoKSB7IHJldHVybiBXVEZNb3ZlKG1fc3R5 bGUpOyB9Ci0KLSAgICAgICAgdm9pZCBzZXRQYXJlbnRTdHlsZShzdGQ6OnVuaXF1ZV9wdHI8UmVu ZGVyU3R5bGU+KTsKLSAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlKCkgY29u c3QgeyByZXR1cm4gbV9wYXJlbnRTdHlsZTsgfQotICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSog cm9vdEVsZW1lbnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdEVsZW1lbnRTdHlsZTsgfQot Ci0gICAgICAgIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUoKSBj b25zdCB7IHJldHVybiBtX3VzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZS5nZXQoKTsgfQotICAgICAg ICB2b2lkIHNldFVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZShzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVy U3R5bGU+IHN0eWxlKSB7IG1fdXNlckFnZW50QXBwZWFyYW5jZVN0eWxlID0gV1RGTW92ZShzdHls ZSk7IH0KLQotICAgIHByaXZhdGU6Ci0gICAgICAgIGNvbnN0IEVsZW1lbnQqIG1fZWxlbWVudCB7 IG51bGxwdHIgfTsKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBtX3N0eWxl OwotICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogbV9wYXJlbnRTdHlsZSB7IG51bGxwdHIgfTsK LSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPGNvbnN0IFJlbmRlclN0eWxlPiBtX293bmVkUGFyZW50 U3R5bGU7Ci0gICAgICAgIGNvbnN0IFJlbmRlclN0eWxlKiBtX3Jvb3RFbGVtZW50U3R5bGUgeyBu dWxscHRyIH07Ci0KLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBtX3VzZXJB Z2VudEFwcGVhcmFuY2VTdHlsZTsKLSAgICB9OworICAgIGNsYXNzIFN0YXRlOwogCiAgICAgQnVp bGRlckNvbnRleHQgYnVpbGRlckNvbnRleHQoY29uc3QgU3RhdGUmKTsKIAo= 442015 2021-10-21 06:56:54 -0700 2021-10-21 07:29:22 -0700 Patch bug-232074-20211021165653.patch text/plain 10206 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uYWI0M2QxOGZjNzdkODgxNmY1MGEyMTllZjEwZDhh ZmJkYTAyNWRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIxLTEwLTIxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFN0eWxlOjpSZXNv bHZlcjo6U3RhdGUgb3V0IG9mIGhlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50b2luZSBR dWludC4KKworICAgICAgICBJdCBpcyBhbiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwuCisKKyAgICAg ICAgKiBzdHlsZS9QYWdlUnVsZUNvbGxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZTo6UGFnZVJ1bGVDb2xsZWN0b3I6OmlzTGVmdFBhZ2UgY29uc3QpOgorICAgICAgICAqIHN0eWxl L1BhZ2VSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UGFnZVJ1bGVD b2xsZWN0b3I6OlBhZ2VSdWxlQ29sbGVjdG9yKToKKworICAgICAgICBQcm92aWRlIGp1c3QgdGhl IHJvb3QgdGV4dCBkaXJlY3Rpb24gaW5zdGVhZCBvZiB0aGUgU3RhdGUuCisKKyAgICAgICAgKiBz dHlsZS9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZl cjo6U3RhdGU6OlN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3Rh dGU6OmVsZW1lbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpT dGF0ZTo6c2V0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0 ZTo6c3R5bGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0 ZTo6dGFrZVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3RhdGU6 OnNldFBhcmVudFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3Rh dGU6OnBhcmVudFN0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZl cjo6U3RhdGU6OnJvb3RFbGVtZW50U3R5bGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OlJlc29sdmVyOjpTdGF0ZTo6dXNlckFnZW50QXBwZWFyYW5jZVN0eWxlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6U3RhdGU6OnNldFVzZXJBZ2VudEFwcGVh cmFuY2VTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OnN0eWxlRm9y UGFnZSk6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlci5oOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6U3RhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6ZWxlbWVudCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0YXRlOjpzdHlsZSBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0YXRlOjp0YWtlU3R5 bGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpTdGF0ZTo6 cGFyZW50U3R5bGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJl c29sdmVyOjpTdGF0ZTo6cm9vdEVsZW1lbnRTdHlsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6OlN0YXRlOjp1c2VyQWdlbnRBcHBlYXJhbmNlU3R5 bGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpT dGF0ZTo6c2V0VXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKTogRGVsZXRlZC4KKwogMjAyMS0xMC0y MCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+IGFuZCBEYW5hIEVzdHJhIDxkZXN0cmFA YXBwbGUuY29tPgogCiAgICAgICAgIG1hY09TIGtleS1kcml2ZW4gc21vb3RoIHNjcm9sbGluZyBk b2VzIG5vdCBzdG9wIHdoZW4gZm9jdXMgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvc3R5bGUvUGFnZVJ1bGVDb2xsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUGFn ZVJ1bGVDb2xsZWN0b3IuY3BwCmluZGV4IGJkZGQzMzA1ZTBhYjlhNzc0NmVjNzgzMjI1NGFjN2Yy MmMxZThkNWMuLjIyOTlmOGM2Mzc5YjUwOTQ5MmExYTFmZmE1MjMwNmExYWExNjg5YjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1BhZ2VSdWxlQ29sbGVjdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9zdHlsZS9QYWdlUnVsZUNvbGxlY3Rvci5jcHAKQEAgLTQzLDEwICs0Myw3 IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjb21wYXJlUGFnZVJ1bGVzKGNvbnN0IFN0eWxlUnVsZVBh Z2UqIHIxLCBjb25zdCBTdHlsZVJ1bGVQYWdlCiAKIGJvb2wgUGFnZVJ1bGVDb2xsZWN0b3I6Omlz TGVmdFBhZ2UoaW50IHBhZ2VJbmRleCkgY29uc3QKIHsKLSAgICBib29sIGlzRmlyc3RQYWdlTGVm dCA9IGZhbHNlOwotICAgIGlmICghbV9zdGF0ZS5yb290RWxlbWVudFN0eWxlKCktPmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSkKLSAgICAgICAgaXNGaXJzdFBhZ2VMZWZ0ID0gdHJ1ZTsKLQorICAg IGJvb2wgaXNGaXJzdFBhZ2VMZWZ0ID0gbV9yb290RGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246 OlJUTDsKICAgICByZXR1cm4gKHBhZ2VJbmRleCArIChpc0ZpcnN0UGFnZUxlZnQgPyAxIDogMCkp ICUgMjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUGFnZVJ1bGVDb2xs ZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1BhZ2VSdWxlQ29sbGVjdG9yLmgKaW5kZXgg YzNkYTg4ZWZkMGEyMmE4ODcxNjYzNmZkNDY0MDhlZTZiOGM1YWQ1YS4uOGEwZTJhMTI0YjZhZTRj ZGI0MmViYTNlOGQwZDFiNWY5NzdhOGE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5 bGUvUGFnZVJ1bGVDb2xsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9QYWdlUnVs ZUNvbGxlY3Rvci5oCkBAIC0yMSw3ICsyMSw2IEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVk ZSAiU3R5bGVSZXNvbHZlci5oIgogI2luY2x1ZGUgIlN0eWxlU2NvcGVSdWxlU2V0cy5oIgogI2lu Y2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKQEAgLTMzLDkgKzMyLDEwIEBAIG5hbWVzcGFjZSBTdHls ZSB7CiAKIGNsYXNzIFBhZ2VSdWxlQ29sbGVjdG9yIHsKIHB1YmxpYzoKLSAgICBQYWdlUnVsZUNv bGxlY3RvcihSZXNvbHZlcjo6U3RhdGUmIHN0YXRlLCBTY29wZVJ1bGVTZXRzJiBydWxlU2V0cykK LSAgICAgICAgOiBtX3N0YXRlKHN0YXRlKQotICAgICAgICAsIG1fcnVsZVNldHMocnVsZVNldHMp IHsgfQorICAgIFBhZ2VSdWxlQ29sbGVjdG9yKFNjb3BlUnVsZVNldHMmIHJ1bGVTZXRzLCBUZXh0 RGlyZWN0aW9uIHJvb3REaXJlY3Rpb24pCisgICAgICAgIDogbV9ydWxlU2V0cyhydWxlU2V0cykK KyAgICAgICAgLCBtX3Jvb3REaXJlY3Rpb24ocm9vdERpcmVjdGlvbikKKyAgICB7IH0KIAogICAg IHZvaWQgbWF0Y2hBbGxQYWdlUnVsZXMoaW50IHBhZ2VJbmRleCk7CiAgICAgY29uc3QgTWF0Y2hS ZXN1bHQmIG1hdGNoUmVzdWx0KCkgY29uc3QgeyByZXR1cm4gbV9yZXN1bHQ7IH0KQEAgLTQ5LDgg KzQ5LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIG1hdGNoUGFnZVJ1bGVzKFJ1bGVTZXQqIHJ1bGVz LCBib29sIGlzTGVmdFBhZ2UsIGJvb2wgaXNGaXJzdFBhZ2UsIGNvbnN0IFN0cmluZyYgcGFnZU5h bWUpOwogICAgIHZvaWQgbWF0Y2hQYWdlUnVsZXNGb3JMaXN0KFZlY3RvcjxTdHlsZVJ1bGVQYWdl Kj4mIG1hdGNoZWRSdWxlcywgY29uc3QgVmVjdG9yPFN0eWxlUnVsZVBhZ2UqPiYgcnVsZXMsIGJv b2wgaXNMZWZ0UGFnZSwgYm9vbCBpc0ZpcnN0UGFnZSwgY29uc3QgU3RyaW5nJiBwYWdlTmFtZSk7 CiAKLSAgICBjb25zdCBSZXNvbHZlcjo6U3RhdGUmIG1fc3RhdGU7CiAgICAgU2NvcGVSdWxlU2V0 cyYgbV9ydWxlU2V0czsKKyAgICBUZXh0RGlyZWN0aW9uIG1fcm9vdERpcmVjdGlvbjsKIAogICAg IE1hdGNoUmVzdWx0IG1fcmVzdWx0OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZl ci5jcHAKaW5kZXggYzRkYzhlOGFkNDUwNGE4MGYxMjUyMDY1YTc4YzNjMTViODhiNjA0MC4uM2Zl ZGVjMmJmYjE4NTUwYWU3NmM3NDM0ZTg0Yjk0MWFjNjQyYWQ2NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTg4LDYgKzg4LDUyIEBAIHVzaW5nIG5hbWVzcGFjZSBI VE1MTmFtZXM7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChSZXNvbHZlcik7CiAKK2Ns YXNzIFJlc29sdmVyOjpTdGF0ZSB7CitwdWJsaWM6CisgICAgU3RhdGUoKSB7IH0KKyAgICBTdGF0 ZShjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUs IGNvbnN0IFJlbmRlclN0eWxlKiBkb2N1bWVudEVsZW1lbnRTdHlsZSA9IG51bGxwdHIpCisgICAg ICAgIDogbV9lbGVtZW50KCZlbGVtZW50KQorICAgICAgICAsIG1fcGFyZW50U3R5bGUocGFyZW50 U3R5bGUpCisgICAgeworICAgICAgICBib29sIHJlc2V0U3R5bGVJbmhlcml0YW5jZSA9IGhhc1No YWRvd1Jvb3RQYXJlbnQoZWxlbWVudCkgJiYgZG93bmNhc3Q8U2hhZG93Um9vdD4oZWxlbWVudC5w YXJlbnROb2RlKCkpLT5yZXNldFN0eWxlSW5oZXJpdGFuY2UoKTsKKyAgICAgICAgaWYgKHJlc2V0 U3R5bGVJbmhlcml0YW5jZSkKKyAgICAgICAgICAgIG1fcGFyZW50U3R5bGUgPSBudWxscHRyOwor CisgICAgICAgIGF1dG8mIGRvY3VtZW50ID0gZWxlbWVudC5kb2N1bWVudCgpOworICAgICAgICBh dXRvKiBkb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKTsKKyAgICAg ICAgaWYgKCFkb2N1bWVudEVsZW1lbnQgfHwgZG9jdW1lbnRFbGVtZW50ID09ICZlbGVtZW50KQor ICAgICAgICAgICAgbV9yb290RWxlbWVudFN0eWxlID0gZG9jdW1lbnQucmVuZGVyU3R5bGUoKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9yb290RWxlbWVudFN0eWxlID0gZG9jdW1lbnRF bGVtZW50U3R5bGUgPyBkb2N1bWVudEVsZW1lbnRTdHlsZSA6IGRvY3VtZW50RWxlbWVudC0+cmVu ZGVyU3R5bGUoKTsKKyAgICB9CisKKyAgICBjb25zdCBFbGVtZW50KiBlbGVtZW50KCkgY29uc3Qg eyByZXR1cm4gbV9lbGVtZW50OyB9CisKKyAgICB2b2lkIHNldFN0eWxlKHN0ZDo6dW5pcXVlX3B0 cjxSZW5kZXJTdHlsZT4gc3R5bGUpIHsgbV9zdHlsZSA9IFdURk1vdmUoc3R5bGUpOyB9CisgICAg UmVuZGVyU3R5bGUqIHN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZS5nZXQoKTsgfQorICAg IHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gdGFrZVN0eWxlKCkgeyByZXR1cm4gV1RGTW92 ZShtX3N0eWxlKTsgfQorCisgICAgdm9pZCBzZXRQYXJlbnRTdHlsZShzdGQ6OnVuaXF1ZV9wdHI8 UmVuZGVyU3R5bGU+IHBhcmVudFN0eWxlKQorICAgIHsKKyAgICAgICAgbV9vd25lZFBhcmVudFN0 eWxlID0gV1RGTW92ZShwYXJlbnRTdHlsZSk7CisgICAgICAgIG1fcGFyZW50U3R5bGUgPSBtX293 bmVkUGFyZW50U3R5bGUuZ2V0KCk7CisgICAgfQorICAgIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJl bnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50U3R5bGU7IH0KKyAgICBjb25zdCBSZW5k ZXJTdHlsZSogcm9vdEVsZW1lbnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdEVsZW1lbnRT dHlsZTsgfQorCisgICAgY29uc3QgUmVuZGVyU3R5bGUqIHVzZXJBZ2VudEFwcGVhcmFuY2VTdHls ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlckFnZW50QXBwZWFyYW5jZVN0eWxlLmdldCgpOyB9Cisg ICAgdm9pZCBzZXRVc2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRl clN0eWxlPiBzdHlsZSkgeyBtX3VzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSA9IFdURk1vdmUoc3R5 bGUpOyB9CisKK3ByaXZhdGU6CisgICAgY29uc3QgRWxlbWVudCogbV9lbGVtZW50IHsgbnVsbHB0 ciB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gbV9zdHlsZTsKKyAgICBjb25z dCBSZW5kZXJTdHlsZSogbV9wYXJlbnRTdHlsZSB7IG51bGxwdHIgfTsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8Y29uc3QgUmVuZGVyU3R5bGU+IG1fb3duZWRQYXJlbnRTdHlsZTsKKyAgICBjb25zdCBS ZW5kZXJTdHlsZSogbV9yb290RWxlbWVudFN0eWxlIHsgbnVsbHB0ciB9OworCisgICAgc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBtX3VzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZTsKK307CisK IFJlZjxSZXNvbHZlcj4gUmVzb2x2ZXI6OmNyZWF0ZShEb2N1bWVudCYgZG9jdW1lbnQpCiB7CiAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUmVzb2x2ZXIoZG9jdW1lbnQpKTsKQEAgLTE1OSwzMyAr MjA1LDYgQEAgUmVzb2x2ZXI6On5SZXNvbHZlcigpCiAgICAgbV9pc0RlbGV0ZWQgPSB0cnVlOwog fQogCi1SZXNvbHZlcjo6U3RhdGU6OlN0YXRlKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0 IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIGRvY3VtZW50RWxl bWVudFN0eWxlKQotICAgIDogbV9lbGVtZW50KCZlbGVtZW50KQotICAgICwgbV9wYXJlbnRTdHls ZShwYXJlbnRTdHlsZSkKLXsKLSAgICBib29sIHJlc2V0U3R5bGVJbmhlcml0YW5jZSA9IGhhc1No YWRvd1Jvb3RQYXJlbnQoZWxlbWVudCkgJiYgZG93bmNhc3Q8U2hhZG93Um9vdD4oZWxlbWVudC5w YXJlbnROb2RlKCkpLT5yZXNldFN0eWxlSW5oZXJpdGFuY2UoKTsKLSAgICBpZiAocmVzZXRTdHls ZUluaGVyaXRhbmNlKQotICAgICAgICBtX3BhcmVudFN0eWxlID0gbnVsbHB0cjsKLQotICAgIGF1 dG8mIGRvY3VtZW50ID0gZWxlbWVudC5kb2N1bWVudCgpOwotICAgIGF1dG8qIGRvY3VtZW50RWxl bWVudCA9IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpOwotICAgIGlmICghZG9jdW1lbnRFbGVt ZW50IHx8IGRvY3VtZW50RWxlbWVudCA9PSAmZWxlbWVudCkKLSAgICAgICAgbV9yb290RWxlbWVu dFN0eWxlID0gZG9jdW1lbnQucmVuZGVyU3R5bGUoKTsKLSAgICBlbHNlCi0gICAgICAgIG1fcm9v dEVsZW1lbnRTdHlsZSA9IGRvY3VtZW50RWxlbWVudFN0eWxlID8gZG9jdW1lbnRFbGVtZW50U3R5 bGUgOiBkb2N1bWVudEVsZW1lbnQtPnJlbmRlclN0eWxlKCk7Ci19Ci0KLWlubGluZSB2b2lkIFJl c29sdmVyOjpTdGF0ZTo6c2V0U3R5bGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBzdHls ZSkKLXsKLSAgICBtX3N0eWxlID0gV1RGTW92ZShzdHlsZSk7Ci19Ci0KLWlubGluZSB2b2lkIFJl c29sdmVyOjpTdGF0ZTo6c2V0UGFyZW50U3R5bGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxl PiBwYXJlbnRTdHlsZSkKLXsKLSAgICBtX293bmVkUGFyZW50U3R5bGUgPSBXVEZNb3ZlKHBhcmVu dFN0eWxlKTsKLSAgICBtX3BhcmVudFN0eWxlID0gbV9vd25lZFBhcmVudFN0eWxlLmdldCgpOwot fQotCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNoYWRvd0JvdW5kYXJ5KGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQpCiB7CiAgICAgcmV0dXJuIGlzPFNoYWRvd1Jvb3Q+KGVsZW1lbnQucGFyZW50Tm9k ZSgpKTsKQEAgLTQyMCw3ICs0MzksNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IFJl c29sdmVyOjpzdHlsZUZvclBhZ2UoaW50IHBhZ2VJbmRleCkKICAgICBzdGF0ZS5zZXRTdHlsZShS ZW5kZXJTdHlsZTo6Y3JlYXRlUHRyKCkpOwogICAgIHN0YXRlLnN0eWxlKCktPmluaGVyaXRGcm9t KCpzdGF0ZS5yb290RWxlbWVudFN0eWxlKCkpOwogCi0gICAgUGFnZVJ1bGVDb2xsZWN0b3IgY29s bGVjdG9yKHN0YXRlLCBtX3J1bGVTZXRzKTsKKyAgICBQYWdlUnVsZUNvbGxlY3RvciBjb2xsZWN0 b3IobV9ydWxlU2V0cywgc3RhdGUucm9vdEVsZW1lbnRTdHlsZSgpLT5kaXJlY3Rpb24oKSk7CiAg ICAgY29sbGVjdG9yLm1hdGNoQWxsUGFnZVJ1bGVzKHBhZ2VJbmRleCk7CiAKICAgICBhdXRvJiBy ZXN1bHQgPSBjb2xsZWN0b3IubWF0Y2hSZXN1bHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVz b2x2ZXIuaAppbmRleCA3NzM1MjM5NTJlNzM1OTk2MTllZjU2YjhhYjgyNThiZTQ1Y2RiYTAzLi5h NDJmYjAxNDU4NDJlNjQ1MWRhYzRjM2QyMjNmNGFmYzc1Mjc0MDI4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVSZXNvbHZlci5oCkBAIC0xNDUsMzggKzE0NSw5IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldFNoYXJlZEJldHdlZW5TaGFkb3dUcmVlcygpIHsgbV9pc1NoYXJlZEJldHdlZW5TaGFkb3dU cmVlcyA9IHRydWU7IH0KIAogcHJpdmF0ZToKLSAgICBmcmllbmQgY2xhc3MgUGFnZVJ1bGVDb2xs ZWN0b3I7Ci0KICAgICBSZXNvbHZlcihEb2N1bWVudCYpOwogCi0gICAgY2xhc3MgU3RhdGUgewot ICAgIHB1YmxpYzoKLSAgICAgICAgU3RhdGUoKSB7IH0KLSAgICAgICAgU3RhdGUoY29uc3QgRWxl bWVudCYsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUq IGRvY3VtZW50RWxlbWVudFN0eWxlID0gbnVsbHB0cik7Ci0KLSAgICBwdWJsaWM6Ci0gICAgICAg IGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2VsZW1lbnQ7IH0KLQot ICAgICAgICB2b2lkIHNldFN0eWxlKHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4pOwotICAg ICAgICBSZW5kZXJTdHlsZSogc3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLmdldCgpOyB9 Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gdGFrZVN0eWxlKCkgeyByZXR1 cm4gV1RGTW92ZShtX3N0eWxlKTsgfQotCi0gICAgICAgIHZvaWQgc2V0UGFyZW50U3R5bGUoc3Rk Ojp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPik7Ci0gICAgICAgIGNvbnN0IFJlbmRlclN0eWxlKiBw YXJlbnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50U3R5bGU7IH0KLSAgICAgICAgY29u c3QgUmVuZGVyU3R5bGUqIHJvb3RFbGVtZW50U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RF bGVtZW50U3R5bGU7IH0KLQotICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBw ZWFyYW5jZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV91c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUu Z2V0KCk7IH0KLSAgICAgICAgdm9pZCBzZXRVc2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUoc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBzdHlsZSkgeyBtX3VzZXJBZ2VudEFwcGVhcmFuY2VTdHls ZSA9IFdURk1vdmUoc3R5bGUpOyB9Ci0KLSAgICBwcml2YXRlOgotICAgICAgICBjb25zdCBFbGVt ZW50KiBtX2VsZW1lbnQgeyBudWxscHRyIH07Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5k ZXJTdHlsZT4gbV9zdHlsZTsKLSAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUqIG1fcGFyZW50U3R5 bGUgeyBudWxscHRyIH07Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxjb25zdCBSZW5kZXJTdHls ZT4gbV9vd25lZFBhcmVudFN0eWxlOwotICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogbV9yb290 RWxlbWVudFN0eWxlIHsgbnVsbHB0ciB9OwotCi0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5k ZXJTdHlsZT4gbV91c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGU7Ci0gICAgfTsKKyAgICBjbGFzcyBT dGF0ZTsKIAogICAgIEJ1aWxkZXJDb250ZXh0IGJ1aWxkZXJDb250ZXh0KGNvbnN0IFN0YXRlJik7 CiAK