239220 2022-04-12 14:24:45 -0700 Use safer downcast<>() for CachedResourceClient subclasses 2022-04-12 23:38:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez bfulgham darin ews-watchlist japhet mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1860891 0 cdumez 2022-04-12 14:24:45 -0700 Use safer downcast<>() for CachedResourceClient subclasses. 1860896 1 457478 cdumez 2022-04-12 14:32:06 -0700 Created attachment 457478 Patch 1861022 2 ews-feeder 2022-04-12 21:00:07 -0700 Committed r292796 (249579@main): <https://commits.webkit.org/249579@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457478. 1861024 3 webkit-bug-importer 2022-04-12 21:01:14 -0700 <rdar://problem/91667215> 457478 2022-04-12 14:32:06 -0700 2022-04-12 23:38:23 -0700 Patch bug-239220-20220412143205.patch text/plain 11733 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdlNWFmOWMxNWQ5OWQw MjE2MjgyYjZmZWE5MzE0Yzk0NTliZDdjOS4uMTBlZmU2Nzk0OGMxYWY4OTNlN2U4NGU0NzdlMTZk MTViNzgxMTRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTA0LTEyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNhZmVyIGRvd25jYXN0 PD4oKSBmb3IgQ2FjaGVkUmVzb3VyY2VDbGllbnQgc3ViY2xhc3NlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5MjIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvTGlua1ByZWxvYWRSZXNv dXJjZUNsaWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmtQcmVsb2FkSW1hZ2VSZXNvdXJj ZUNsaWVudDo6TGlua1ByZWxvYWRJbWFnZVJlc291cmNlQ2xpZW50KToKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRDU1NTdHlsZVNoZWV0OjpkaWRBZGRDbGllbnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRGb250LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmRpZEFkZENsaWVu dCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZEltYWdlOjpkaWRBZGRDbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkSW1hZ2U6OmRpZFJlbW92ZUNsaWVudCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hl ZEltYWdlQ2xpZW50Lmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJhd1Jlc291cmNlOjpkaWRBZGRDbGllbnQp OgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZUNsaWVudC5oOgorICAg ICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUNsaWVudC5oOgorICAgICAgICAqIGxv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpj cmVhdGVSZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3VtZW50 Q2xpZW50Lmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFN0eWxlU2hlZXRDbGllbnQu aDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDYWNoZWRYU0xTdHlsZVNoZWV0OjpkaWRBZGRDbGllbnQpOgorCiAyMDIy LTA0LTEyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFj ZSBBdG9tU3RyaW5nKGNvbnN0IGNoYXIqKSB3aXRoIEF0b21TdHJpbmc6OmZyb21MYXRpbjEoY29u c3QgY2hhciopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua1ByZWxvYWRS ZXNvdXJjZUNsaWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rUHJlbG9hZFJlc291 cmNlQ2xpZW50cy5oCmluZGV4IGJkZDRlZWJlYjM4Y2Y2YmY1ZDgyNjA4NmZlODA2OTgyOWI5ZGE2 MGIuLjAwMDc0YWIxNjk1OWRmZjY2ZTMwY2M0MDg4MTQ5YThjMTVlNGQwODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50cy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rUHJlbG9hZFJlc291cmNlQ2xpZW50cy5oCkBAIC0x MTYsNyArMTE2LDcgQEAgY2xhc3MgTGlua1ByZWxvYWRJbWFnZVJlc291cmNlQ2xpZW50IDogcHVi bGljIExpbmtQcmVsb2FkUmVzb3VyY2VDbGllbnQsIHB1YmxpYwogICAgIFdURl9NQUtFX0ZBU1Rf QUxMT0NBVEVEOwogcHVibGljOgogICAgIExpbmtQcmVsb2FkSW1hZ2VSZXNvdXJjZUNsaWVudChM aW5rTG9hZGVyJiBsb2FkZXIsIENhY2hlZEltYWdlJiByZXNvdXJjZSkKLSAgICAgICAgOiBMaW5r UHJlbG9hZFJlc291cmNlQ2xpZW50KGxvYWRlciwgc3RhdGljX2Nhc3Q8Q2FjaGVkUmVzb3VyY2Um PihyZXNvdXJjZSkpCisgICAgICAgIDogTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudChsb2FkZXIs IHJlc291cmNlKQogICAgIHsKICAgICAgICAgYWRkUmVzb3VyY2UoKnRoaXMpOwogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNw cAppbmRleCBhZWJmNGI3MzdhNWRiOGRlZDU2YjhiNmY4ZTg5YmM3M2E3NDQ3MzExLi41Mjk4ODg5 YjE5MmJjNjc4N2YyZGQ0NmY3ZDVhOGM3NDc4NmU3NjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwCkBAIC01OSw3ICs1OSw3 IEBAIHZvaWQgQ2FjaGVkQ1NTU3R5bGVTaGVldDo6ZGlkQWRkQ2xpZW50KENhY2hlZFJlc291cmNl Q2xpZW50JiBjbGllbnQpCiAgICAgQ2FjaGVkUmVzb3VyY2U6OmRpZEFkZENsaWVudChjbGllbnQp OwogCiAgICAgaWYgKCFpc0xvYWRpbmcoKSkKLSAgICAgICAgc3RhdGljX2Nhc3Q8Q2FjaGVkU3R5 bGVTaGVldENsaWVudCY+KGNsaWVudCkuc2V0Q1NTU3R5bGVTaGVldChtX3Jlc291cmNlUmVxdWVz dC51cmwoKS5zdHJpbmcoKSwgbV9yZXNwb25zZS51cmwoKSwgU3RyaW5nOjpmcm9tTGF0aW4xKG1f ZGVjb2Rlci0+ZW5jb2RpbmcoKS5uYW1lKCkpLCB0aGlzKTsKKyAgICAgICAgZG93bmNhc3Q8Q2Fj aGVkU3R5bGVTaGVldENsaWVudD4oY2xpZW50KS5zZXRDU1NTdHlsZVNoZWV0KG1fcmVzb3VyY2VS ZXF1ZXN0LnVybCgpLnN0cmluZygpLCBtX3Jlc3BvbnNlLnVybCgpLCBTdHJpbmc6OmZyb21MYXRp bjEobV9kZWNvZGVyLT5lbmNvZGluZygpLm5hbWUoKSksIHRoaXMpOwogfQogCiB2b2lkIENhY2hl ZENTU1N0eWxlU2hlZXQ6OnNldEVuY29kaW5nKGNvbnN0IFN0cmluZyYgY2hzKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuY3BwCmluZGV4IDlkYmQ1Mzc5MzVlMGRkMGI3 ZGJkNGUxMjM5M2FkMGU4MTQwZGQ5MWYuLjlhOTA0ZGQwOGE3MjZkOTE4MzI1MmM2ZmIwMTZmZDEz OGZhMTEzZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRG b250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHAK QEAgLTYxLDcgKzYxLDcgQEAgdm9pZCBDYWNoZWRGb250OjpkaWRBZGRDbGllbnQoQ2FjaGVkUmVz b3VyY2VDbGllbnQmIGNsaWVudCkKIHsKICAgICBBU1NFUlQoY2xpZW50LnJlc291cmNlQ2xpZW50 VHlwZSgpID09IENhY2hlZEZvbnRDbGllbnQ6OmV4cGVjdGVkVHlwZSgpKTsKICAgICBpZiAoIWlz TG9hZGluZygpKQotICAgICAgICBzdGF0aWNfY2FzdDxDYWNoZWRGb250Q2xpZW50Jj4oY2xpZW50 KS5mb250TG9hZGVkKCp0aGlzKTsKKyAgICAgICAgZG93bmNhc3Q8Q2FjaGVkRm9udENsaWVudD4o Y2xpZW50KS5mb250TG9hZGVkKCp0aGlzKTsKIH0KIAogdm9pZCBDYWNoZWRGb250OjpmaW5pc2hM b2FkaW5nKGNvbnN0IEZyYWdtZW50ZWRTaGFyZWRCdWZmZXIqIGRhdGEsIGNvbnN0IE5ldHdvcmtM b2FkTWV0cmljcyYgbWV0cmljcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRGb250Q2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkRm9udENsaWVudC5oCmluZGV4IDUwZTYzZjU5Y2EzNDQ3YzIyYTk2ZmM5ZmM3MTYxOGQzMWI2 ZDIwYzIuLmJhNzk0ZTlhNmM5NjNlMDM4NTg3YWEzMDA5ZmZmY2EzMzMzMWEyZDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250Q2xpZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnRDbGllbnQuaApAQCAtNDAsMyAr NDAsNSBAQCBwdWJsaWM6CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKK1NQRUNJQUxJ WkVfVFlQRV9UUkFJVFNfQ0FDSEVEX1JFU09VUkNFX0NMSUVOVChDYWNoZWRGb250Q2xpZW50LCBG b250VHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk SW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcApp bmRleCBmZjAyMTUwYWYxNDRiMzEyZGQ4NTNmOTk4NDgxN2U0Yjk2ZTMxNTdhLi4xMGYzNzE4NTlh NTVlNDlhMDZlZGM5ZDkyNjhjMmZhMWE5YmNkYjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKQEAgLTEzMyw3ICsxMzMsNyBAQCB2b2lkIENhY2hlZElt YWdlOjpkaWRBZGRDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQmIGNsaWVudCkKIAogICAgIEFT U0VSVChjbGllbnQucmVzb3VyY2VDbGllbnRUeXBlKCkgPT0gQ2FjaGVkSW1hZ2VDbGllbnQ6OmV4 cGVjdGVkVHlwZSgpKTsKICAgICBpZiAobV9pbWFnZSAmJiAhbV9pbWFnZS0+aXNOdWxsKCkpCi0g ICAgICAgIHN0YXRpY19jYXN0PENhY2hlZEltYWdlQ2xpZW50Jj4oY2xpZW50KS5pbWFnZUNoYW5n ZWQodGhpcyk7CisgICAgICAgIGRvd25jYXN0PENhY2hlZEltYWdlQ2xpZW50PihjbGllbnQpLmlt YWdlQ2hhbmdlZCh0aGlzKTsKIAogICAgIGlmIChtX2ltYWdlKQogICAgICAgICBtX2ltYWdlLT5z dGFydEFuaW1hdGlvbkFzeW5jaHJvbm91c2x5KCk7CkBAIC0xNDUsMTUgKzE0NSwxNSBAQCB2b2lk IENhY2hlZEltYWdlOjpkaWRSZW1vdmVDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQmIGNsaWVu dCkKIHsKICAgICBBU1NFUlQoY2xpZW50LnJlc291cmNlQ2xpZW50VHlwZSgpID09IENhY2hlZElt YWdlQ2xpZW50OjpleHBlY3RlZFR5cGUoKSk7CiAKLSAgICBtX3BlbmRpbmdDb250YWluZXJDb250 ZXh0UmVxdWVzdHMucmVtb3ZlKCZzdGF0aWNfY2FzdDxDYWNoZWRJbWFnZUNsaWVudCY+KGNsaWVu dCkpOwotICAgIG1fY2xpZW50c1dhaXRpbmdGb3JBc3luY0RlY29kaW5nLnJlbW92ZSgmc3RhdGlj X2Nhc3Q8Q2FjaGVkSW1hZ2VDbGllbnQmPihjbGllbnQpKTsKKyAgICBtX3BlbmRpbmdDb250YWlu ZXJDb250ZXh0UmVxdWVzdHMucmVtb3ZlKCZkb3duY2FzdDxDYWNoZWRJbWFnZUNsaWVudD4oY2xp ZW50KSk7CisgICAgbV9jbGllbnRzV2FpdGluZ0ZvckFzeW5jRGVjb2RpbmcucmVtb3ZlKCZkb3du Y2FzdDxDYWNoZWRJbWFnZUNsaWVudD4oY2xpZW50KSk7CiAKICAgICBpZiAobV9zdmdJbWFnZUNh Y2hlKQotICAgICAgICBtX3N2Z0ltYWdlQ2FjaGUtPnJlbW92ZUNsaWVudEZyb21DYWNoZSgmc3Rh dGljX2Nhc3Q8Q2FjaGVkSW1hZ2VDbGllbnQmPihjbGllbnQpKTsKKyAgICAgICAgbV9zdmdJbWFn ZUNhY2hlLT5yZW1vdmVDbGllbnRGcm9tQ2FjaGUoJmRvd25jYXN0PENhY2hlZEltYWdlQ2xpZW50 PihjbGllbnQpKTsKIAogICAgIENhY2hlZFJlc291cmNlOjpkaWRSZW1vdmVDbGllbnQoY2xpZW50 KTsKIAotICAgIHN0YXRpY19jYXN0PENhY2hlZEltYWdlQ2xpZW50Jj4oY2xpZW50KS5kaWRSZW1v dmVDYWNoZWRJbWFnZUNsaWVudCgqdGhpcyk7CisgICAgZG93bmNhc3Q8Q2FjaGVkSW1hZ2VDbGll bnQ+KGNsaWVudCkuZGlkUmVtb3ZlQ2FjaGVkSW1hZ2VDbGllbnQoKnRoaXMpOwogfQogCiBib29s IENhY2hlZEltYWdlOjppc0NsaWVudFdhaXRpbmdGb3JBc3luY0RlY29kaW5nKENhY2hlZEltYWdl Q2xpZW50JiBjbGllbnQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRJbWFnZUNsaWVudC5oCmluZGV4IDkxMDBiZjYyMmVhYWI1OGY0YzgyYjQ1YzJkYzZlNmQ5 MzE0Nzk0YWEuLjE3ZTViZmQxOGExYmY3MGE5OGY1YjI3NWMxNGNiNjBmZTYzYmFmNWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCkBAIC01 NiwzICs1Niw1IEBAIHB1YmxpYzoKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworU1BF Q0lBTElaRV9UWVBFX1RSQUlUU19DQUNIRURfUkVTT1VSQ0VfQ0xJRU5UKENhY2hlZEltYWdlQ2xp ZW50LCBJbWFnZVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJhd1Jlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSYXdSZXNvdXJjZS5jcHAKaW5kZXggZTY2MjZkZmVlYmViYTA0MjA4MWFiMDNiOWUxODA2Mzg3 ZDY4Y2E5Ny4uYjcwN2U3ZjAwYzEzMDEyNjk3OWY2YjVhZGI5OWRmZGE5NGFkODgyOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwCkBA IC0xNTksNyArMTU5LDcgQEAgc3RhdGljIHZvaWQgaXRlcmF0ZVJlZGlyZWN0cyhDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRSYXdSZXNvdXJjZT4mJiBoYW5kbGUsIEMKIAogdm9pZCBDYWNoZWRS YXdSZXNvdXJjZTo6ZGlkQWRkQ2xpZW50KENhY2hlZFJlc291cmNlQ2xpZW50JiBjKQogewotICAg IENhY2hlZFJhd1Jlc291cmNlQ2xpZW50JiBjbGllbnQgPSBzdGF0aWNfY2FzdDxDYWNoZWRSYXdS ZXNvdXJjZUNsaWVudCY+KGMpOworICAgIGF1dG8mIGNsaWVudCA9IGRvd25jYXN0PENhY2hlZFJh d1Jlc291cmNlQ2xpZW50PihjKTsKICAgICBzaXplX3QgcmVkaXJlY3RDb3VudCA9IG1fcmVkaXJl Y3RDaGFpbi5zaXplKCk7CiAgICAgVmVjdG9yPHN0ZDo6cGFpcjxSZXNvdXJjZVJlcXVlc3QsIFJl c291cmNlUmVzcG9uc2U+PiByZWRpcmVjdHNJblJldmVyc2VPcmRlcjsKICAgICByZWRpcmVjdHNJ blJldmVyc2VPcmRlci5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHJlZGlyZWN0Q291bnQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlQ2xp ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2VDbGll bnQuaAppbmRleCBjZDY1MGEyZjMxMzZjZTliMjYyZmJkZmM4MjkyOGJmMjEwNzlmYmNhLi42YTY2 Mzg2ZGRiNzFkNWNmNDBkNWZiZjRmODE4OWFmNWRkOGE4YTAwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQuaApAQCAtNTYs NCArNTYsNiBAQCBwdWJsaWM6CiAjZW5kaWYKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNv cmUKKworU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DQUNIRURfUkVTT1VSQ0VfQ0xJRU5UKENhY2hl ZFJhd1Jlc291cmNlQ2xpZW50LCBSYXdSZXNvdXJjZVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlQ2xpZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VDbGllbnQuaAppbmRleCA5ZGY0NTRhOTZi MDBiZDQzMzhkMjNiZTdjMzVkMjYyMTA4YThmNTgxLi41Y2JjYWMzYzhlOWM2MTE2ZWJjOTJjYWJj MTA0NGQ3NzNlNmU3YTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VDbGllbnQuaApAQCAtNTEsNCArNTEsOSBAQCBwcm90ZWN0ZWQ6CiAgICAg Q2FjaGVkUmVzb3VyY2VDbGllbnQoKSA9IGRlZmF1bHQ7CiB9OwogCi19Cit9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCisKKyNkZWZpbmUgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DQUNIRURfUkVTT1VS Q0VfQ0xJRU5UKFRvQ2xhc3NOYW1lLCBDYWNoZWRSZXNvdXJjZVR5cGVWYWx1ZSkgXAorU1BFQ0lB TElaRV9UWVBFX1RSQUlUU19CRUdJTihXZWJDb3JlOjpUb0NsYXNzTmFtZSkgXAorICAgIHN0YXRp YyBib29sIGlzVHlwZShjb25zdCBXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUNsaWVudCYgY2xpZW50 KSB7IHJldHVybiBjbGllbnQucmVzb3VyY2VDbGllbnRUeXBlKCkgPT0gV2ViQ29yZTo6Q2FjaGVk UmVzb3VyY2VDbGllbnQ6OkNhY2hlZFJlc291cmNlVHlwZVZhbHVlOyB9IFwKK1NQRUNJQUxJWkVf VFlQRV9UUkFJVFNfRU5EKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDdkNjFjY2I1MmI3ZjUwZDdmOGM5NmI2ZjJi NTE0YWZkYWQ3Y2NkOWYuLjkzODYyYTIzYjVkN2E3Y2QzM2YxZDRkZjYxOGQ3OTYxZDc5OTk4ODAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcApAQCAtMTY2LDkgKzE2Niw5IEBAIHN0YXRpYyBDYWNoZWRSZXNvdXJjZUhhbmRs ZTxDYWNoZWRSZXNvdXJjZT4gY3JlYXRlUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0CiAg ICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6U2NyaXB0OgogICAgICAgICByZXR1cm4gbmV3 IENhY2hlZFNjcmlwdChXVEZNb3ZlKHJlcXVlc3QpLCByZXNvdXJjZS5zZXNzaW9uSUQoKSwgcmVz b3VyY2UuY29va2llSmFyKCkpOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OlNWR0Rv Y3VtZW50UmVzb3VyY2U6Ci0gICAgICAgIHJldHVybiBuZXcgQ2FjaGVkU1ZHRG9jdW1lbnQoV1RG TW92ZShyZXF1ZXN0KSwgc3RhdGljX2Nhc3Q8Q2FjaGVkU1ZHRG9jdW1lbnQmPihyZXNvdXJjZSkp OworICAgICAgICByZXR1cm4gbmV3IENhY2hlZFNWR0RvY3VtZW50KFdURk1vdmUocmVxdWVzdCks IGRvd25jYXN0PENhY2hlZFNWR0RvY3VtZW50PihyZXNvdXJjZSkpOwogICAgIGNhc2UgQ2FjaGVk UmVzb3VyY2U6OlR5cGU6OlNWR0ZvbnRSZXNvdXJjZToKLSAgICAgICAgcmV0dXJuIG5ldyBDYWNo ZWRTVkdGb250KFdURk1vdmUocmVxdWVzdCksIHN0YXRpY19jYXN0PENhY2hlZFNWR0ZvbnQmPihy ZXNvdXJjZSkpOworICAgICAgICByZXR1cm4gbmV3IENhY2hlZFNWR0ZvbnQoV1RGTW92ZShyZXF1 ZXN0KSwgZG93bmNhc3Q8Q2FjaGVkU1ZHRm9udD4ocmVzb3VyY2UpKTsKICAgICBjYXNlIENhY2hl ZFJlc291cmNlOjpUeXBlOjpGb250UmVzb3VyY2U6CiAgICAgICAgIHJldHVybiBuZXcgQ2FjaGVk Rm9udChXVEZNb3ZlKHJlcXVlc3QpLCByZXNvdXJjZS5zZXNzaW9uSUQoKSwgcmVzb3VyY2UuY29v a2llSmFyKCkpOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkJlYWNvbjoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTVkdEb2N1bWVudENsaWVu dC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3VtZW50Q2xpZW50 LmgKaW5kZXggOGUxNzg4ZmYxNDg0ZWUxNGEwZDY1MzdlM2EyNzFkNzYzNjY3MjJmNS4uYjlkNTBm YzdlZWI5ZDExOWNiYjQ2NmQ3N2QzYzY3MzdhZGVkZDdhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3VtZW50Q2xpZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0RvY3VtZW50Q2xpZW50LmgKQEAgLTM0LDMg KzM0LDUgQEAgcHVibGljOgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCitTUEVDSUFM SVpFX1RZUEVfVFJBSVRTX0NBQ0hFRF9SRVNPVVJDRV9DTElFTlQoQ2FjaGVkU1ZHRG9jdW1lbnRD bGllbnQsIFNWR0RvY3VtZW50VHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkU3R5bGVTaGVldENsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFN0eWxlU2hlZXRDbGllbnQuaAppbmRleCAzOGJiMTk5OTAwODdjOGQ2NjYx ZjM2YTM2NjlkNGM5YWUzMzQ4MTcwLi44Mzk0NjcwYWEwMmJiYjU3YTU5MmJkNjEwOWY0ODEzMmMz Y2Y1YTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU3R5 bGVTaGVldENsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRT dHlsZVNoZWV0Q2xpZW50LmgKQEAgLTQyLDMgKzQyLDUgQEAgcHVibGljOgogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQorCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0NBQ0hFRF9SRVNPVVJD RV9DTElFTlQoQ2FjaGVkU3R5bGVTaGVldENsaWVudCwgU3R5bGVTaGVldFR5cGUpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hlZXQuY3BwCmlu ZGV4IGQxMDUwZThhODhlZDhkYjhiMWE5ZWUzZTVkNTJkZGYwOTE1MGE1YzIuLmRjNzAwZDE5MDQ2 NjliYWYwNTI1MjBhZjMyMDY1ZjU4ZTE5NTdmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRYU0xTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAg dm9pZCBDYWNoZWRYU0xTdHlsZVNoZWV0OjpkaWRBZGRDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGll bnQmIGNsaWVudCkKIHsKICAgICBBU1NFUlQoY2xpZW50LnJlc291cmNlQ2xpZW50VHlwZSgpID09 IENhY2hlZFN0eWxlU2hlZXRDbGllbnQ6OmV4cGVjdGVkVHlwZSgpKTsKICAgICBpZiAoIWlzTG9h ZGluZygpKQotICAgICAgICBzdGF0aWNfY2FzdDxDYWNoZWRTdHlsZVNoZWV0Q2xpZW50Jj4oY2xp ZW50KS5zZXRYU0xTdHlsZVNoZWV0KG1fcmVzb3VyY2VSZXF1ZXN0LnVybCgpLnN0cmluZygpLCBt X3Jlc3BvbnNlLnVybCgpLCBtX3NoZWV0KTsKKyAgICAgICAgZG93bmNhc3Q8Q2FjaGVkU3R5bGVT aGVldENsaWVudD4oY2xpZW50KS5zZXRYU0xTdHlsZVNoZWV0KG1fcmVzb3VyY2VSZXF1ZXN0LnVy bCgpLnN0cmluZygpLCBtX3Jlc3BvbnNlLnVybCgpLCBtX3NoZWV0KTsKIH0KIAogdm9pZCBDYWNo ZWRYU0xTdHlsZVNoZWV0OjpzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmIGNocykK