223748 2021-03-25 09:03:12 -0700 Address some alignment issues found by UBSan in contentextensions code 2021-03-25 14:20:00 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=176131 InRadar P2 Normal --- 1 cdumez cdumez darin ggaren sam webkit-bug-importer oldest_to_newest 1743785 0 cdumez 2021-03-25 09:03:12 -0700 Address some alignment issues found by UBSan in contentextensions code: - contentextensions/SerializedNFA.h:55:20: runtime error: reference binding to misaligned address 0xnnnnnnnnn for type 'const unsigned long long', which requires 8 byte alignment - contentextensions/NFAToDFA.cpp:254:29: runtime error: reference binding to misaligned address 0xnnnnnnnnn for type 'const unsigned long long', which requires 8 byte alignment - contentextensions/DFABytecodeCompiler.cpp:43:5: runtime error: store to misaligned address 0xnnnnnnnnn for type 'unsigned short', which requires 2 byte alignment 1743791 1 424252 cdumez 2021-03-25 09:18:24 -0700 Created attachment 424252 Patch 1743846 2 ews-feeder 2021-03-25 11:28:37 -0700 commit-queue failed to commit attachment 424252 to WebKit repository. To retry, please set cq+ flag again. 1743851 3 ews-feeder 2021-03-25 11:47:22 -0700 Committed r275049: <https://commits.webkit.org/r275049> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424252. 1743852 4 webkit-bug-importer 2021-03-25 11:48:16 -0700 <rdar://problem/75846255> 424252 2021-03-25 09:18:24 -0700 2021-03-25 14:20:00 -0700 Patch bug-223748-20210325091823.patch text/plain 8135 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWIxMmI4Y2Q4NmI1MjNi MjZmYjZlZTk0N2RkMmIxYzIyOWEwMGUzOS4uOGRiN2NhMzAyMWY4NGIyNjJhN2Q5MDFlMTNkMzk4 NWIyOThiYWI3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTAzLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkcmVzcyBzb21lIGFsaWdu bWVudCBpc3N1ZXMgZm91bmQgYnkgVUJTYW4gaW4gY29udGVudGV4dGVuc2lvbnMgY29kZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNzQ4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcmVzcyBzb21l IGFsaWdubWVudCBpc3N1ZXMgZm91bmQgYnkgVUJTYW4gaW4gY29udGVudGV4dGVuc2lvbnMgY29k ZToKKyAgICAgICAgLSBjb250ZW50ZXh0ZW5zaW9ucy9TZXJpYWxpemVkTkZBLmg6NTU6MjA6IHJ1 bnRpbWUgZXJyb3I6IHJlZmVyZW5jZSBiaW5kaW5nIHRvIG1pc2FsaWduZWQgYWRkcmVzcyAweG5u bm5ubm5ubiBmb3IgdHlwZSAnY29uc3QgdW5zaWduZWQgbG9uZyBsb25nJywgd2hpY2ggcmVxdWly ZXMgOCBieXRlIGFsaWdubWVudAorICAgICAgICAtIGNvbnRlbnRleHRlbnNpb25zL05GQVRvREZB LmNwcDoyNTQ6Mjk6IHJ1bnRpbWUgZXJyb3I6IHJlZmVyZW5jZSBiaW5kaW5nIHRvIG1pc2FsaWdu ZWQgYWRkcmVzcyAweG5ubm5ubm5ubiBmb3IgdHlwZSAnY29uc3QgdW5zaWduZWQgbG9uZyBsb25n Jywgd2hpY2ggcmVxdWlyZXMgOCBieXRlIGFsaWdubWVudAorICAgICAgICAtIGNvbnRlbnRleHRl bnNpb25zL0RGQUJ5dGVjb2RlQ29tcGlsZXIuY3BwOjQzOjU6IHJ1bnRpbWUgZXJyb3I6IHN0b3Jl IHRvIG1pc2FsaWduZWQgYWRkcmVzcyAweG5ubm5ubm5ubiBmb3IgdHlwZSAndW5zaWduZWQgc2hv cnQnLCB3aGljaCByZXF1aXJlcyAyIGJ5dGUgYWxpZ25tZW50CisKKyAgICAgICAgVXNlIG1lbWNw eSgpIHRvIHN0b3JlL2xvYWQgdG8vZnJvbSBtaXNhbGlnbmVkIGFkZHJlc3MuCisKKyAgICAgICAg KiBjb250ZW50ZXh0ZW5zaW9ucy9ERkFCeXRlY29kZUNvbXBpbGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjphcHBlbmQpOgorICAgICAgICAqIGNvbnRlbnRleHRl bnNpb25zL05GQVRvREZBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25z OjplcHNpbG9uQ2xvc3VyZUV4Y2x1ZGluZ1NlbGYpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dEV4dGVuc2lvbnM6Ok5vZGVJZFNldFRvVW5pcXVlTm9kZUlkU2V0VHJhbnNsYXRvcjo6dHJhbnNs YXRlKToKKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9TZXJpYWxpemVkTkZBLmg6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2VyaWFsaXplZE5GQTo6UmFuZ2U6OnBv aW50ZXJBdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2Vy aWFsaXplZE5GQTo6UmFuZ2U6OnZhbHVlQXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGVudEV4dGVuc2lvbnM6OlNlcmlhbGl6ZWRORkE6OkNvbnN0VGFyZ2V0SXRlcmF0b3I6Om9wZXJh dG9yKiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2VyaWFs aXplZE5GQTo6Q29uc3RUYXJnZXRJdGVyYXRvcjo6b3BlcmF0b3ItPiBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6U2VyaWFsaXplZE5GQTo6Q29uc3RSYW5nZUl0 ZXJhdG9yOjpmaXJzdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9u czo6U2VyaWFsaXplZE5GQTo6Q29uc3RSYW5nZUl0ZXJhdG9yOjpsYXN0IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpTZXJpYWxpemVkTkZBOjpDb25zdFJhbmdl SXRlcmF0b3I6OmRhdGEgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lv bnM6OlNlcmlhbGl6ZWRORkE6OkNvbnN0UmFuZ2VJdGVyYXRvcjo6cmFuZ2UgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OlNlcmlhbGl6ZWRORkE6OnRyYW5zaXRp b25zRm9yTm9kZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6 U2VyaWFsaXplZE5GQTo6UmFuZ2U6Om9wZXJhdG9yW10gY29uc3QpOiBEZWxldGVkLgorCiAyMDIx LTAzLTI1ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NDgyNiBhbmQgcjI3NDk2OC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0RGQUJ5dGVjb2RlQ29tcGlsZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5j cHAKaW5kZXggYjk0MjE5YjkyYjZlZWMxZDBhNzY5ZTExNTZhNTM2OTU2NjQxMWI5Ny4uYzczYjEx Y2E3MzAzNjRkMGU5ZTc5NDk2NzY3YmY0ZGJkYjEyZjIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5jcHAKQEAg LTQwLDcgKzQwLDcgQEAgdGVtcGxhdGUgPHR5cGVuYW1lIEludFR5cGU+CiBpbmxpbmUgdm9pZCBh cHBlbmQoVmVjdG9yPERGQUJ5dGVjb2RlPiYgYnl0ZWNvZGUsIEludFR5cGUgdmFsdWUpCiB7CiAg ICAgYnl0ZWNvZGUuZ3JvdyhieXRlY29kZS5zaXplKCkgKyBzaXplb2YoSW50VHlwZSkpOwotICAg ICpyZWludGVycHJldF9jYXN0PEludFR5cGUqPigmYnl0ZWNvZGVbYnl0ZWNvZGUuc2l6ZSgpIC0g c2l6ZW9mKEludFR5cGUpXSkgPSB2YWx1ZTsKKyAgICBtZW1jcHkoJmJ5dGVjb2RlW2J5dGVjb2Rl LnNpemUoKSAtIHNpemVvZihJbnRUeXBlKV0sICZ2YWx1ZSwgc2l6ZW9mKEludFR5cGUpKTsKIH0K IAogaW5saW5lIHZvaWQgYXBwZW5kWmVyb2VzKFZlY3RvcjxERkFCeXRlY29kZT4mIGJ5dGVjb2Rl LCBERkFCeXRlY29kZUp1bXBTaXplIGp1bXBTaXplKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY29udGVudGV4dGVuc2lvbnMvTkZBVG9ERkEuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVu dGV4dGVuc2lvbnMvTkZBVG9ERkEuY3BwCmluZGV4IGEyYzY3NzIyOWU2ZWE3ODBlYWUzMTQ4Njll NDE0OWYwZmU1NTc5MjIuLmM1ZDUwYmIwNGQ5YTNmNzZhYmM4NjAyMjFiNjMzYjg0NjM3ZTQ3Zjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL05GQVRvREZBLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9ORkFUb0RGQS5jcHAKQEAg LTU5LDEwICs1OSwxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZXBzaWxvbkNsb3N1cmVFeGNsdWRp bmdTZWxmKGNvbnN0IFNlcmlhbGl6ZWRORkEmIG5mYSwgdW5zaWduZQogCiAgICAgZG8gewogICAg ICAgICB1bnNpZ25lZCB1bnByb2Nlc3NlZE5vZGVJZCA9IHVucHJvY2Vzc2VkTm9kZXMudGFrZUxh c3QoKTsKLSAgICAgICAgY29uc3QgYXV0byYgbm9kZSA9IG5mYS5ub2RlcygpW3VucHJvY2Vzc2Vk Tm9kZUlkXTsKKyAgICAgICAgY29uc3QgYXV0byogbm9kZSA9IG5mYS5ub2RlcygpLnBvaW50ZXJB dCh1bnByb2Nlc3NlZE5vZGVJZCk7CiAKLSAgICAgICAgZm9yICh1aW50MzJfdCBlcHNpbG9uVGFy Z2V0SW5kZXggPSBub2RlLmVwc2lsb25UcmFuc2l0aW9uVGFyZ2V0c1N0YXJ0OyBlcHNpbG9uVGFy Z2V0SW5kZXggPCBub2RlLmVwc2lsb25UcmFuc2l0aW9uVGFyZ2V0c0VuZDsgKytlcHNpbG9uVGFy Z2V0SW5kZXgpIHsKLSAgICAgICAgICAgIHVpbnQzMl90IHRhcmdldE5vZGVJZCA9IG5mYS5lcHNp bG9uVHJhbnNpdGlvbnNUYXJnZXRzKClbZXBzaWxvblRhcmdldEluZGV4XTsKKyAgICAgICAgZm9y ICh1aW50MzJfdCBlcHNpbG9uVGFyZ2V0SW5kZXggPSBub2RlLT5lcHNpbG9uVHJhbnNpdGlvblRh cmdldHNTdGFydDsgZXBzaWxvblRhcmdldEluZGV4IDwgbm9kZS0+ZXBzaWxvblRyYW5zaXRpb25U YXJnZXRzRW5kOyArK2Vwc2lsb25UYXJnZXRJbmRleCkgeworICAgICAgICAgICAgdWludDMyX3Qg dGFyZ2V0Tm9kZUlkID0gbmZhLmVwc2lsb25UcmFuc2l0aW9uc1RhcmdldHMoKS52YWx1ZUF0KGVw c2lsb25UYXJnZXRJbmRleCk7CiAgICAgICAgICAgICBhdXRvIGFkZFJlc3VsdCA9IGNsb3N1cmUu YWRkKHRhcmdldE5vZGVJZCk7CiAgICAgICAgICAgICBpZiAoYWRkUmVzdWx0LmlzTmV3RW50cnkp IHsKICAgICAgICAgICAgICAgICB1bnByb2Nlc3NlZE5vZGVzLmFwcGVuZCh0YXJnZXROb2RlSWQp OwpAQCAtMjQ5LDkgKzI0OSw5IEBAIHN0cnVjdCBOb2RlSWRTZXRUb1VuaXF1ZU5vZGVJZFNldFRy YW5zbGF0b3IgewogICAgICAgICBIYXNoU2V0PHVpbnQ2NF90LCBEZWZhdWx0SGFzaDx1aW50NjRf dD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8dWludDY0X3Q+PiBhY3Rpb25z OwogCiAgICAgICAgIGZvciAodW5zaWduZWQgbmZhTm9kZUlkIDogc291cmNlLm5vZGVJZFNldCkg ewotICAgICAgICAgICAgY29uc3QgYXV0byYgbmZhTm9kZSA9IHNvdXJjZS5uZmEubm9kZXMoKVtu ZmFOb2RlSWRdOwotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBhY3Rpb25JbmRleCA9IG5mYU5v ZGUuYWN0aW9uU3RhcnQ7IGFjdGlvbkluZGV4IDwgbmZhTm9kZS5hY3Rpb25FbmQ7ICsrYWN0aW9u SW5kZXgpCi0gICAgICAgICAgICAgICAgYWN0aW9ucy5hZGQoc291cmNlLm5mYS5hY3Rpb25zKClb YWN0aW9uSW5kZXhdKTsKKyAgICAgICAgICAgIGNvbnN0IGF1dG8qIG5mYU5vZGUgPSBzb3VyY2Uu bmZhLm5vZGVzKCkucG9pbnRlckF0KG5mYU5vZGVJZCk7CisgICAgICAgICAgICBmb3IgKHVuc2ln bmVkIGFjdGlvbkluZGV4ID0gbmZhTm9kZS0+YWN0aW9uU3RhcnQ7IGFjdGlvbkluZGV4IDwgbmZh Tm9kZS0+YWN0aW9uRW5kOyArK2FjdGlvbkluZGV4KQorICAgICAgICAgICAgICAgIGFjdGlvbnMu YWRkKHNvdXJjZS5uZmEuYWN0aW9ucygpLnZhbHVlQXQoYWN0aW9uSW5kZXgpKTsKICAgICAgICAg fQogCiAgICAgICAgIHVuc2lnbmVkIGFjdGlvbnNTdGFydCA9IHNvdXJjZS5kZmEuYWN0aW9ucy5z aXplKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9TZXJp YWxpemVkTkZBLmggYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9TZXJpYWxpemVk TkZBLmgKaW5kZXggMWVjMDBlNDc3YzJhMWFiYTgzMTU1NjdlOTk0YmY2NTVhMzU5NGYyZi4uN2U5 OGIwMjU3NGViOTRlOTFmMjc0MjJhNzYyOTdkMzVjYjQwNmUwNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvU2VyaWFsaXplZE5GQS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL1NlcmlhbGl6ZWRORkEuaApAQCAtNDksMTAgKzQ5LDE3 IEBAIHB1YmxpYzoKICAgICAgICAgY29uc3QgVCogYmVnaW4oKSBjb25zdCB7IHJldHVybiBtX2Jl Z2luOyB9CiAgICAgICAgIGNvbnN0IFQqIGVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fYmVnaW4gKyBt X3NpemU7IH0KICAgICAgICAgc2l6ZV90IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0K LSAgICAgICAgY29uc3QgVCYgb3BlcmF0b3JbXShzaXplX3QgaSkgY29uc3QKKyAgICAgICAgY29u c3QgVCogcG9pbnRlckF0KHNpemVfdCBpKSBjb25zdAogICAgICAgICB7CiAgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVChpIDwgbV9zaXplKTsKLSAgICAgICAgICAgIHJldHVybiBiZWdpbigpW2ld OworICAgICAgICAgICAgcmV0dXJuIGJlZ2luKCkgKyBpOworICAgICAgICB9CisgICAgICAgIFQg dmFsdWVBdChzaXplX3QgaSkgY29uc3QKKyAgICAgICAgeworICAgICAgICAgICAgUkVMRUFTRV9B U1NFUlQoaSA8IG1fc2l6ZSk7CisgICAgICAgICAgICBUIHZhbHVlOworICAgICAgICAgICAgbWVt Y3B5KCZ2YWx1ZSwgYmVnaW4oKSArIGksIHNpemVvZihUKSk7CisgICAgICAgICAgICByZXR1cm4g dmFsdWU7CiAgICAgICAgIH0KICAgICBwcml2YXRlOgogICAgICAgICBjb25zdCBUKiBtX2JlZ2lu IHsgbnVsbHB0ciB9OwpAQCAtNzUsOCArODIsOCBAQCBwdWJsaWM6CiAgICAgICAgIGNvbnN0IFNl cmlhbGl6ZWRORkEmIHNlcmlhbGl6ZWRORkE7CiAgICAgICAgIHVpbnQzMl90IHBvc2l0aW9uOwog Ci0gICAgICAgIGNvbnN0IHVpbnQzMl90JiBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiBzZXJp YWxpemVkTkZBLnRhcmdldHMoKVtwb3NpdGlvbl07IH0KLSAgICAgICAgY29uc3QgdWludDMyX3Qq IG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiAmc2VyaWFsaXplZE5GQS50YXJnZXRzKClbcG9z aXRpb25dOyB9CisgICAgICAgIHVpbnQzMl90IG9wZXJhdG9yKigpIGNvbnN0IHsgcmV0dXJuIHNl cmlhbGl6ZWRORkEudGFyZ2V0cygpLnZhbHVlQXQocG9zaXRpb24pOyB9CisgICAgICAgIGNvbnN0 IHVpbnQzMl90KiBvcGVyYXRvci0+KCkgY29uc3QgeyByZXR1cm4gc2VyaWFsaXplZE5GQS50YXJn ZXRzKCkucG9pbnRlckF0KHBvc2l0aW9uKTsgfQogCiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShj b25zdCBDb25zdFRhcmdldEl0ZXJhdG9yJiBvdGhlcikgY29uc3QKICAgICAgICAgewpAQCAtMTIw LDI0ICsxMjcsMjQgQEAgcHVibGljOgogCiAgICAgICAgIGNoYXIgZmlyc3QoKSBjb25zdAogICAg ICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gcmFuZ2UoKS5maXJzdDsKKyAgICAgICAgICAgIHJl dHVybiByYW5nZSgpLT5maXJzdDsKICAgICAgICAgfQogCiAgICAgICAgIGNoYXIgbGFzdCgpIGNv bnN0CiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiByYW5nZSgpLmxhc3Q7CisgICAgICAg ICAgICByZXR1cm4gcmFuZ2UoKS0+bGFzdDsKICAgICAgICAgfQogCiAgICAgICAgIEl0ZXJhYmxl Q29uc3RUYXJnZXRzIGRhdGEoKSBjb25zdAogICAgICAgICB7Ci0gICAgICAgICAgICBjb25zdCBJ bW11dGFibGVSYW5nZTxjaGFyPiYgcmFuZ2UgPSB0aGlzLT5yYW5nZSgpOwotICAgICAgICAgICAg cmV0dXJuIHsgc2VyaWFsaXplZE5GQSwgcmFuZ2UudGFyZ2V0U3RhcnQsIHJhbmdlLnRhcmdldEVu ZCB9OworICAgICAgICAgICAgY29uc3QgSW1tdXRhYmxlUmFuZ2U8Y2hhcj4qIHJhbmdlID0gdGhp cy0+cmFuZ2UoKTsKKyAgICAgICAgICAgIHJldHVybiB7IHNlcmlhbGl6ZWRORkEsIHJhbmdlLT50 YXJnZXRTdGFydCwgcmFuZ2UtPnRhcmdldEVuZCB9OwogICAgICAgICB9OwogCiAgICAgcHJpdmF0 ZToKLSAgICAgICAgY29uc3QgSW1tdXRhYmxlUmFuZ2U8Y2hhcj4mIHJhbmdlKCkgY29uc3QKKyAg ICAgICAgY29uc3QgSW1tdXRhYmxlUmFuZ2U8Y2hhcj4qIHJhbmdlKCkgY29uc3QKICAgICAgICAg ewotICAgICAgICAgICAgcmV0dXJuIHNlcmlhbGl6ZWRORkEudHJhbnNpdGlvbnMoKVtwb3NpdGlv bl07CisgICAgICAgICAgICByZXR1cm4gc2VyaWFsaXplZE5GQS50cmFuc2l0aW9ucygpLnBvaW50 ZXJBdChwb3NpdGlvbik7CiAgICAgICAgIH0KICAgICB9OwogCkBAIC0xNjAsOCArMTY3LDggQEAg cHVibGljOgogCiAgICAgSXRlcmFibGVDb25zdFJhbmdlIHRyYW5zaXRpb25zRm9yTm9kZSh1aW50 MzJfdCBub2RlSWQpIGNvbnN0CiAgICAgewotICAgICAgICBjb25zdCBhdXRvJiBub2RlID0gbm9k ZXMoKVtub2RlSWRdOwotICAgICAgICByZXR1cm4geyAqdGhpcywgbm9kZS5yYW5nZXNTdGFydCwg bm9kZS5yYW5nZXNFbmQgfTsKKyAgICAgICAgY29uc3QgYXV0byogbm9kZSA9IG5vZGVzKCkucG9p bnRlckF0KG5vZGVJZCk7CisgICAgICAgIHJldHVybiB7ICp0aGlzLCBub2RlLT5yYW5nZXNTdGFy dCwgbm9kZS0+cmFuZ2VzRW5kIH07CiAgICAgfQogCiBwcml2YXRlOgo=