207759 2020-02-14 07:03:20 -0800 When updating a subtree of the IsolatedTree, first remove the entire subtree, not just the subtree root. 2020-02-14 11:23:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1618960 0 andresg_22 2020-02-14 07:03:20 -0800 When updating a subtree of the IsolatedTree, first remove the entire subtree, not just the subtree root. 1618973 1 390764 andresg_22 2020-02-14 07:28:19 -0800 Created attachment 390764 Patch 1619025 2 390764 cfleizach 2020-02-14 08:47:47 -0800 Comment on attachment 390764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390764&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:215 > + ASSERT(m_readerThreadNodeMap.get(item.m_isolatedObject->objectID())->refCount() == 2); can you add a comment why refCount must be two here 1619038 3 390775 andresg_22 2020-02-14 09:23:22 -0800 Created attachment 390775 Patch 1619101 4 390775 commit-queue 2020-02-14 11:22:38 -0800 Comment on attachment 390775 Patch Clearing flags on attachment: 390775 Committed r256630: <https://trac.webkit.org/changeset/256630> 1619102 5 commit-queue 2020-02-14 11:22:39 -0800 All reviewed patches have been landed. Closing bug. 1619103 6 webkit-bug-importer 2020-02-14 11:23:17 -0800 <rdar://problem/59465611> 390764 2020-02-14 07:28:19 -0800 2020-02-14 09:23:20 -0800 Patch bug-207759-20200214102818.patch text/plain 9303 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzljYzc5MDhlOTUyOWFj YWRmOWRjNmVkOTFlZTQ0MzI5ODIxMmQzMy4uMTk4OTE2ZWYzMGEzMjA4ZTZmMmFhM2YyNDBiYWVi NzY4M2Y3YjUxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAyLTE0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBXaGVuIHVwZGF0 aW5nIGEgc3VidHJlZSBvZiB0aGUgSXNvbGF0ZWRUcmVlLCBmaXJzdCByZW1vdmUgdGhlIGVudGly ZSBzdWJ0cmVlLCBub3QganVzdCB0aGUgc3VidHJlZSByb290LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NzU5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB1cGRhdGluZyBhbiBJc29sYXRlZFRy ZWUgc3VidHJlZSwgd2Ugd2VyZSByZW1vdmluZyBqdXN0IHRoZSByb290CisgICAgICAgIG9mIHRo ZSBzdWJ0cmVlLiBBZGRlZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlU3VidHJlZSB0aGF0IGlzIG5v dyB1c2VkIGluCisgICAgICAgIHVwZGF0ZUlzb2xhdGVkVHJlZS4KKworICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVJc29s YXRlZFRyZWVIaWVyYXJjaHkpOiBJZiB0aGUgd3JhcHBlciBpcyBhdHRhY2hlZAorICAgICAgICBk dXJpbmcgY3JlYXRpb24sIHNldCBpdCB0byBudWxsIGluIHRoZSBOb2RlQ2hhbmdlIHNvIHRoYXQg aXQgaXMgbm90CisgICAgICAgIHJlLWF0dGFjaGVkIG9uIHRoZSBBWCB0aHJlYWQuCisgICAgICAg IChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUpOiByZW1vdmVTdWJ0 cmVlIGluc3RlYWQgb2YKKyAgICAgICAgcmVtb3ZlTm9kZS4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6On5BWElzb2xhdGVkT2JqZWN0KTogV2hlbiBhbiBJc29sYXRlZE9i amVjdAorICAgICAgICBpcyBkZXN0cm95ZWQsIGl0IG11c3QgaGF2ZSBiZWVuIGRldGFjaGVkIGZy b20gaXRzIHdyYXBwZXIuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpOb2Rl Q2hhbmdlOjpOb2RlQ2hhbmdlKTogQ29uc3RydWN0b3JzIG5vdworICAgICAgICB0YWtlIGFuIElz b2xhdGVkT2JqZWN0IGluc3RlYWQgb2YgYSBSZWYuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkVHJlZTo6cmVtb3ZlTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6 cmVtb3ZlU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQ ZW5kaW5nQ2hhbmdlcyk6IEF0dGFjaCB3cmFwcGVycyBvbmx5IGlmCisgICAgICAgIG5vdCBudWxs LiBUaGUgSXNvbGF0ZWRPYmplY3QgcmVmQ291bnQgbXVzdCBiZSAyIGF0IHRoYXQgcG9pbnQuCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKwog MjAyMC0wMi0xMiAgWW9zaGlha2kgSml0c3VrYXdhICA8eW9zaGlha2kuaml0c3VrYXdhQHNvbnku Y29tPgogCiAgICAgICAgIFtXZWJDcnlwdG9dW0NvbW1vbkNyeXB0b10gSW5jb3JyZWN0IEFFUy1D VFIgd2l0aCBjb3VudGVyTGVuZ3RoIGxvbmdlciB0aGFuIDY0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCAwODZlZjQ0OWQ5YzEyZWI2OGY2 OWRlZDhiMzk4NWZhZjgwNTgwMTBiLi5mN2M0NTBiYjRkMmVkYjBhZDFjMTE3NzViNTY2YmU0NTY5 ZDQyYjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0 Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKQEAgLTMwNzUsOSArMzA3NSwxNSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1E ZWZlcnJlZENhY2hlVXBkYXRlKCkKIHN0YXRpYyBSZWY8QVhJc29sYXRlZE9iamVjdD4gY3JlYXRl SXNvbGF0ZWRUcmVlSGllcmFyY2h5KEFYQ29yZU9iamVjdCYgb2JqZWN0LCBBWElzb2xhdGVkVHJl ZUlEIHRyZWVJRCwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRhY2hXcmFwcGVyLCBWZWN0b3I8QVhJ c29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+JiBub2RlQ2hhbmdlcykKIHsKICAgICBhdXRvIGlzb2xh dGVkT2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKG9iamVjdCwgdHJlZUlELCBwYXJl bnRJRCk7Ci0gICAgbm9kZUNoYW5nZXMuYXBwZW5kKEFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdl KGlzb2xhdGVkT2JqZWN0LCBvYmplY3Qud3JhcHBlcigpKSk7Ci0gICAgaWYgKGF0dGFjaFdyYXBw ZXIpCisgICAgaWYgKGF0dGFjaFdyYXBwZXIpIHsKICAgICAgICAgaXNvbGF0ZWRPYmplY3QtPmF0 dGFjaFBsYXRmb3JtV3JhcHBlcihvYmplY3Qud3JhcHBlcigpKTsKKyAgICAgICAgLy8gU2luY2Ug dGhpcyBvYmplY3QgaGFzIGFscmVhZHkgYW4gYXR0YWNoZWQgd3JhcHBlciwgc2V0IHRoZSB3cmFw cGVyCisgICAgICAgIC8vIGluIHRoZSBOb2RlQ2hhbmdlIHRvIG51bGwgc28gdGhhdCBpdCBpcyBu b3QgcmUtYXR0YWNoZWQuCisgICAgICAgIG5vZGVDaGFuZ2VzLmFwcGVuZChBWElzb2xhdGVkVHJl ZTo6Tm9kZUNoYW5nZShpc29sYXRlZE9iamVjdCwgbnVsbHB0cikpOworICAgIH0gZWxzZSB7Cisg ICAgICAgIC8vIFNldCB0aGUgd3JhcHBlciBpbiB0aGUgTm9kZUNoYW5nZSBzbyB0aGF0IGl0IGlz IHNldCBvbiB0aGUgQVggdGhyZWFkLgorICAgICAgICBub2RlQ2hhbmdlcy5hcHBlbmQoQVhJc29s YXRlZFRyZWU6Ok5vZGVDaGFuZ2UoaXNvbGF0ZWRPYmplY3QsIG9iamVjdC53cmFwcGVyKCkpKTsK KyAgICB9CiAKICAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkIDogb2JqZWN0LmNoaWxkcmVuKCkp IHsKICAgICAgICAgYXV0byBzdGF0aWNDaGlsZCA9IGNyZWF0ZUlzb2xhdGVkVHJlZUhpZXJhcmNo eSgqY2hpbGQsIHRyZWVJRCwgaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCksIGF0dGFjaFdyYXBw ZXIsIG5vZGVDaGFuZ2VzKTsKQEAgLTMxMjgsNyArMzEzNCw3IEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKEFYQ29yZU9iamVjdCogb2JqZWN0LCBBWE5vdGlmaWNhdGlv biBub3RpCiAgICAgY2FzZSBBWENoZWNrZWRTdGF0ZUNoYW5nZWQ6CiAgICAgY2FzZSBBWENoaWxk cmVuQ2hhbmdlZDoKICAgICBjYXNlIEFYVmFsdWVDaGFuZ2VkOiB7Ci0gICAgICAgIHRyZWUtPnJl bW92ZU5vZGUob2JqZWN0LT5vYmplY3RJRCgpKTsKKyAgICAgICAgdHJlZS0+cmVtb3ZlU3VidHJl ZShvYmplY3QtPm9iamVjdElEKCkpOwogICAgICAgICBhdXRvKiBwYXJlbnQgPSBvYmplY3QtPnBh cmVudE9iamVjdCgpOwogICAgICAgICBBWElEIHBhcmVudElEID0gcGFyZW50ID8gcGFyZW50LT5v YmplY3RJRCgpIDogSW52YWxpZEFYSUQ7CiAgICAgICAgIFZlY3RvcjxBWElzb2xhdGVkVHJlZTo6 Tm9kZUNoYW5nZT4gbm9kZUNoYW5nZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4 IDE5N2RmNDU0MDc0MzViNzU3NTcwY2I4YTg3ZmVkYTllMzQ4YjE1Y2QuLmNlM2JlZDRlZTYwZTdj MzRiMjQ3Y2ExYzEzZjNhNjliYWJmYTQ0MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CkBAIC00OCw3ICs0OCwxMCBAQCBSZWY8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZE9iamVj dDo6Y3JlYXRlKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBBWElzb2xhdGVkVAogICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IEFYSXNvbGF0ZWRPYmplY3Qob2JqZWN0LCB0cmVlSUQsIHBhcmVudElEKSk7 CiB9CiAKLUFYSXNvbGF0ZWRPYmplY3Q6On5BWElzb2xhdGVkT2JqZWN0KCkgPSBkZWZhdWx0Owor QVhJc29sYXRlZE9iamVjdDo6fkFYSXNvbGF0ZWRPYmplY3QoKQoreworICAgIEFTU0VSVCghd3Jh cHBlcigpKTsKK30KIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRl RGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QpCiB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmgKaW5kZXggNzFjMWMyYzUyYzlkOWU1MjVkNDgxZmFhODEzMGQ5MWM1MzFmNzU4Zi4u YWI4MTViZWFmOWYwY2FlYjFlMTk0YWJjMTMxZmZiNjdiN2NlY2UzNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuaApAQCAtNDYsNiArNDYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBB WElzb2xhdGVkVHJlZTsKIAogY2xhc3MgQVhJc29sYXRlZE9iamVjdCBmaW5hbCA6IHB1YmxpYyBB WENvcmVPYmplY3QgeworICAgIGZyaWVuZCBjbGFzcyBBWElzb2xhdGVkVHJlZTsKIHB1YmxpYzoK ICAgICBzdGF0aWMgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGNyZWF0ZShBWENvcmVPYmplY3QmLCBB WElzb2xhdGVkVHJlZUlELCBBWElEIHBhcmVudElEKTsKICAgICB+QVhJc29sYXRlZE9iamVjdCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IGEzMDkwZDI3ZTEwYzVkYmQ1YmQyYzc2Yjk0 MTU1MjAxM2JlZjA5NmEuLjZlZDE1MmM3YzQ0ZDIyNjRhYjU2NTc1NzMxNmFkNWY4YzlmZGU1MDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTQyLDE0ICs0MiwxNCBAQCBzdGF0aWMgdW5z aWduZWQgbmV3VHJlZUlEKCkKICAgICByZXR1cm4gKytzX2N1cnJlbnRUcmVlSUQ7CiB9CiAKLUFY SXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlOjpOb2RlQ2hhbmdlKGNvbnN0IFJlZjxBWElzb2xhdGVk T2JqZWN0PiYgaXNvbGF0ZWRPYmplY3QsIEFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyKiB3cmFw cGVyKQotICAgIDogbV9pc29sYXRlZE9iamVjdChpc29sYXRlZE9iamVjdC5jb3B5UmVmKCkpCitB WElzb2xhdGVkVHJlZTo6Tm9kZUNoYW5nZTo6Tm9kZUNoYW5nZShBWElzb2xhdGVkT2JqZWN0JiBp c29sYXRlZE9iamVjdCwgQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIqIHdyYXBwZXIpCisgICAg OiBtX2lzb2xhdGVkT2JqZWN0KGlzb2xhdGVkT2JqZWN0KQogICAgICwgbV93cmFwcGVyKHdyYXBw ZXIpCiB7CiB9CiAKIEFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlOjpOb2RlQ2hhbmdlKGNvbnN0 IE5vZGVDaGFuZ2UmIG90aGVyKQotICAgIDogbV9pc29sYXRlZE9iamVjdChvdGhlci5tX2lzb2xh dGVkT2JqZWN0LmNvcHlSZWYoKSkKKyAgICA6IG1faXNvbGF0ZWRPYmplY3Qob3RoZXIubV9pc29s YXRlZE9iamVjdC5nZXQoKSkKICAgICAsIG1fd3JhcHBlcihvdGhlci5tX3dyYXBwZXIpCiB7CiB9 CkBAIC0xNjQsOSArMTY0LDI1IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnNldEZvY3VzZWROb2Rl SUQoQVhJRCBheElEKQogdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlTm9kZShBWElEIGF4SUQp CiB7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKKyAgICBBU1NF UlQobV9yZWFkZXJUaHJlYWROb2RlTWFwLmNvbnRhaW5zKGF4SUQpKTsKICAgICBtX3BlbmRpbmdS ZW1vdmFscy5hcHBlbmQoYXhJRCk7CiB9CiAKK3ZvaWQgQVhJc29sYXRlZFRyZWU6OnJlbW92ZVN1 YnRyZWUoQVhJRCBheElEKQoreworICAgIExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dM b2NrIH07CisgICAgbV9wZW5kaW5nUmVtb3ZhbHMuYXBwZW5kKGF4SUQpOworCisgICAgYXV0byBv YmplY3QgPSBub2RlRm9ySUQoYXhJRCk7CisgICAgaWYgKCFvYmplY3QpCisgICAgICAgIHJldHVy bjsKKyAgICBhdXRvIGNoaWxkcmVuSURzKG9iamVjdC0+bV9jaGlsZHJlbklEcyk7CisgICAgbG9j a2VyLnVubG9ja0Vhcmx5KCk7CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkSUQgOiBjaGls ZHJlbklEcykKKyAgICAgICAgcmVtb3ZlU3VidHJlZShjaGlsZElEKTsKK30KKwogdm9pZCBBWElz b2xhdGVkVHJlZTo6YXBwZW5kTm9kZUNoYW5nZXMoY29uc3QgVmVjdG9yPE5vZGVDaGFuZ2U+JiBs b2cpCiB7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKQEAgLTE4 MSwxNyArMTk3LDIyIEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMo KQogCiAgICAgbV9mb2N1c2VkTm9kZUlEID0gbV9wZW5kaW5nRm9jdXNlZE5vZGVJRDsKIAotICAg IGZvciAoY29uc3QgYXV0byYgaXRlbSA6IG1fcGVuZGluZ1JlbW92YWxzKSB7Ci0gICAgICAgIGlm IChhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChpdGVtKSkKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGF4 SUQgOiBtX3BlbmRpbmdSZW1vdmFscykgeworICAgICAgICBpZiAoYXV0byBvYmplY3QgPSBub2Rl Rm9ySUQoYXhJRCkpCiAgICAgICAgICAgICBvYmplY3QtPmRldGFjaChBY2Nlc3NpYmlsaXR5RGV0 YWNobWVudFR5cGU6OkVsZW1lbnREZXN0cm95ZWQpOwotICAgICAgICBtX3JlYWRlclRocmVhZE5v ZGVNYXAucmVtb3ZlKGl0ZW0pOworICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAucmVtb3Zl KGF4SUQpOwogICAgIH0KICAgICBtX3BlbmRpbmdSZW1vdmFscy5jbGVhcigpOwogCi0gICAgZm9y IChhdXRvJiBpdGVtIDogbV9wZW5kaW5nQXBwZW5kcykgewotICAgICAgICBBU1NFUlQoaXRlbS5t X3dyYXBwZXIpOwotICAgICAgICBpdGVtLm1faXNvbGF0ZWRPYmplY3QtPmF0dGFjaFBsYXRmb3Jt V3JhcHBlcihpdGVtLm1fd3JhcHBlcik7Ci0gICAgICAgIG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5h ZGQoaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpLCBpdGVtLm1faXNvbGF0ZWRPYmpl Y3QuY29weVJlZigpKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZW0gOiBtX3BlbmRpbmdBcHBl bmRzKSB7CisgICAgICAgIEFTU0VSVCghbV9yZWFkZXJUaHJlYWROb2RlTWFwLmNvbnRhaW5zKGl0 ZW0ubV9pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSkKKyAgICAgICAgICAgIHx8IGl0ZW0ubV9p c29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSA9PSBtX3Jvb3ROb2RlSUQpOworCisgICAgICAgIGlm IChpdGVtLm1fd3JhcHBlcikKKyAgICAgICAgICAgIGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+YXR0 YWNoUGxhdGZvcm1XcmFwcGVyKGl0ZW0ubV93cmFwcGVyKTsKKworICAgICAgICBtX3JlYWRlclRo cmVhZE5vZGVNYXAuYWRkKGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSwgaXRlbS5t X2lzb2xhdGVkT2JqZWN0LmdldCgpKTsKKyAgICAgICAgQVNTRVJUKG1fcmVhZGVyVGhyZWFkTm9k ZU1hcC5nZXQoaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpKS0+cmVmQ291bnQoKSA9 PSAyKTsKICAgICB9CiAgICAgbV9wZW5kaW5nQXBwZW5kcy5jbGVhcigpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRUcmVlLmgKaW5kZXggMDAxODdkMDk3NTQzMjI1MDg0NzgxNWQ2ZWRhYzkzMzdmMTcwZDFjNS4u YmI4ZjBkMzg4ZTA2NjA0NGE1MmMzM2Y2ZWViNjVjZTE5MzdkMWIxMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5oCkBAIC02NCwxMyArNjQsMTQgQEAgcHVibGljOgogICAgIHN0cnVjdCBOb2RlQ2hhbmdl IHsKICAgICAgICAgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IG1faXNvbGF0ZWRPYmplY3Q7CiAgICAg ICAgIEFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyKiBtX3dyYXBwZXI7Ci0gICAgICAgIE5vZGVD aGFuZ2UoY29uc3QgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+JiwgQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXIqKTsKKyAgICAgICAgTm9kZUNoYW5nZShBWElzb2xhdGVkT2JqZWN0JiwgQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIqKTsKICAgICAgICAgTm9kZUNoYW5nZShjb25zdCBOb2RlQ2hhbmdl Jik7CiAgICAgfTsKIAogICAgIC8vIENhbGwgb24gbWFpbiB0aHJlYWQKICAgICB2b2lkIGFwcGVu ZE5vZGVDaGFuZ2VzKGNvbnN0IFZlY3RvcjxOb2RlQ2hhbmdlPiYpOwogICAgIHZvaWQgcmVtb3Zl Tm9kZShBWElEKTsKKyAgICB2b2lkIHJlbW92ZVN1YnRyZWUoQVhJRCk7CiAKICAgICB2b2lkIHNl dFJvb3ROb2RlKFJlZjxBWElzb2xhdGVkT2JqZWN0PiYpOwogICAgIHZvaWQgc2V0Rm9jdXNlZE5v ZGVJRChBWElEKTsK 390775 2020-02-14 09:23:22 -0800 2020-02-14 11:22:38 -0800 Patch bug-207759-20200214122321.patch text/plain 9563 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzljYzc5MDhlOTUyOWFj YWRmOWRjNmVkOTFlZTQ0MzI5ODIxMmQzMy4uOGY2ZjlkOTRjNmJiZjczMzg2N2QyODlmNTA0ZTEw MzEzNjI3MzkzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAyLTE0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBXaGVuIHVwZGF0 aW5nIGEgc3VidHJlZSBvZiB0aGUgSXNvbGF0ZWRUcmVlLCBmaXJzdCByZW1vdmUgdGhlIGVudGly ZSBzdWJ0cmVlLCBub3QganVzdCB0aGUgc3VidHJlZSByb290LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NzU5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQ2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgV2hlbiB1cGRhdGluZyBhbiBJc29sYXRlZFRy ZWUgc3VidHJlZSwgd2Ugd2VyZSByZW1vdmluZyBqdXN0IHRoZSByb290CisgICAgICAgIG9mIHRo ZSBzdWJ0cmVlLiBBZGRlZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlU3VidHJlZSB0aGF0IGlzIG5v dyB1c2VkIGluCisgICAgICAgIHVwZGF0ZUlzb2xhdGVkVHJlZS4KKworICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVJc29s YXRlZFRyZWVIaWVyYXJjaHkpOiBJZiB0aGUgd3JhcHBlciBpcyBhdHRhY2hlZAorICAgICAgICBk dXJpbmcgY3JlYXRpb24sIHNldCBpdCB0byBudWxsIGluIHRoZSBOb2RlQ2hhbmdlIHNvIHRoYXQg aXQgaXMgbm90CisgICAgICAgIHJlLWF0dGFjaGVkIG9uIHRoZSBBWCB0aHJlYWQuCisgICAgICAg IChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUpOiByZW1vdmVTdWJ0 cmVlIGluc3RlYWQgb2YKKyAgICAgICAgcmVtb3ZlTm9kZS4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6On5BWElzb2xhdGVkT2JqZWN0KTogV2hlbiBhbiBJc29sYXRlZE9i amVjdAorICAgICAgICBpcyBkZXN0cm95ZWQsIGl0IG11c3QgaGF2ZSBiZWVuIGRldGFjaGVkIGZy b20gaXRzIHdyYXBwZXIuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpOb2Rl Q2hhbmdlOjpOb2RlQ2hhbmdlKTogQ29uc3RydWN0b3JzIG5vdworICAgICAgICB0YWtlIGFuIElz b2xhdGVkT2JqZWN0IGluc3RlYWQgb2YgYSBSZWYuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkVHJlZTo6cmVtb3ZlTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6 cmVtb3ZlU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQ ZW5kaW5nQ2hhbmdlcyk6IEF0dGFjaCB3cmFwcGVycyBvbmx5IGlmCisgICAgICAgIG5vdCBudWxs LiBUaGUgSXNvbGF0ZWRPYmplY3QgcmVmQ291bnQgbXVzdCBiZSAyIGF0IHRoYXQgcG9pbnQuCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKwog MjAyMC0wMi0xMiAgWW9zaGlha2kgSml0c3VrYXdhICA8eW9zaGlha2kuaml0c3VrYXdhQHNvbnku Y29tPgogCiAgICAgICAgIFtXZWJDcnlwdG9dW0NvbW1vbkNyeXB0b10gSW5jb3JyZWN0IEFFUy1D VFIgd2l0aCBjb3VudGVyTGVuZ3RoIGxvbmdlciB0aGFuIDY0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCAwODZlZjQ0OWQ5YzEyZWI2OGY2 OWRlZDhiMzk4NWZhZjgwNTgwMTBiLi5mN2M0NTBiYjRkMmVkYjBhZDFjMTE3NzViNTY2YmU0NTY5 ZDQyYjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0 Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKQEAgLTMwNzUsOSArMzA3NSwxNSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1E ZWZlcnJlZENhY2hlVXBkYXRlKCkKIHN0YXRpYyBSZWY8QVhJc29sYXRlZE9iamVjdD4gY3JlYXRl SXNvbGF0ZWRUcmVlSGllcmFyY2h5KEFYQ29yZU9iamVjdCYgb2JqZWN0LCBBWElzb2xhdGVkVHJl ZUlEIHRyZWVJRCwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRhY2hXcmFwcGVyLCBWZWN0b3I8QVhJ c29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+JiBub2RlQ2hhbmdlcykKIHsKICAgICBhdXRvIGlzb2xh dGVkT2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKG9iamVjdCwgdHJlZUlELCBwYXJl bnRJRCk7Ci0gICAgbm9kZUNoYW5nZXMuYXBwZW5kKEFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdl KGlzb2xhdGVkT2JqZWN0LCBvYmplY3Qud3JhcHBlcigpKSk7Ci0gICAgaWYgKGF0dGFjaFdyYXBw ZXIpCisgICAgaWYgKGF0dGFjaFdyYXBwZXIpIHsKICAgICAgICAgaXNvbGF0ZWRPYmplY3QtPmF0 dGFjaFBsYXRmb3JtV3JhcHBlcihvYmplY3Qud3JhcHBlcigpKTsKKyAgICAgICAgLy8gU2luY2Ug dGhpcyBvYmplY3QgaGFzIGFscmVhZHkgYW4gYXR0YWNoZWQgd3JhcHBlciwgc2V0IHRoZSB3cmFw cGVyCisgICAgICAgIC8vIGluIHRoZSBOb2RlQ2hhbmdlIHRvIG51bGwgc28gdGhhdCBpdCBpcyBu b3QgcmUtYXR0YWNoZWQuCisgICAgICAgIG5vZGVDaGFuZ2VzLmFwcGVuZChBWElzb2xhdGVkVHJl ZTo6Tm9kZUNoYW5nZShpc29sYXRlZE9iamVjdCwgbnVsbHB0cikpOworICAgIH0gZWxzZSB7Cisg ICAgICAgIC8vIFNldCB0aGUgd3JhcHBlciBpbiB0aGUgTm9kZUNoYW5nZSBzbyB0aGF0IGl0IGlz IHNldCBvbiB0aGUgQVggdGhyZWFkLgorICAgICAgICBub2RlQ2hhbmdlcy5hcHBlbmQoQVhJc29s YXRlZFRyZWU6Ok5vZGVDaGFuZ2UoaXNvbGF0ZWRPYmplY3QsIG9iamVjdC53cmFwcGVyKCkpKTsK KyAgICB9CiAKICAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkIDogb2JqZWN0LmNoaWxkcmVuKCkp IHsKICAgICAgICAgYXV0byBzdGF0aWNDaGlsZCA9IGNyZWF0ZUlzb2xhdGVkVHJlZUhpZXJhcmNo eSgqY2hpbGQsIHRyZWVJRCwgaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCksIGF0dGFjaFdyYXBw ZXIsIG5vZGVDaGFuZ2VzKTsKQEAgLTMxMjgsNyArMzEzNCw3IEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKEFYQ29yZU9iamVjdCogb2JqZWN0LCBBWE5vdGlmaWNhdGlv biBub3RpCiAgICAgY2FzZSBBWENoZWNrZWRTdGF0ZUNoYW5nZWQ6CiAgICAgY2FzZSBBWENoaWxk cmVuQ2hhbmdlZDoKICAgICBjYXNlIEFYVmFsdWVDaGFuZ2VkOiB7Ci0gICAgICAgIHRyZWUtPnJl bW92ZU5vZGUob2JqZWN0LT5vYmplY3RJRCgpKTsKKyAgICAgICAgdHJlZS0+cmVtb3ZlU3VidHJl ZShvYmplY3QtPm9iamVjdElEKCkpOwogICAgICAgICBhdXRvKiBwYXJlbnQgPSBvYmplY3QtPnBh cmVudE9iamVjdCgpOwogICAgICAgICBBWElEIHBhcmVudElEID0gcGFyZW50ID8gcGFyZW50LT5v YmplY3RJRCgpIDogSW52YWxpZEFYSUQ7CiAgICAgICAgIFZlY3RvcjxBWElzb2xhdGVkVHJlZTo6 Tm9kZUNoYW5nZT4gbm9kZUNoYW5nZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4 IDE5N2RmNDU0MDc0MzViNzU3NTcwY2I4YTg3ZmVkYTllMzQ4YjE1Y2QuLmNlM2JlZDRlZTYwZTdj MzRiMjQ3Y2ExYzEzZjNhNjliYWJmYTQ0MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CkBAIC00OCw3ICs0OCwxMCBAQCBSZWY8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZE9iamVj dDo6Y3JlYXRlKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBBWElzb2xhdGVkVAogICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IEFYSXNvbGF0ZWRPYmplY3Qob2JqZWN0LCB0cmVlSUQsIHBhcmVudElEKSk7 CiB9CiAKLUFYSXNvbGF0ZWRPYmplY3Q6On5BWElzb2xhdGVkT2JqZWN0KCkgPSBkZWZhdWx0Owor QVhJc29sYXRlZE9iamVjdDo6fkFYSXNvbGF0ZWRPYmplY3QoKQoreworICAgIEFTU0VSVCghd3Jh cHBlcigpKTsKK30KIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRl RGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QpCiB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmgKaW5kZXggNzFjMWMyYzUyYzlkOWU1MjVkNDgxZmFhODEzMGQ5MWM1MzFmNzU4Zi4u YWI4MTViZWFmOWYwY2FlYjFlMTk0YWJjMTMxZmZiNjdiN2NlY2UzNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuaApAQCAtNDYsNiArNDYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBB WElzb2xhdGVkVHJlZTsKIAogY2xhc3MgQVhJc29sYXRlZE9iamVjdCBmaW5hbCA6IHB1YmxpYyBB WENvcmVPYmplY3QgeworICAgIGZyaWVuZCBjbGFzcyBBWElzb2xhdGVkVHJlZTsKIHB1YmxpYzoK ICAgICBzdGF0aWMgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGNyZWF0ZShBWENvcmVPYmplY3QmLCBB WElzb2xhdGVkVHJlZUlELCBBWElEIHBhcmVudElEKTsKICAgICB+QVhJc29sYXRlZE9iamVjdCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IGEzMDkwZDI3ZTEwYzVkYmQ1YmQyYzc2Yjk0 MTU1MjAxM2JlZjA5NmEuLjExNDE1NjdiMDA1MDQyZmRmM2Y2ZGJjNzdhMTg5NTI1NTgzNDEyOWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTQyLDE0ICs0MiwxNCBAQCBzdGF0aWMgdW5z aWduZWQgbmV3VHJlZUlEKCkKICAgICByZXR1cm4gKytzX2N1cnJlbnRUcmVlSUQ7CiB9CiAKLUFY SXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlOjpOb2RlQ2hhbmdlKGNvbnN0IFJlZjxBWElzb2xhdGVk T2JqZWN0PiYgaXNvbGF0ZWRPYmplY3QsIEFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyKiB3cmFw cGVyKQotICAgIDogbV9pc29sYXRlZE9iamVjdChpc29sYXRlZE9iamVjdC5jb3B5UmVmKCkpCitB WElzb2xhdGVkVHJlZTo6Tm9kZUNoYW5nZTo6Tm9kZUNoYW5nZShBWElzb2xhdGVkT2JqZWN0JiBp c29sYXRlZE9iamVjdCwgQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIqIHdyYXBwZXIpCisgICAg OiBtX2lzb2xhdGVkT2JqZWN0KGlzb2xhdGVkT2JqZWN0KQogICAgICwgbV93cmFwcGVyKHdyYXBw ZXIpCiB7CiB9CiAKIEFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlOjpOb2RlQ2hhbmdlKGNvbnN0 IE5vZGVDaGFuZ2UmIG90aGVyKQotICAgIDogbV9pc29sYXRlZE9iamVjdChvdGhlci5tX2lzb2xh dGVkT2JqZWN0LmNvcHlSZWYoKSkKKyAgICA6IG1faXNvbGF0ZWRPYmplY3Qob3RoZXIubV9pc29s YXRlZE9iamVjdC5nZXQoKSkKICAgICAsIG1fd3JhcHBlcihvdGhlci5tX3dyYXBwZXIpCiB7CiB9 CkBAIC0xNjQsOSArMTY0LDI1IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnNldEZvY3VzZWROb2Rl SUQoQVhJRCBheElEKQogdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3ZlTm9kZShBWElEIGF4SUQp CiB7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKKyAgICBBU1NF UlQobV9yZWFkZXJUaHJlYWROb2RlTWFwLmNvbnRhaW5zKGF4SUQpKTsKICAgICBtX3BlbmRpbmdS ZW1vdmFscy5hcHBlbmQoYXhJRCk7CiB9CiAKK3ZvaWQgQVhJc29sYXRlZFRyZWU6OnJlbW92ZVN1 YnRyZWUoQVhJRCBheElEKQoreworICAgIExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dM b2NrIH07CisgICAgbV9wZW5kaW5nUmVtb3ZhbHMuYXBwZW5kKGF4SUQpOworCisgICAgYXV0byBv YmplY3QgPSBub2RlRm9ySUQoYXhJRCk7CisgICAgaWYgKCFvYmplY3QpCisgICAgICAgIHJldHVy bjsKKyAgICBhdXRvIGNoaWxkcmVuSURzKG9iamVjdC0+bV9jaGlsZHJlbklEcyk7CisgICAgbG9j a2VyLnVubG9ja0Vhcmx5KCk7CisKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkSUQgOiBjaGls ZHJlbklEcykKKyAgICAgICAgcmVtb3ZlU3VidHJlZShjaGlsZElEKTsKK30KKwogdm9pZCBBWElz b2xhdGVkVHJlZTo6YXBwZW5kTm9kZUNoYW5nZXMoY29uc3QgVmVjdG9yPE5vZGVDaGFuZ2U+JiBs b2cpCiB7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKQEAgLTE4 MSwxNyArMTk3LDI1IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMo KQogCiAgICAgbV9mb2N1c2VkTm9kZUlEID0gbV9wZW5kaW5nRm9jdXNlZE5vZGVJRDsKIAotICAg IGZvciAoY29uc3QgYXV0byYgaXRlbSA6IG1fcGVuZGluZ1JlbW92YWxzKSB7Ci0gICAgICAgIGlm IChhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChpdGVtKSkKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGF4 SUQgOiBtX3BlbmRpbmdSZW1vdmFscykgeworICAgICAgICBpZiAoYXV0byBvYmplY3QgPSBub2Rl Rm9ySUQoYXhJRCkpCiAgICAgICAgICAgICBvYmplY3QtPmRldGFjaChBY2Nlc3NpYmlsaXR5RGV0 YWNobWVudFR5cGU6OkVsZW1lbnREZXN0cm95ZWQpOwotICAgICAgICBtX3JlYWRlclRocmVhZE5v ZGVNYXAucmVtb3ZlKGl0ZW0pOworICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAucmVtb3Zl KGF4SUQpOwogICAgIH0KICAgICBtX3BlbmRpbmdSZW1vdmFscy5jbGVhcigpOwogCi0gICAgZm9y IChhdXRvJiBpdGVtIDogbV9wZW5kaW5nQXBwZW5kcykgewotICAgICAgICBBU1NFUlQoaXRlbS5t X3dyYXBwZXIpOwotICAgICAgICBpdGVtLm1faXNvbGF0ZWRPYmplY3QtPmF0dGFjaFBsYXRmb3Jt V3JhcHBlcihpdGVtLm1fd3JhcHBlcik7Ci0gICAgICAgIG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5h ZGQoaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpLCBpdGVtLm1faXNvbGF0ZWRPYmpl Y3QuY29weVJlZigpKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZW0gOiBtX3BlbmRpbmdBcHBl bmRzKSB7CisgICAgICAgIEFTU0VSVCghbV9yZWFkZXJUaHJlYWROb2RlTWFwLmNvbnRhaW5zKGl0 ZW0ubV9pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSkKKyAgICAgICAgICAgIHx8IGl0ZW0ubV9p c29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSA9PSBtX3Jvb3ROb2RlSUQpOworCisgICAgICAgIGlm IChpdGVtLm1fd3JhcHBlcikKKyAgICAgICAgICAgIGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+YXR0 YWNoUGxhdGZvcm1XcmFwcGVyKGl0ZW0ubV93cmFwcGVyKTsKKworICAgICAgICBtX3JlYWRlclRo cmVhZE5vZGVNYXAuYWRkKGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSwgaXRlbS5t X2lzb2xhdGVkT2JqZWN0LmdldCgpKTsKKyAgICAgICAgLy8gVGhlIHJlZmVyZW5jZSBjb3VudCBv ZiB0aGUganVzdCBhZGRlZCBJc29sYXRlZE9iamVjdCBtdXN0IGJlIDIKKyAgICAgICAgLy8gYmVj YXVzZSBpdCBpcyByZWZlcmVuY2VkIGJ5IG1fcmVhZGVyVGhyZWFkTm9kZU1hcCBhbmQgbV9wZW5k aW5nQXBwZW5kcy4KKyAgICAgICAgLy8gV2hlbiBtX3BlbmRpbmdBcHBlbmRzIGlzIGNsZWFyZWQs IHRoZSBvYmplY3Qgd2lsbCBiZSBoZWxkIG9ubHkgYnkgbV9yZWFkZXJUaHJlYWROb2RlTWFwLgor ICAgICAgICBBU1NFUlQobV9yZWFkZXJUaHJlYWROb2RlTWFwLmdldChpdGVtLm1faXNvbGF0ZWRP YmplY3QtPm9iamVjdElEKCkpLT5yZWZDb3VudCgpID09IDIpOwogICAgIH0KICAgICBtX3BlbmRp bmdBcHBlbmRzLmNsZWFyKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCAwMDE4N2QwOTc1 NDMyMjUwODQ3ODE1ZDZlZGFjOTMzN2YxNzBkMWM1Li5iYjhmMGQzODhlMDY2MDQ0YTUyYzMzZjZl ZWI2NWNlMTkzN2QxYjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTY0LDEzICs2NCwxNCBA QCBwdWJsaWM6CiAgICAgc3RydWN0IE5vZGVDaGFuZ2UgewogICAgICAgICBSZWY8QVhJc29sYXRl ZE9iamVjdD4gbV9pc29sYXRlZE9iamVjdDsKICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXIqIG1fd3JhcHBlcjsKLSAgICAgICAgTm9kZUNoYW5nZShjb25zdCBSZWY8QVhJc29sYXRl ZE9iamVjdD4mLCBBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciopOworICAgICAgICBOb2RlQ2hh bmdlKEFYSXNvbGF0ZWRPYmplY3QmLCBBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciopOwogICAg ICAgICBOb2RlQ2hhbmdlKGNvbnN0IE5vZGVDaGFuZ2UmKTsKICAgICB9OwogCiAgICAgLy8gQ2Fs bCBvbiBtYWluIHRocmVhZAogICAgIHZvaWQgYXBwZW5kTm9kZUNoYW5nZXMoY29uc3QgVmVjdG9y PE5vZGVDaGFuZ2U+Jik7CiAgICAgdm9pZCByZW1vdmVOb2RlKEFYSUQpOworICAgIHZvaWQgcmVt b3ZlU3VidHJlZShBWElEKTsKIAogICAgIHZvaWQgc2V0Um9vdE5vZGUoUmVmPEFYSXNvbGF0ZWRP YmplY3Q+Jik7CiAgICAgdm9pZCBzZXRGb2N1c2VkTm9kZUlEKEFYSUQpOwo=