213124 2020-06-12 07:10:23 -0700 In isolated tree mode 2, AXIsolatedObject::setChildrenIDs should be called only on secondary thread. 2020-06-12 12:30:19 -0700 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 darin dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1661926 0 andresg_22 2020-06-12 07:10:23 -0700 In isolated tree mode 2, AXIsolatedObject::setChildrenIDs should be called only on secondary thread. 1661931 1 401727 andresg_22 2020-06-12 07:25:53 -0700 Created attachment 401727 Patch 1661994 2 401727 cfleizach 2020-06-12 09:56:04 -0700 Comment on attachment 401727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401727&action=review > Source/WebCore/ChangeLog:11 > + - The unsigned int range for object IDs was being overrun for large number of objects like in the case of the sample page in <rdar://problem/59331146>. INcreased the size of AXID to size_t. INcreased -> Increased > Source/WebCore/accessibility/AccessibilityObjectInterface.h:75 > +typedef size_t AXID; should we make this a uint64_t 1662036 3 401750 andresg_22 2020-06-12 10:54:13 -0700 Created attachment 401750 Patch 1662037 4 401751 andresg_22 2020-06-12 10:55:52 -0700 Created attachment 401751 Patch 1662048 5 andresg_22 2020-06-12 11:11:28 -0700 (In reply to chris fleizach from comment #2) > Comment on attachment 401727 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401727&action=review > > > Source/WebCore/ChangeLog:11 > > + - The unsigned int range for object IDs was being overrun for large number of objects like in the case of the sample page in <rdar://problem/59331146>. INcreased the size of AXID to size_t. > > INcreased -> Increased Fixed. > > > Source/WebCore/accessibility/AccessibilityObjectInterface.h:75 > > +typedef size_t AXID; > > should we make this a uint64_t size_t is guarantied the largest unsigned integer range the system can handle. But we can make it a uint64_t if we prefer to specify the size explicitly. 1662087 6 ews-feeder 2020-06-12 12:25:00 -0700 Committed r262966: <https://trac.webkit.org/changeset/262966> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401751. 1662088 7 webkit-bug-importer 2020-06-12 12:25:19 -0700 <rdar://problem/64307457> 1662091 8 401751 darin 2020-06-12 12:30:19 -0700 Comment on attachment 401751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401751&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:68 > + void setChildrenIDs(Vector<AXID>&& childrenIDs) > + { > + // FIXME: The following ASSERT should be met but it is commented out at the > + // moment because of <rdar://problem/63985646> After calling _AXUIElementUseSecondaryAXThread(true), > + // still receives client request on main thread. > + // ASSERT(axObjectCache()->canUseSecondaryAXThread() ? !isMainThread() : isMainThread()); > + m_childrenIDs = childrenIDs; > + } Style thought for the future: Generally seems like a poor pattern to move code from .cpp files to headers without a strong motivation; long term across many source files it likely makes our code slower to compile so we better be sure there is a benefit. Also, larger class definitions with function bodies can make it harder to see the design of the class. I see, thought, that *this* is the kind of simple setter that can be super efficient so it’s tempting to make it inlined. Even if doing that, I think it’s better style to do that outside the class definition so it’s easier to refactor (move to and from the .cpp file). And I think that global optimization may be effective at inlining even when we don’t move things to headers. 401727 2020-06-12 07:25:53 -0700 2020-06-12 10:54:11 -0700 Patch bug-213124-20200612102552.patch text/plain 6047 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTljOGNlNWFmYWI4NTA1 NWE3ODZjZjlhNzc4YWY3MDkwNjMwOTc5MC4uZTU5NDY3NmNlZDlkY2Y4MjJjMmM1ODc3NWY4ZTM3 MjJmNDYwM2RmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTEyICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUgMiwgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMgc2hvdWxkIGJl IGNhbGxlZCBvbmx5IG9uIHNlY29uZGFyeSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxMjQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgIC0gQVhJc29sYXRlZFRyZWU6OmNyZWF0ZVN1YnRyZWUgd2FzIGNhbGxpbmcgQVhJc29s YXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMgd2hpY2ggc2hvdWxkIGJlIGNhbGxlZCBvbmx5IG9u IHRoZSBzZWNvbmRhcnkgdGhyZWFkLiBOb3cgaXQgaXMgcXVldWVpbmcgdGhlIGNoaWxkcmVuIHVw ZGF0ZSB1bmRlciBsb2NrLgorICAgICAgICAtIFRoZSB1bnNpZ25lZCBpbnQgcmFuZ2UgZm9yIG9i amVjdCBJRHMgd2FzIGJlaW5nIG92ZXJydW4gZm9yIGxhcmdlIG51bWJlciBvZiBvYmplY3RzIGxp a2UgaW4gdGhlIGNhc2Ugb2YgdGhlIHNhbXBsZSBwYWdlIGluIDxyZGFyOi8vcHJvYmxlbS81OTMz MTE0Nj4uIElOY3JlYXNlZCB0aGUgc2l6ZSBvZiBBWElEIHRvIHNpemVfdC4KKyAgICAgICAgLSBC ZXR0ZXIgaGFuZGxlIHRoZSBjYXNlIG9mIGludmFsaWQgb2JqZWN0IElEcywgYWx0aG91Z2ggdGhp cyBuZWVkcyBtb3JlIHdvcmssIHNpbmNlIHdlIHNob3VsZCBuZXZlciBlbmNvdW50ZXIgdGhpcyBj YXNlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmg6IEFYSUQgYXJlIG5vdyBzaXplX3QgaW5zdGVhZCBvZiB1bnNpZ25lZCBpbnRzLgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRDaGlsZHJlbklEcyk6IElubGlu ZWQgaW4gaGVhZGVyLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6Y3JlYXRl U3VidHJlZSk6CisKIDIwMjAtMDYtMDUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGln YWxpYS5jb20+CiAKICAgICAgICAgW1dlYlhSXSBSZWZhY3RvciBPcGVuWFIgcGxhdGZvcm0gY29k ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3RJbnRlcmZhY2UuaAppbmRleCA5ZjUxYzZmNmVkMzM4ZDMyM2YwZDUyMzA1YWY1 ZjdlNmU0ZmZhYzZlLi42MWExMWJiNDNiNjgwZjBlNmY0YzIyNzliMWEyODcxYWI3Njc2YWYzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmpl Y3RJbnRlcmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3RJbnRlcmZhY2UuaApAQCAtNzIsNyArNzIsNyBAQCBjbGFzcyBBY2Nlc3NpYmls aXR5U2Nyb2xsVmlldzsKIHN0cnVjdCBBY2Nlc3NpYmlsaXR5VGV4dDsKIHN0cnVjdCBTY3JvbGxS ZWN0VG9WaXNpYmxlT3B0aW9uczsKIAotdHlwZWRlZiB1bnNpZ25lZCBBWElEOwordHlwZWRlZiBz aXplX3QgQVhJRDsKIGV4dGVybiBjb25zdCBBWElEIEludmFsaWRBWElEOwogCiBlbnVtIGNsYXNz IEFjY2Vzc2liaWxpdHlSb2xlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggODQ4 Y2Y1ZjgyODY2NjkxN2Q2ZDk3YmJjNTkyMTQwMjM5OTFlODU5ZC4uMDJlODY3YzQ1YTAwMDEwOTg3 YTdjZDliM2M4NWQ3OWE2NWRkMWY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAg LTQ0LDcgKzQ0LDEyIEBAIEFYSXNvbGF0ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QoQVhDb3Jl T2JqZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlECiAgICAgQVNTRVJUKGlzTWFp blRocmVhZCgpKTsKICAgICBpZiAoYXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JJ RChtX3RyZWVJRCkpCiAgICAgICAgIG1fY2FjaGVkVHJlZSA9IHRyZWU7Ci0gICAgaW5pdGlhbGl6 ZUF0dHJpYnV0ZURhdGEob2JqZWN0LCBwYXJlbnRJRCA9PSBJbnZhbGlkQVhJRCk7CisgICAgaWYg KG1faWQgIT0gSW52YWxpZEFYSUQpCisgICAgICAgIGluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKG9i amVjdCwgcGFyZW50SUQgPT0gSW52YWxpZEFYSUQpOworICAgIGVsc2UgeworICAgICAgICAvLyBT aG91bGQgbmV2ZXIgaGFwcGVuIHVuZGVyIG5vcm1hbCBjaXJjdW1zdGFuY2VzLgorICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CiB9CiAKIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBB WElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRU cmVlSUQgdHJlZUlELCBBWElEIHBhcmVudElEKQpAQCAtNDU2LDEyICs0NjEsNiBAQCB2b2lkIEFY SXNvbGF0ZWRPYmplY3Q6OnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwg QXR0cmlidXRlVmFsdWVWYQogICAgICAgICBtX2F0dHJpYnV0ZU1hcC5zZXQocHJvcGVydHlOYW1l LCB2YWx1ZSk7CiB9CiAKLXZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMoVmVj dG9yPEFYSUQ+JiYgY2hpbGRyZW5JRHMpCi17Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK LSAgICBtX2NoaWxkcmVuSURzID0gY2hpbGRyZW5JRHM7Ci19Ci0KIHZvaWQgQVhJc29sYXRlZE9i amVjdDo6c2V0UGFyZW50KEFYSUQgcGFyZW50KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKaW5kZXggYzQ5NGM0ZWZjNmYzOWJhYTYzNTcxOTRh MmUwYzdmODFmOGEyMmNiYi4uYTk5N2Q1YjkwOWNmMzI1ZTE0ZGM4ZDkyMmU3NzJhNTMxZDc4OTE2 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaApAQCAtNTgsNyArNTgsMTQgQEAgcHVibGljOgog ICAgIGJvb2wgaXNEZXRhY2hlZCgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRQYXJl bnQoQVhJRCk7Ci0gICAgdm9pZCBzZXRDaGlsZHJlbklEcyhWZWN0b3I8QVhJRD4mJik7CisgICAg dm9pZCBzZXRDaGlsZHJlbklEcyhWZWN0b3I8QVhJRD4mJiBjaGlsZHJlbklEcykKKyAgICB7Cisg ICAgICAgIC8vIEZJWE1FOiBUaGUgZm9sbG93aW5nIEFTU0VSVCBzaG91bGQgYmUgbWV0IGJ1dCBp dCBpcyBjb21tZW50ZWQgb3V0IGF0IHRoZQorICAgICAgICAvLyBtb21lbnQgYmVjYXVzZSBvZiA8 cmRhcjovL3Byb2JsZW0vNjM5ODU2NDY+IEFmdGVyIGNhbGxpbmcgX0FYVUlFbGVtZW50VXNlU2Vj b25kYXJ5QVhUaHJlYWQodHJ1ZSksCisgICAgICAgIC8vIHN0aWxsIHJlY2VpdmVzIGNsaWVudCBy ZXF1ZXN0IG9uIG1haW4gdGhyZWFkLgorICAgICAgICAvLyBBU1NFUlQoYXhPYmplY3RDYWNoZSgp LT5jYW5Vc2VTZWNvbmRhcnlBWFRocmVhZCgpID8gIWlzTWFpblRocmVhZCgpIDogaXNNYWluVGhy ZWFkKCkpOworICAgICAgICBtX2NoaWxkcmVuSURzID0gY2hpbGRyZW5JRHM7CisgICAgfQogCiBw cml2YXRlOgogICAgIHZvaWQgZGV0YWNoUmVtb3RlUGFydHMoQWNjZXNzaWJpbGl0eURldGFjaG1l bnRUeXBlKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCBkZWYyNjQxNzAx NDczNzFkMjgxNDU1Y2VlNTRlYzk0ZTk4NmY4NTU0Li5lZDU4ZjEyODVhMTc1YzQ5NTUzNjZlODdj ZWFlZjgzMzk4ZmJkMjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0xODEsNiArMTgx LDEyIEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJl ZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElECiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgp KTsKIAogICAgIGF1dG8gb2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0 LCBtX3RyZWVJRCwgcGFyZW50SUQpOworICAgIGlmIChvYmplY3QtPm9iamVjdElEKCkgPT0gSW52 YWxpZEFYSUQpIHsKKyAgICAgICAgLy8gRWl0aGVyIHRoZSBheE9iamVjdCBoYXMgYW4gaW52YWxp ZCBJRCBvciBzb21ldGhpbmcgZWxzZSB3ZW50IHRlcnJpYmx5IHdyb25nLiBEb24ndCBib3RoZXIg ZG9pbmcgYW55dGhpbmcgZWxzZS4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHJldHVybiBvYmplY3Q7CisgICAgfQorCiAgICAgaWYgKGF0dGFjaFdyYXBwZXIpIHsKICAg ICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3JhcHBlcigpKTsK ICAgICAgICAgLy8gU2luY2UgdGhpcyBvYmplY3QgaGFzIGFscmVhZHkgYW4gYXR0YWNoZWQgd3Jh cHBlciwgc2V0IHRoZSB3cmFwcGVyCkBAIC0xOTcsNyArMjAzLDEwIEBAIFJlZjxBWElzb2xhdGVk T2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2Jq ZWN0LCBBWElECiAgICAgICAgIGNoaWxkcmVuSURzLmFwcGVuZChjaGlsZC0+b2JqZWN0SUQoKSk7 CiAgICAgfQogICAgIG1fbm9kZU1hcC5zZXQob2JqZWN0LT5vYmplY3RJRCgpLCBjaGlsZHJlbklE cyk7Ci0gICAgb2JqZWN0LT5zZXRDaGlsZHJlbklEcyhXVEZNb3ZlKGNoaWxkcmVuSURzKSk7Cisg ICAgeworICAgICAgICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OworICAg ICAgICBtX3BlbmRpbmdDaGlsZHJlblVwZGF0ZXMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKG9iamVj dC0+b2JqZWN0SUQoKSwgY2hpbGRyZW5JRHMpKTsKKyAgICB9CiAKICAgICByZXR1cm4gb2JqZWN0 OwogfQo= 401750 2020-06-12 10:54:13 -0700 2020-06-12 10:55:49 -0700 Patch bug-213124-20200612135412.patch text/plain 6092 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTljOGNlNWFmYWI4NTA1 NWE3ODZjZjlhNzc4YWY3MDkwNjMwOTc5MC4uODgxNDhiYjg5ZTU0NjU2NTc1OTM4YWQ2MDMyOTc2 M2I1NzU4MmU5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTEyICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUgMiwgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMgc2hvdWxkIGJl IGNhbGxlZCBvbmx5IG9uIHNlY29uZGFyeSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxMjQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgIC0gQVhJc29sYXRlZFRyZWU6OmNyZWF0ZVN1YnRyZWUgd2FzIGNhbGxpbmcgQVhJc29s YXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMKKyAgICAgICAgd2hpY2ggc2hvdWxkIGJlIGNhbGxl ZCBvbmx5IG9uIHRoZSBzZWNvbmRhcnkgdGhyZWFkLiBOb3cgaXQgaXMgcXVldWVpbmcKKyAgICAg ICAgdGhlIGNoaWxkcmVuIHVwZGF0ZSB1bmRlciBsb2NrLgorICAgICAgICAtIFRoZSB1bnNpZ25l ZCBpbnQgcmFuZ2UgZm9yIG9iamVjdCBJRHMgd2FzIGJlaW5nIG92ZXJydW4gZm9yIGxhcmdlCisg ICAgICAgIG51bWJlciBvZiBvYmplY3RzIGxpa2UgaW4gdGhlIGNhc2Ugb2YgdGhlIHNhbXBsZSBw YWdlIGluIDxyZGFyOi8vcHJvYmxlbS81OTMzMTE0Nj4uCisgICAgICAgIEluY3JlYXNlZCB0aGUg c2l6ZSBvZiBBWElEIHRvIHNpemVfdC4KKyAgICAgICAgLSBCZXR0ZXIgaGFuZGxlIHRoZSBjYXNl IG9mIGludmFsaWQgb2JqZWN0IElEcywgYWx0aG91Z2ggdGhpcyBuZWVkcworICAgICAgICBtb3Jl IHdvcmssIHNpbmNlIHdlIHNob3VsZCBuZXZlciBlbmNvdW50ZXIgdGhpcyBjYXNlLgorCisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmg6IEFYSUQg YXJlIG5vdyBzaXplX3QgaW5zdGVhZCBvZiB1bnNpZ25lZCBpbnRzLgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdCk6CisgICAgICAgIChXZWJD b3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRDaGlsZHJlbklEcyk6IElubGluZWQgaW4gaGVhZGVy LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZSk6CisK IDIwMjAtMDYtMDUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW1dlYlhSXSBSZWZhY3RvciBPcGVuWFIgcGxhdGZvcm0gY29kZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaAppbmRleCA5ZjUxYzZmNmVkMzM4ZDMyM2YwZDUyMzA1YWY1ZjdlNmU0ZmZhYzZl Li42MWExMWJiNDNiNjgwZjBlNmY0YzIyNzliMWEyODcxYWI3Njc2YWYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaApAQCAtNzIsNyArNzIsNyBAQCBjbGFzcyBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmll dzsKIHN0cnVjdCBBY2Nlc3NpYmlsaXR5VGV4dDsKIHN0cnVjdCBTY3JvbGxSZWN0VG9WaXNpYmxl T3B0aW9uczsKIAotdHlwZWRlZiB1bnNpZ25lZCBBWElEOwordHlwZWRlZiBzaXplX3QgQVhJRDsK IGV4dGVybiBjb25zdCBBWElEIEludmFsaWRBWElEOwogCiBlbnVtIGNsYXNzIEFjY2Vzc2liaWxp dHlSb2xlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggODQ4Y2Y1ZjgyODY2Njkx N2Q2ZDk3YmJjNTkyMTQwMjM5OTFlODU5ZC4uMDJlODY3YzQ1YTAwMDEwOTg3YTdjZDliM2M4NWQ3 OWE2NWRkMWY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTQ0LDcgKzQ0LDEy IEBAIEFYSXNvbGF0ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QoQVhDb3JlT2JqZWN0JiBvYmpl Y3QsIEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlECiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK ICAgICBpZiAoYXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JJRChtX3RyZWVJRCkp CiAgICAgICAgIG1fY2FjaGVkVHJlZSA9IHRyZWU7Ci0gICAgaW5pdGlhbGl6ZUF0dHJpYnV0ZURh dGEob2JqZWN0LCBwYXJlbnRJRCA9PSBJbnZhbGlkQVhJRCk7CisgICAgaWYgKG1faWQgIT0gSW52 YWxpZEFYSUQpCisgICAgICAgIGluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKG9iamVjdCwgcGFyZW50 SUQgPT0gSW52YWxpZEFYSUQpOworICAgIGVsc2UgeworICAgICAgICAvLyBTaG91bGQgbmV2ZXIg aGFwcGVuIHVuZGVyIG5vcm1hbCBjaXJjdW1zdGFuY2VzLgorICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICB9CiB9CiAKIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkT2Jq ZWN0OjpjcmVhdGUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlE LCBBWElEIHBhcmVudElEKQpAQCAtNDU2LDEyICs0NjEsNiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmpl Y3Q6OnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQXR0cmlidXRlVmFs dWVWYQogICAgICAgICBtX2F0dHJpYnV0ZU1hcC5zZXQocHJvcGVydHlOYW1lLCB2YWx1ZSk7CiB9 CiAKLXZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMoVmVjdG9yPEFYSUQ+JiYg Y2hpbGRyZW5JRHMpCi17Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBtX2NoaWxk cmVuSURzID0gY2hpbGRyZW5JRHM7Ci19Ci0KIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0UGFy ZW50KEFYSUQgcGFyZW50KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkT2JqZWN0LmgKaW5kZXggYzQ5NGM0ZWZjNmYzOWJhYTYzNTcxOTRhMmUwYzdmODFmOGEy MmNiYi4uYTk5N2Q1YjkwOWNmMzI1ZTE0ZGM4ZDkyMmU3NzJhNTMxZDc4OTE2OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuaApAQCAtNTgsNyArNTgsMTQgQEAgcHVibGljOgogICAgIGJvb2wgaXNE ZXRhY2hlZCgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRQYXJlbnQoQVhJRCk7Ci0g ICAgdm9pZCBzZXRDaGlsZHJlbklEcyhWZWN0b3I8QVhJRD4mJik7CisgICAgdm9pZCBzZXRDaGls ZHJlbklEcyhWZWN0b3I8QVhJRD4mJiBjaGlsZHJlbklEcykKKyAgICB7CisgICAgICAgIC8vIEZJ WE1FOiBUaGUgZm9sbG93aW5nIEFTU0VSVCBzaG91bGQgYmUgbWV0IGJ1dCBpdCBpcyBjb21tZW50 ZWQgb3V0IGF0IHRoZQorICAgICAgICAvLyBtb21lbnQgYmVjYXVzZSBvZiA8cmRhcjovL3Byb2Js ZW0vNjM5ODU2NDY+IEFmdGVyIGNhbGxpbmcgX0FYVUlFbGVtZW50VXNlU2Vjb25kYXJ5QVhUaHJl YWQodHJ1ZSksCisgICAgICAgIC8vIHN0aWxsIHJlY2VpdmVzIGNsaWVudCByZXF1ZXN0IG9uIG1h aW4gdGhyZWFkLgorICAgICAgICAvLyBBU1NFUlQoYXhPYmplY3RDYWNoZSgpLT5jYW5Vc2VTZWNv bmRhcnlBWFRocmVhZCgpID8gIWlzTWFpblRocmVhZCgpIDogaXNNYWluVGhyZWFkKCkpOworICAg ICAgICBtX2NoaWxkcmVuSURzID0gY2hpbGRyZW5JRHM7CisgICAgfQogCiBwcml2YXRlOgogICAg IHZvaWQgZGV0YWNoUmVtb3RlUGFydHMoQWNjZXNzaWJpbGl0eURldGFjaG1lbnRUeXBlKSBvdmVy cmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCBkZWYyNjQxNzAxNDczNzFkMjgxNDU1 Y2VlNTRlYzk0ZTk4NmY4NTU0Li5lZDU4ZjEyODVhMTc1YzQ5NTUzNjZlODdjZWFlZjgzMzk4ZmJk MjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0xODEsNiArMTgxLDEyIEBAIFJlZjxB WElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmpl Y3QmIGF4T2JqZWN0LCBBWElECiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIGF1 dG8gb2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0LCBtX3RyZWVJRCwg cGFyZW50SUQpOworICAgIGlmIChvYmplY3QtPm9iamVjdElEKCkgPT0gSW52YWxpZEFYSUQpIHsK KyAgICAgICAgLy8gRWl0aGVyIHRoZSBheE9iamVjdCBoYXMgYW4gaW52YWxpZCBJRCBvciBzb21l dGhpbmcgZWxzZSB3ZW50IHRlcnJpYmx5IHdyb25nLiBEb24ndCBib3RoZXIgZG9pbmcgYW55dGhp bmcgZWxzZS4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBv YmplY3Q7CisgICAgfQorCiAgICAgaWYgKGF0dGFjaFdyYXBwZXIpIHsKICAgICAgICAgb2JqZWN0 LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3JhcHBlcigpKTsKICAgICAgICAgLy8g U2luY2UgdGhpcyBvYmplY3QgaGFzIGFscmVhZHkgYW4gYXR0YWNoZWQgd3JhcHBlciwgc2V0IHRo ZSB3cmFwcGVyCkBAIC0xOTcsNyArMjAzLDEwIEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElz b2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElECiAg ICAgICAgIGNoaWxkcmVuSURzLmFwcGVuZChjaGlsZC0+b2JqZWN0SUQoKSk7CiAgICAgfQogICAg IG1fbm9kZU1hcC5zZXQob2JqZWN0LT5vYmplY3RJRCgpLCBjaGlsZHJlbklEcyk7Ci0gICAgb2Jq ZWN0LT5zZXRDaGlsZHJlbklEcyhXVEZNb3ZlKGNoaWxkcmVuSURzKSk7CisgICAgeworICAgICAg ICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OworICAgICAgICBtX3BlbmRp bmdDaGlsZHJlblVwZGF0ZXMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKG9iamVjdC0+b2JqZWN0SUQo KSwgY2hpbGRyZW5JRHMpKTsKKyAgICB9CiAKICAgICByZXR1cm4gb2JqZWN0OwogfQo= 401751 2020-06-12 10:55:52 -0700 2020-06-12 12:25:00 -0700 Patch bug-213124-20200612135551.patch text/plain 6092 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTljOGNlNWFmYWI4NTA1 NWE3ODZjZjlhNzc4YWY3MDkwNjMwOTc5MC4uNDM1ZjU3NDAwZTUyMWViMGIwMDBiMjBlYjkyMjU3 NTBkMjkxY2Y2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTEyICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUgMiwgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMgc2hvdWxkIGJl IGNhbGxlZCBvbmx5IG9uIHNlY29uZGFyeSB0aHJlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMxMjQKKworICAgICAgICBSZXZpZXdlZCBieSBD aHJpcyBGbGVpemFjaC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgIC0gQVhJc29sYXRlZFRyZWU6OmNyZWF0ZVN1YnRyZWUgd2FzIGNhbGxpbmcgQVhJc29s YXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMKKyAgICAgICAgd2hpY2ggc2hvdWxkIGJlIGNhbGxl ZCBvbmx5IG9uIHRoZSBzZWNvbmRhcnkgdGhyZWFkLiBOb3cgaXQgaXMgcXVldWVpbmcKKyAgICAg ICAgdGhlIGNoaWxkcmVuIHVwZGF0ZSB1bmRlciBsb2NrLgorICAgICAgICAtIFRoZSB1bnNpZ25l ZCBpbnQgcmFuZ2UgZm9yIG9iamVjdCBJRHMgd2FzIGJlaW5nIG92ZXJydW4gZm9yIGxhcmdlCisg ICAgICAgIG51bWJlciBvZiBvYmplY3RzIGxpa2UgaW4gdGhlIGNhc2Ugb2YgdGhlIHNhbXBsZSBw YWdlIGluIDxyZGFyOi8vcHJvYmxlbS81OTMzMTE0Nj4uCisgICAgICAgIEluY3JlYXNlZCB0aGUg c2l6ZSBvZiBBWElEIHRvIHNpemVfdC4KKyAgICAgICAgLSBCZXR0ZXIgaGFuZGxlIHRoZSBjYXNl IG9mIGludmFsaWQgb2JqZWN0IElEcywgYWx0aG91Z2ggdGhpcyBuZWVkcworICAgICAgICBtb3Jl IHdvcmssIHNpbmNlIHdlIHNob3VsZCBuZXZlciBlbmNvdW50ZXIgdGhpcyBjYXNlLgorCisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmg6IEFYSUQg YXJlIG5vdyBzaXplX3QgaW5zdGVhZCBvZiB1bnNpZ25lZCBpbnRzLgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdCk6CisgICAgICAgIChXZWJD b3JlOjpBWElzb2xhdGVkT2JqZWN0OjpzZXRDaGlsZHJlbklEcyk6IElubGluZWQgaW4gaGVhZGVy LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZSk6CisK IDIwMjAtMDYtMDUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW1dlYlhSXSBSZWZhY3RvciBPcGVuWFIgcGxhdGZvcm0gY29kZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaAppbmRleCA5ZjUxYzZmNmVkMzM4ZDMyM2YwZDUyMzA1YWY1ZjdlNmU0ZmZhYzZl Li42MWExMWJiNDNiNjgwZjBlNmY0YzIyNzliMWEyODcxYWI3Njc2YWYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaApAQCAtNzIsNyArNzIsNyBAQCBjbGFzcyBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmll dzsKIHN0cnVjdCBBY2Nlc3NpYmlsaXR5VGV4dDsKIHN0cnVjdCBTY3JvbGxSZWN0VG9WaXNpYmxl T3B0aW9uczsKIAotdHlwZWRlZiB1bnNpZ25lZCBBWElEOwordHlwZWRlZiBzaXplX3QgQVhJRDsK IGV4dGVybiBjb25zdCBBWElEIEludmFsaWRBWElEOwogCiBlbnVtIGNsYXNzIEFjY2Vzc2liaWxp dHlSb2xlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggODQ4Y2Y1ZjgyODY2Njkx N2Q2ZDk3YmJjNTkyMTQwMjM5OTFlODU5ZC4uMDJlODY3YzQ1YTAwMDEwOTg3YTdjZDliM2M4NWQ3 OWE2NWRkMWY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTQ0LDcgKzQ0LDEy IEBAIEFYSXNvbGF0ZWRPYmplY3Q6OkFYSXNvbGF0ZWRPYmplY3QoQVhDb3JlT2JqZWN0JiBvYmpl Y3QsIEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlECiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsK ICAgICBpZiAoYXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JJRChtX3RyZWVJRCkp CiAgICAgICAgIG1fY2FjaGVkVHJlZSA9IHRyZWU7Ci0gICAgaW5pdGlhbGl6ZUF0dHJpYnV0ZURh dGEob2JqZWN0LCBwYXJlbnRJRCA9PSBJbnZhbGlkQVhJRCk7CisgICAgaWYgKG1faWQgIT0gSW52 YWxpZEFYSUQpCisgICAgICAgIGluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKG9iamVjdCwgcGFyZW50 SUQgPT0gSW52YWxpZEFYSUQpOworICAgIGVsc2UgeworICAgICAgICAvLyBTaG91bGQgbmV2ZXIg aGFwcGVuIHVuZGVyIG5vcm1hbCBjaXJjdW1zdGFuY2VzLgorICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICB9CiB9CiAKIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkT2Jq ZWN0OjpjcmVhdGUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlE LCBBWElEIHBhcmVudElEKQpAQCAtNDU2LDEyICs0NjEsNiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmpl Y3Q6OnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQXR0cmlidXRlVmFs dWVWYQogICAgICAgICBtX2F0dHJpYnV0ZU1hcC5zZXQocHJvcGVydHlOYW1lLCB2YWx1ZSk7CiB9 CiAKLXZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0Q2hpbGRyZW5JRHMoVmVjdG9yPEFYSUQ+JiYg Y2hpbGRyZW5JRHMpCi17Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBtX2NoaWxk cmVuSURzID0gY2hpbGRyZW5JRHM7Ci19Ci0KIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0UGFy ZW50KEFYSUQgcGFyZW50KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkT2JqZWN0LmgKaW5kZXggYzQ5NGM0ZWZjNmYzOWJhYTYzNTcxOTRhMmUwYzdmODFmOGEy MmNiYi4uYTk5N2Q1YjkwOWNmMzI1ZTE0ZGM4ZDkyMmU3NzJhNTMxZDc4OTE2OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuaApAQCAtNTgsNyArNTgsMTQgQEAgcHVibGljOgogICAgIGJvb2wgaXNE ZXRhY2hlZCgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRQYXJlbnQoQVhJRCk7Ci0g ICAgdm9pZCBzZXRDaGlsZHJlbklEcyhWZWN0b3I8QVhJRD4mJik7CisgICAgdm9pZCBzZXRDaGls ZHJlbklEcyhWZWN0b3I8QVhJRD4mJiBjaGlsZHJlbklEcykKKyAgICB7CisgICAgICAgIC8vIEZJ WE1FOiBUaGUgZm9sbG93aW5nIEFTU0VSVCBzaG91bGQgYmUgbWV0IGJ1dCBpdCBpcyBjb21tZW50 ZWQgb3V0IGF0IHRoZQorICAgICAgICAvLyBtb21lbnQgYmVjYXVzZSBvZiA8cmRhcjovL3Byb2Js ZW0vNjM5ODU2NDY+IEFmdGVyIGNhbGxpbmcgX0FYVUlFbGVtZW50VXNlU2Vjb25kYXJ5QVhUaHJl YWQodHJ1ZSksCisgICAgICAgIC8vIHN0aWxsIHJlY2VpdmVzIGNsaWVudCByZXF1ZXN0IG9uIG1h aW4gdGhyZWFkLgorICAgICAgICAvLyBBU1NFUlQoYXhPYmplY3RDYWNoZSgpLT5jYW5Vc2VTZWNv bmRhcnlBWFRocmVhZCgpID8gIWlzTWFpblRocmVhZCgpIDogaXNNYWluVGhyZWFkKCkpOworICAg ICAgICBtX2NoaWxkcmVuSURzID0gY2hpbGRyZW5JRHM7CisgICAgfQogCiBwcml2YXRlOgogICAg IHZvaWQgZGV0YWNoUmVtb3RlUGFydHMoQWNjZXNzaWJpbGl0eURldGFjaG1lbnRUeXBlKSBvdmVy cmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCBkZWYyNjQxNzAxNDczNzFkMjgxNDU1 Y2VlNTRlYzk0ZTk4NmY4NTU0Li5lZDU4ZjEyODVhMTc1YzQ5NTUzNjZlODdjZWFlZjgzMzk4ZmJk MjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0xODEsNiArMTgxLDEyIEBAIFJlZjxB WElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmpl Y3QmIGF4T2JqZWN0LCBBWElECiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAogICAgIGF1 dG8gb2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0LCBtX3RyZWVJRCwg cGFyZW50SUQpOworICAgIGlmIChvYmplY3QtPm9iamVjdElEKCkgPT0gSW52YWxpZEFYSUQpIHsK KyAgICAgICAgLy8gRWl0aGVyIHRoZSBheE9iamVjdCBoYXMgYW4gaW52YWxpZCBJRCBvciBzb21l dGhpbmcgZWxzZSB3ZW50IHRlcnJpYmx5IHdyb25nLiBEb24ndCBib3RoZXIgZG9pbmcgYW55dGhp bmcgZWxzZS4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBv YmplY3Q7CisgICAgfQorCiAgICAgaWYgKGF0dGFjaFdyYXBwZXIpIHsKICAgICAgICAgb2JqZWN0 LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmplY3Qud3JhcHBlcigpKTsKICAgICAgICAgLy8g U2luY2UgdGhpcyBvYmplY3QgaGFzIGFscmVhZHkgYW4gYXR0YWNoZWQgd3JhcHBlciwgc2V0IHRo ZSB3cmFwcGVyCkBAIC0xOTcsNyArMjAzLDEwIEBAIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBBWElz b2xhdGVkVHJlZTo6Y3JlYXRlU3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElECiAg ICAgICAgIGNoaWxkcmVuSURzLmFwcGVuZChjaGlsZC0+b2JqZWN0SUQoKSk7CiAgICAgfQogICAg IG1fbm9kZU1hcC5zZXQob2JqZWN0LT5vYmplY3RJRCgpLCBjaGlsZHJlbklEcyk7Ci0gICAgb2Jq ZWN0LT5zZXRDaGlsZHJlbklEcyhXVEZNb3ZlKGNoaWxkcmVuSURzKSk7CisgICAgeworICAgICAg ICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OworICAgICAgICBtX3BlbmRp bmdDaGlsZHJlblVwZGF0ZXMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKG9iamVjdC0+b2JqZWN0SUQo KSwgY2hpbGRyZW5JRHMpKTsKKyAgICB9CiAKICAgICByZXR1cm4gb2JqZWN0OwogfQo=