219037 2020-11-17 08:46:10 -0800 Implementation of AXCoreObject::innerHTML and outerHTML. 2020-11-17 14:15:28 -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 darin dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1708249 0 andresg_22 2020-11-17 08:46:10 -0800 Implementation of AXCoreObject::innerHTML and outerHTML. 1708253 1 414347 andresg_22 2020-11-17 09:01:49 -0800 Created attachment 414347 Patch 1708258 2 414347 cfleizach 2020-11-17 09:19:31 -0800 Comment on attachment 414347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414347&action=review > Source/WebCore/accessibility/AccessibilityObject.cpp:3584 > +String AccessibilityObject::innerHTML() const can we do this without the debug flags? there's been lots of times now that I am trying to debug something in WK without debug symbols and just wishing I could convert from AX tree > HTML > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2118 > + const_cast<AXIsolatedObject*>(this)->setProperty(AXPropertyName::OuterHTML, value); worried that we're setting this property on the main thread. I guess we'll be ok because the AX thread is also blocked. can you think of any other issues with this? 1708276 3 414347 darin 2020-11-17 10:05:04 -0800 Comment on attachment 414347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414347&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2103 > + String value = axObject ? axObject->innerHTML().isolatedCopy() > + : String().isolatedCopy(); String().isolatedCopy() is the same as Striing(). 1708281 4 414350 andresg_22 2020-11-17 10:22:17 -0800 Created attachment 414350 Patch 1708285 5 andresg_22 2020-11-17 10:30:27 -0800 (In reply to chris fleizach from comment #2) > Comment on attachment 414347 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414347&action=review > > > Source/WebCore/accessibility/AccessibilityObject.cpp:3584 > > +String AccessibilityObject::innerHTML() const > > can we do this without the debug flags? there's been lots of times now that > I am trying to debug something in WK without debug symbols and just wishing > I could convert from AX tree > HTML Done. > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2118 > > + const_cast<AXIsolatedObject*>(this)->setProperty(AXPropertyName::OuterHTML, value); > > worried that we're setting this property on the main thread. I guess we'll > be ok because the AX thread is also blocked. can you think of any other > issues with this? It could be a problem if this method is called on the main thread and there are other isolated object methods being called on the AX thread. This shouldn't happen though. Let me see if I can add an assert to ensure this in debug. 1708286 6 andresg_22 2020-11-17 10:31:39 -0800 (In reply to Darin Adler from comment #3) > Comment on attachment 414347 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414347&action=review > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2103 > > + String value = axObject ? axObject->innerHTML().isolatedCopy() > > + : String().isolatedCopy(); > > String().isolatedCopy() is the same as Striing(). Fixed. 1708293 7 andresg_22 2020-11-17 10:54:07 -0800 (In reply to chris fleizach from comment #2) > Comment on attachment 414347 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414347&action=review > > > Source/WebCore/accessibility/AccessibilityObject.cpp:3584 > > +String AccessibilityObject::innerHTML() const > > can we do this without the debug flags? there's been lots of times now that > I am trying to debug something in WK without debug symbols and just wishing > I could convert from AX tree > HTML > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2118 > > + const_cast<AXIsolatedObject*>(this)->setProperty(AXPropertyName::OuterHTML, value); > > worried that we're setting this property on the main thread. I guess we'll > be ok because the AX thread is also blocked. can you think of any other > issues with this? The problem with the assert is that if you break on the main thread during debugging with isolated mode on, then you cannot call these methods. You can only call it on the secondary thread. Would that be ok? 1708296 8 cfleizach 2020-11-17 11:00:55 -0800 (In reply to Andres Gonzalez from comment #7) > (In reply to chris fleizach from comment #2) > > Comment on attachment 414347 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=414347&action=review > > > > > Source/WebCore/accessibility/AccessibilityObject.cpp:3584 > > > +String AccessibilityObject::innerHTML() const > > > > can we do this without the debug flags? there's been lots of times now that > > I am trying to debug something in WK without debug symbols and just wishing > > I could convert from AX tree > HTML > > > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:2118 > > > + const_cast<AXIsolatedObject*>(this)->setProperty(AXPropertyName::OuterHTML, value); > > > > worried that we're setting this property on the main thread. I guess we'll > > be ok because the AX thread is also blocked. can you think of any other > > issues with this? > > The problem with the assert is that if you break on the main thread during > debugging with isolated mode on, then you cannot call these methods. You can > only call it on the secondary thread. Would that be ok? I think we're probably OK because the secondary thread will be occupied while the main thread modifies the property map, but its not really air-tight. 1708381 9 ews-feeder 2020-11-17 14:14:43 -0800 Committed r269923: <https://trac.webkit.org/changeset/269923> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414350. 1708382 10 webkit-bug-importer 2020-11-17 14:15:28 -0800 <rdar://problem/71504019> 414347 2020-11-17 09:01:49 -0800 2020-11-17 10:22:14 -0800 Patch bug-219037-20201117120148.patch text/plain 10845 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgxMTc1Y2M1NmY2NmVl NzQ0MzYxNTkzMDY2ZWFkN2Q2Nzc4Y2UxNS4uOGZiYmE0MWNkNmYwZjdlODA5YTBjYTNiM2I3MjNi NmVhNzFkODA5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTExLTE3ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnRh dGlvbiBvZiBBWENvcmVPYmplY3Q6OmlubmVySFRNTCBhbmQgb3V0ZXJIVE1MLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MDM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0 aW9uYWxpdHksIGRlYnVnZ2luZyBjb2RlLgorCisgICAgICAgIC0gQWRkZWQgaW5uZXJIVE1MIGFu ZCBvdXRlckhUbUwgbWV0aG9kcyB0byBBWENvcmVPYmplY3QgZm9yIGRlYnVnZ2luZworICAgICAg ICBwdXJwb3Nlcy4KKyAgICAgICAgLSBUaGUgQVhJc29sYXRlZE9iamVjdCBpbXBsZW1lbnRhdGlv biBvZiB0aGVzZSBtZXRob2RzIGZvcndhcmRzIHRoZSBjYWxsCisgICAgICAgIHRvIHRoZSBhc3Nv Y2lhdGVkIEFYT2JqZWN0IGFuZCBkb2VzIGEgbGF6eSBjYWNoaW5nIG9mIHRoZSBJbm5lci9PdXRl ckhUTUwKKyAgICAgICAgcHJvcGVydGllcy4KKyAgICAgICAgLSBUaGUgQVhMb2dnZXIgY2xhc3Mg aXMgbm93IGRlY2xhcmVkIGFuZCBkZWZpbmVkIG9ubHkgI2lmICFMT0dfRElTQUJMRUQuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFY TG9nZ2VyOjpsb2cpOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlubmVySFRNTCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpvdXRlckhUTUwgY29uc3QpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJ c29sYXRlZE9iamVjdDo6aW5uZXJIVE1MIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNv bGF0ZWRPYmplY3Q6Om91dGVySFRNTCBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tOgorICAgICAgICAoLVtXZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgaW5uZXJIVE1MXSk6CisgICAgICAgICgtW1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZSBvdXRlckhUTUxdKToKKwogMjAyMC0xMS0x NiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgSWdub3JlIGRl cHJlY2F0aW9uIHdhcm5pbmdzIGZvciB0aGUgdW5pZm9ybSB0eXBlcyBDIEFQSQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBhOGQ0NjFlYWExMTJkZjY3ZTQ2 MzQ1NDFhZGY2MzdhNTFlMDM0ZTU2Li5iODVhZDM0MDExYTA2MGFmMjg1NWI1ZjY4NzNmMGZhY2Yx YTgyMzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcApAQCAt MjcsNiArMjcsOCBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKworI2lmICFMT0dfRElT QUJMRUQKICNpbmNsdWRlICJBWExvZ2dlci5oIgogCiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlf SVNPTEFURURfVFJFRSkKQEAgLTU3LDExICs1OSw3IEBAIEFYTG9nZ2VyOjp+QVhMb2dnZXIoKQog CiB2b2lkIEFYTG9nZ2VyOjpsb2coY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotI2lmICFMT0df RElTQUJMRUQKICAgICBMT0coQWNjZXNzaWJpbGl0eSwgIiVzIiwgbWVzc2FnZS51dGY4KCkuZGF0 YSgpKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKG1lc3NhZ2UpOwotI2VuZGlmCiB9CiAKIHZv aWQgQVhMb2dnZXI6OmxvZyhSZWZQdHI8QVhDb3JlT2JqZWN0PiBvYmplY3QpCkBAIC0yNzIsMTAg KzI3MCw4IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25z dCBBWENvcmVPYmplY3QmIG9iamVjdCkKICAgICBhdXRvKiBwYXJlbnQgPSBvYmplY3QucGFyZW50 T2JqZWN0KCk7CiAgICAgaWYgKHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OlN0YXRpY1RleHQg JiYgcGFyZW50KQogICAgICAgICBvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MID0gcGFyZW50Owot ICAgIGlmIChvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MKSB7Ci0gICAgICAgIGlmIChhdXRvKiBl bGVtZW50ID0gb2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTC0+ZWxlbWVudCgpKQotICAgICAgICAg ICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgZWxlbWVudC0+b3V0ZXJIVE1MKCkp OwotICAgIH0KKyAgICBpZiAob2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTCkKKyAgICAgICAgc3Ry ZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgb2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTC0+ b3V0ZXJIVE1MKCkpOwogCiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiYWRkcmVzcyIsICZvYmpl Y3QpOwogICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoIndyYXBwZXIiLCBvYmplY3Qud3JhcHBlcigp KTsKQEAgLTMxNCwzICszMTAsNSBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0m IHN0cmVhbSwgQVhPYmplY3RDYWNoZSYgYXhPYmplY3RDYWNoZSkKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWExvZ2dlci5oCmluZGV4IDBmMGNlZmNiODFlZjFhZDZmZjJhNDA4YTEwNzc1YWE1 NDFmMTU0N2QuLmViYzEyN2Q2MmM4MTNhMGU3MzliNTdhY2ZjMGFlN2MzNjFhMDlhODUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmgKQEAgLTI1LDYgKzI1LDggQEAKIAog I3ByYWdtYSBvbmNlCiAKKyNpZiAhTE9HX0RJU0FCTEVECisKICNpbmNsdWRlICJBWE9iamVjdENh Y2hlLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIgogCkBAIC00 OCwxMiArNTAsMTQgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9tZXRob2ROYW1lOwogfTsKIAot I2lmIExPR19ESVNBQkxFRAotI2RlZmluZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAKLSNk ZWZpbmUgQVhMT0coeCkgKHZvaWQpMAotI2Vsc2UKICNkZWZpbmUgQVhUUkFDRShtZXRob2ROYW1l KSBBWExvZ2dlciBheExvZ2dlcihtZXRob2ROYW1lKQogI2RlZmluZSBBWExPRyh4KSBBWExvZ2dl cjo6bG9nKHgpCi0jZW5kaWYgLy8gTE9HX0RJU0FCTEVECiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKKworI2Vsc2UKKworI2RlZmluZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAKKyNkZWZp bmUgQVhMT0coeCkgKHZvaWQpMAorCisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5k ZXggOTk0NDIxMGI2NzY5MWZlM2E4NWZhOGU1NzZmYmNlOGUxOWEwZDc5YS4uMDczNzM0NWM2YzRk MDg4MDE2NGQ1NjFlNmYwOTkzNmRhNGFkODQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0zNTgwLDYgKzM1ODAs MjAgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZXRJc0lnbm9yZWRGcm9tUGFyZW50RGF0 YUZvckNoaWxkKEFYQ29yZU9iamVjdCogY2hpbGQKICAgICBjaGlsZC0+c2V0SXNJZ25vcmVkRnJv bVBhcmVudERhdGEocmVzdWx0KTsKIH0KIAorI2lmbmRlZiBOREVCVUcKK1N0cmluZyBBY2Nlc3Np YmlsaXR5T2JqZWN0Ojppbm5lckhUTUwoKSBjb25zdAoreworICAgIGF1dG8qIGVsZW1lbnQgPSB0 aGlzLT5lbGVtZW50KCk7CisgICAgcmV0dXJuIGVsZW1lbnQgPyBlbGVtZW50LT5pbm5lckhUTUwo KSA6IFN0cmluZygpOworfQorCitTdHJpbmcgQWNjZXNzaWJpbGl0eU9iamVjdDo6b3V0ZXJIVE1M KCkgY29uc3QKK3sKKyAgICBhdXRvKiBlbGVtZW50ID0gdGhpcy0+ZWxlbWVudCgpOworICAgIHJl dHVybiBlbGVtZW50ID8gZWxlbWVudC0+b3V0ZXJIVE1MKCkgOiBTdHJpbmcoKTsKK30KKyNlbmRp ZgorCiBuYW1lc3BhY2UgQWNjZXNzaWJpbGl0eSB7CiAKICNpZiAhUExBVEZPUk0oTUFDKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApp bmRleCBjMzAwNzc1ODA0NjQ2NWUyMGM3YWM5NjFkNDlmOTEwNGM4YzZmMmE0Li43OTc0ODdkYzI5 YzAzNWRmNjFjYzc5NGQ4ZmNmODg5NWMyODQ0MjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNzgzLDYgKzc4MywxMSBA QCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBhbGxvd3NUZXh0UmFuZ2VzKCkgY29uc3Q7CiAgICAgdW5z aWduZWQgZ2V0TGVuZ3RoRm9yVGV4dFJhbmdlKCkgY29uc3Q7CiAKKyNpZm5kZWYgTkRFQlVHCisg ICAgU3RyaW5nIGlubmVySFRNTCgpIGNvbnN0IG92ZXJyaWRlOworICAgIFN0cmluZyBvdXRlckhU TUwoKSBjb25zdCBvdmVycmlkZTsKKyNlbmRpZgorCiBwcml2YXRlOgogICAgIE9wdGlvbmFsPFNp bXBsZVJhbmdlPiByYW5nZU9mU3RyaW5nQ2xvc2VzdFRvUmFuZ2VJbkRpcmVjdGlvbihjb25zdCBT aW1wbGVSYW5nZSYsIEFjY2Vzc2liaWxpdHlTZWFyY2hEaXJlY3Rpb24sIGNvbnN0IFZlY3RvcjxT dHJpbmc+JikgY29uc3Q7CiAgICAgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+IHNlbGVjdGlvblJhbmdl KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oCmluZGV4IGMwYWMyZjJhMjExZmQwYmM3OTE3 ZGZlYzM2MjkyYzFhMzNmNmU1ZDUuLmM3OTVlZjYzNWNkODZiYzdmOGYxODJkMjEzYjM4MDNiN2Nl OGNkOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdEludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oCkBAIC0xNDg5LDYgKzE0ODksMTEgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgU3RyaW5nIGRvY3VtZW50RW5jb2RpbmcoKSBjb25zdCA9IDA7CiAg ICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgZG9jdW1lbnRMaW5rcygpID0g MDsKIAorI2lmbmRlZiBOREVCVUcKKyAgICB2aXJ0dWFsIFN0cmluZyBpbm5lckhUTUwoKSBjb25z dCA9IDA7CisgICAgdmlydHVhbCBTdHJpbmcgb3V0ZXJIVE1MKCkgY29uc3QgPSAwOworI2VuZGlm CisKIHByaXZhdGU6CiAgICAgLy8gRGV0YWNoZXMgdGhpcyBvYmplY3QgZnJvbSB0aGUgb2JqZWN0 cyBpdCByZWZlcmVuY2VzIGFuZCBpdCBpcyByZWZlcmVuY2VkIGJ5LgogICAgIHZpcnR1YWwgdm9p ZCBkZXRhY2hSZW1vdGVQYXJ0cyhBY2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUpID0gMDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggZmM0ZDM5N2NhNTkwZmRhYjU1MTVkMWEyZDAy MzdiZDliY2YyNWEwNi4uYmI3ODZjNGE5OGY2OTVhNDZlMDYwNjk3MTM3ODM4MTcyODBkYTMxMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKQEAgLTIwOTEsNiArMjA5MSwzNiBAQCB2b2lk IEFYSXNvbGF0ZWRPYmplY3Q6OnNldElzSWdub3JlZEZyb21QYXJlbnREYXRhRm9yQ2hpbGQoQVhD b3JlT2JqZWN0KikKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAorI2lmbmRlZiBOREVC VUcKK1N0cmluZyBBWElzb2xhdGVkT2JqZWN0Ojppbm5lckhUTUwoKSBjb25zdAoreworICAgIGlm IChtX3Byb3BlcnR5TWFwLmNvbnRhaW5zKEFYUHJvcGVydHlOYW1lOjpJbm5lckhUTUwpKQorICAg ICAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OklubmVySFRN TCk7CisKKyAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhy ZWFkPFN0cmluZz4oW3RoaXNdICgpIC0+IFN0cmluZyB7CisgICAgICAgIGF1dG8qIGF4T2JqZWN0 ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCk7CisgICAgICAgIFN0cmluZyB2YWx1ZSA9IGF4T2JqZWN0 ID8gYXhPYmplY3QtPmlubmVySFRNTCgpLmlzb2xhdGVkQ29weSgpCisgICAgICAgICAgICA6IFN0 cmluZygpLmlzb2xhdGVkQ29weSgpOworICAgICAgICBjb25zdF9jYXN0PEFYSXNvbGF0ZWRPYmpl Y3QqPih0aGlzKS0+c2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklubmVySFRNTCwgdmFsdWUp OworICAgICAgICByZXR1cm4gdmFsdWU7CisgICAgfSk7Cit9CisKK1N0cmluZyBBWElzb2xhdGVk T2JqZWN0OjpvdXRlckhUTUwoKSBjb25zdAoreworICAgIGlmIChtX3Byb3BlcnR5TWFwLmNvbnRh aW5zKEFYUHJvcGVydHlOYW1lOjpPdXRlckhUTUwpKQorICAgICAgICByZXR1cm4gc3RyaW5nQXR0 cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6Ok91dGVySFRNTCk7CisKKyAgICByZXR1cm4gQWNj ZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFN0cmluZz4oW3RoaXNdICgp IC0+IFN0cmluZyB7CisgICAgICAgIGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0 KCk7CisgICAgICAgIFN0cmluZyB2YWx1ZSA9IGF4T2JqZWN0ID8gYXhPYmplY3QtPm91dGVySFRN TCgpLmlzb2xhdGVkQ29weSgpCisgICAgICAgICAgICA6IFN0cmluZygpLmlzb2xhdGVkQ29weSgp OworICAgICAgICBjb25zdF9jYXN0PEFYSXNvbGF0ZWRPYmplY3QqPih0aGlzKS0+c2V0UHJvcGVy dHkoQVhQcm9wZXJ0eU5hbWU6Ok91dGVySFRNTCwgdmFsdWUpOworICAgICAgICByZXR1cm4gdmFs dWU7CisgICAgfSk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5k aWYgLy8gRU5BQkxFKChBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmgKaW5kZXggOTQzZGI2ZmMxMDg2MTBmY2ViM2Q4NTI1MmFjZjNmODBmOGJmZjcyZi4u YWRlYWFhMWE3YjExZTNkZTEzOGYxNWFjMTNkYTM5YzA0YjcxODVjOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuaApAQCAtNjQ3LDYgKzY0NywxMSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRh dGVCYWNraW5nU3RvcmUoKSBvdmVycmlkZTsKIAorI2lmbmRlZiBOREVCVUcKKyAgICBTdHJpbmcg aW5uZXJIVE1MKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgU3RyaW5nIG91dGVySFRNTCgpIGNvbnN0 IG92ZXJyaWRlOworI2VuZGlmCisKICAgICBBWElzb2xhdGVkVHJlZUlEIG1fdHJlZUlEOwogICAg IFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gbV9jYWNoZWRUcmVlOwogICAgIEFYSUQgbV9wYXJlbnRJ RCB7IEludmFsaWRBWElEIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCBhYTI4ZDE5ODVhZGFj NDg0ZjRjNzUwNWZmMDI2NTU0N2VkMDQxYTI5Li44NDNhNzliNGZkOWNmMDVhNzQ2ODA0OWIzMGQ3 ZGFlZjc3NWNkZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTEyNiw4ICsxMjYsMTEgQEAg ZW51bSBjbGFzcyBBWFByb3BlcnR5TmFtZSA6IHVpbnQxNl90IHsKICAgICBIaWdoZXN0RWRpdGFi bGVBbmNlc3RvciwKICAgICBIb3Jpem9udGFsU2Nyb2xsQmFyLAogICAgIElkZW50aWZpZXJBdHRy aWJ1dGUsCi0gICAgSW52YWxpZFN0YXR1cywKICAgICBJbmNyZW1lbnRCdXR0b24sCisjaWZuZGVm IE5ERUJVRworICAgIElubmVySFRNTCwKKyNlbmRpZgorICAgIEludmFsaWRTdGF0dXMsCiAgICAg SXNBY2Nlc3NpYmlsaXR5SWdub3JlZCwKICAgICBJc0FjdGl2ZURlc2NlbmRhbnRPZkZvY3VzZWRD b250YWluZXIsCiAgICAgSXNBbm9ueW1vdXNNYXRoT3BlcmF0b3IsCkBAIC0yNDksNiArMjUyLDkg QEAgZW51bSBjbGFzcyBBWFByb3BlcnR5TmFtZSA6IHVpbnQxNl90IHsKICAgICBNaW5WYWx1ZUZv clJhbmdlLAogICAgIE5leHRTaWJsaW5nLAogICAgIE9yaWVudGF0aW9uLAorI2lmbmRlZiBOREVC VUcKKyAgICBPdXRlckhUTUwsCisjZW5kaWYKICAgICBQYXRoLAogICAgIFBsYWNlaG9sZGVyVmFs dWUsCiAgICAgUHJlc3NlZElzUHJlc2VudCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbSBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZS5tbQppbmRleCA5ZGI2NzQyMzllZjBmOTU3ZWZlNzhhMjUwMzY0NjdjMzliMzU5MTA2 Li40NDA0NTZkMGI2YjcyMWIzOWFjMzQ4ZTA0MDQyZDNjOTM3ZWZiYTgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlckJhc2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCkBAIC02MDQsMTUgKzYwNCwxNSBAQCBzdGF0 aWMgTlNEaWN0aW9uYXJ5ICpkaWN0aW9uYXJ5UmVtb3ZpbmdOb25TdXBwb3J0ZWRUeXBlcyhOU0Rp Y3Rpb25hcnkgKmRpY3Rpb25hcgogI2lmbmRlZiBOREVCVUcKIC0gKE5TU3RyaW5nICopaW5uZXJI VE1MCiB7Ci0gICAgaWYgKGF1dG8qIGVsZW1lbnQgPSBzZWxmLmF4QmFja2luZ09iamVjdC0+ZWxl bWVudCgpKQotICAgICAgICByZXR1cm4gZWxlbWVudC0+aW5uZXJIVE1MKCk7CisgICAgaWYgKGF1 dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLmF4QmFja2luZ09iamVjdCkKKyAgICAgICAgcmV0dXJu IGJhY2tpbmdPYmplY3QtPmlubmVySFRNTCgpOwogICAgIHJldHVybiBuaWw7CiB9CiAKIC0gKE5T U3RyaW5nICopb3V0ZXJIVE1MCiB7Ci0gICAgaWYgKGF1dG8qIGVsZW1lbnQgPSBzZWxmLmF4QmFj a2luZ09iamVjdC0+ZWxlbWVudCgpKQotICAgICAgICByZXR1cm4gZWxlbWVudC0+b3V0ZXJIVE1M KCk7CisgICAgaWYgKGF1dG8qIGJhY2tpbmdPYmplY3QgPSBzZWxmLmF4QmFja2luZ09iamVjdCkK KyAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPm91dGVySFRNTCgpOwogICAgIHJldHVybiBu aWw7CiB9CiAjZW5kaWYK 414350 2020-11-17 10:22:17 -0800 2020-11-17 14:14:43 -0800 Patch bug-219037-20201117132216.patch text/plain 10862 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgxMTc1Y2M1NmY2NmVl NzQ0MzYxNTkzMDY2ZWFkN2Q2Nzc4Y2UxNS4uOGZiYmE0MWNkNmYwZjdlODA5YTBjYTNiM2I3MjNi NmVhNzFkODA5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTExLTE3ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnRh dGlvbiBvZiBBWENvcmVPYmplY3Q6OmlubmVySFRNTCBhbmQgb3V0ZXJIVE1MLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MDM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0 aW9uYWxpdHksIGRlYnVnZ2luZyBjb2RlLgorCisgICAgICAgIC0gQWRkZWQgaW5uZXJIVE1MIGFu ZCBvdXRlckhUbUwgbWV0aG9kcyB0byBBWENvcmVPYmplY3QgZm9yIGRlYnVnZ2luZworICAgICAg ICBwdXJwb3Nlcy4KKyAgICAgICAgLSBUaGUgQVhJc29sYXRlZE9iamVjdCBpbXBsZW1lbnRhdGlv biBvZiB0aGVzZSBtZXRob2RzIGZvcndhcmRzIHRoZSBjYWxsCisgICAgICAgIHRvIHRoZSBhc3Nv Y2lhdGVkIEFYT2JqZWN0IGFuZCBkb2VzIGEgbGF6eSBjYWNoaW5nIG9mIHRoZSBJbm5lci9PdXRl ckhUTUwKKyAgICAgICAgcHJvcGVydGllcy4KKyAgICAgICAgLSBUaGUgQVhMb2dnZXIgY2xhc3Mg aXMgbm93IGRlY2xhcmVkIGFuZCBkZWZpbmVkIG9ubHkgI2lmICFMT0dfRElTQUJMRUQuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFY TG9nZ2VyOjpsb2cpOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgICog YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlubmVySFRNTCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpvdXRlckhUTUwgY29uc3QpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJ c29sYXRlZE9iamVjdDo6aW5uZXJIVE1MIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNv bGF0ZWRPYmplY3Q6Om91dGVySFRNTCBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tOgorICAgICAgICAoLVtXZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgaW5uZXJIVE1MXSk6CisgICAgICAgICgtW1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZSBvdXRlckhUTUxdKToKKwogMjAyMC0xMS0x NiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgSWdub3JlIGRl cHJlY2F0aW9uIHdhcm5pbmdzIGZvciB0aGUgdW5pZm9ybSB0eXBlcyBDIEFQSQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcAppbmRleCBhOGQ0NjFlYWExMTJkZjY3ZTQ2 MzQ1NDFhZGY2MzdhNTFlMDM0ZTU2Li5iODVhZDM0MDExYTA2MGFmMjg1NWI1ZjY4NzNmMGZhY2Yx YTgyMzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcApAQCAt MjcsNiArMjcsOCBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKworI2lmICFMT0dfRElT QUJMRUQKICNpbmNsdWRlICJBWExvZ2dlci5oIgogCiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlf SVNPTEFURURfVFJFRSkKQEAgLTU3LDExICs1OSw3IEBAIEFYTG9nZ2VyOjp+QVhMb2dnZXIoKQog CiB2b2lkIEFYTG9nZ2VyOjpsb2coY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotI2lmICFMT0df RElTQUJMRUQKICAgICBMT0coQWNjZXNzaWJpbGl0eSwgIiVzIiwgbWVzc2FnZS51dGY4KCkuZGF0 YSgpKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKG1lc3NhZ2UpOwotI2VuZGlmCiB9CiAKIHZv aWQgQVhMb2dnZXI6OmxvZyhSZWZQdHI8QVhDb3JlT2JqZWN0PiBvYmplY3QpCkBAIC0yNzIsMTAg KzI3MCw4IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25z dCBBWENvcmVPYmplY3QmIG9iamVjdCkKICAgICBhdXRvKiBwYXJlbnQgPSBvYmplY3QucGFyZW50 T2JqZWN0KCk7CiAgICAgaWYgKHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OlN0YXRpY1RleHQg JiYgcGFyZW50KQogICAgICAgICBvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MID0gcGFyZW50Owot ICAgIGlmIChvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MKSB7Ci0gICAgICAgIGlmIChhdXRvKiBl bGVtZW50ID0gb2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTC0+ZWxlbWVudCgpKQotICAgICAgICAg ICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgZWxlbWVudC0+b3V0ZXJIVE1MKCkp OwotICAgIH0KKyAgICBpZiAob2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTCkKKyAgICAgICAgc3Ry ZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgb2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTC0+ b3V0ZXJIVE1MKCkpOwogCiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiYWRkcmVzcyIsICZvYmpl Y3QpOwogICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoIndyYXBwZXIiLCBvYmplY3Qud3JhcHBlcigp KTsKQEAgLTMxNCwzICszMTAsNSBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0m IHN0cmVhbSwgQVhPYmplY3RDYWNoZSYgYXhPYmplY3RDYWNoZSkKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWExvZ2dlci5oCmluZGV4IDBmMGNlZmNiODFlZjFhZDZmZjJhNDA4YTEwNzc1YWE1 NDFmMTU0N2QuLmViYzEyN2Q2MmM4MTNhMGU3MzliNTdhY2ZjMGFlN2MzNjFhMDlhODUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmgKQEAgLTI1LDYgKzI1LDggQEAKIAog I3ByYWdtYSBvbmNlCiAKKyNpZiAhTE9HX0RJU0FCTEVECisKICNpbmNsdWRlICJBWE9iamVjdENh Y2hlLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIgogCkBAIC00 OCwxMiArNTAsMTQgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9tZXRob2ROYW1lOwogfTsKIAot I2lmIExPR19ESVNBQkxFRAotI2RlZmluZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAKLSNk ZWZpbmUgQVhMT0coeCkgKHZvaWQpMAotI2Vsc2UKICNkZWZpbmUgQVhUUkFDRShtZXRob2ROYW1l KSBBWExvZ2dlciBheExvZ2dlcihtZXRob2ROYW1lKQogI2RlZmluZSBBWExPRyh4KSBBWExvZ2dl cjo6bG9nKHgpCi0jZW5kaWYgLy8gTE9HX0RJU0FCTEVECiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKKworI2Vsc2UKKworI2RlZmluZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAKKyNkZWZp bmUgQVhMT0coeCkgKHZvaWQpMAorCisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5k ZXggOTk0NDIxMGI2NzY5MWZlM2E4NWZhOGU1NzZmYmNlOGUxOWEwZDc5YS4uODg2NDUyOTI0MTJj NDU1NGE2ODM0MTQ2MjdhYjg3OGQwODkyZGEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0zNTgwLDYgKzM1ODAs MTggQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZXRJc0lnbm9yZWRGcm9tUGFyZW50RGF0 YUZvckNoaWxkKEFYQ29yZU9iamVjdCogY2hpbGQKICAgICBjaGlsZC0+c2V0SXNJZ25vcmVkRnJv bVBhcmVudERhdGEocmVzdWx0KTsKIH0KIAorU3RyaW5nIEFjY2Vzc2liaWxpdHlPYmplY3Q6Omlu bmVySFRNTCgpIGNvbnN0Cit7CisgICAgYXV0byogZWxlbWVudCA9IHRoaXMtPmVsZW1lbnQoKTsK KyAgICByZXR1cm4gZWxlbWVudCA/IGVsZW1lbnQtPmlubmVySFRNTCgpIDogU3RyaW5nKCk7Cit9 CisKK1N0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpvdXRlckhUTUwoKSBjb25zdAoreworICAg IGF1dG8qIGVsZW1lbnQgPSB0aGlzLT5lbGVtZW50KCk7CisgICAgcmV0dXJuIGVsZW1lbnQgPyBl bGVtZW50LT5vdXRlckhUTUwoKSA6IFN0cmluZygpOworfQorCiBuYW1lc3BhY2UgQWNjZXNzaWJp bGl0eSB7CiAKICNpZiAhUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCBjMzAwNzc1ODA0NjQ2NWUyMGM3 YWM5NjFkNDlmOTEwNGM4YzZmMmE0Li4wY2Y2MDViNGZmYjlkNGZmZGViZmE3MDdjZjFkYWQxMTgx Y2QwMWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaApAQCAtNzgzLDYgKzc4Myw5IEBAIHByb3RlY3RlZDoKICAgICBib29sIGFs bG93c1RleHRSYW5nZXMoKSBjb25zdDsKICAgICB1bnNpZ25lZCBnZXRMZW5ndGhGb3JUZXh0UmFu Z2UoKSBjb25zdDsKIAorICAgIFN0cmluZyBpbm5lckhUTUwoKSBjb25zdCBvdmVycmlkZTsKKyAg ICBTdHJpbmcgb3V0ZXJIVE1MKCkgY29uc3Qgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgT3B0 aW9uYWw8U2ltcGxlUmFuZ2U+IHJhbmdlT2ZTdHJpbmdDbG9zZXN0VG9SYW5nZUluRGlyZWN0aW9u KGNvbnN0IFNpbXBsZVJhbmdlJiwgQWNjZXNzaWJpbGl0eVNlYXJjaERpcmVjdGlvbiwgY29uc3Qg VmVjdG9yPFN0cmluZz4mKSBjb25zdDsKICAgICBPcHRpb25hbDxTaW1wbGVSYW5nZT4gc2VsZWN0 aW9uUmFuZ2UoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggYzBhYzJmMmEyMTFm ZDBiYzc5MTdkZmVjMzYyOTJjMWEzM2Y2ZTVkNS4uMjQxMTZhODdjMmJmZGFiMjZlYjA5NmY5YjQz ZDIzNDlkMjM3ZGI3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTE0ODksNiArMTQ4OSw5 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBkb2N1bWVudEVuY29kaW5nKCkgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGRvY3VtZW50TGlu a3MoKSA9IDA7CiAKKyAgICB2aXJ0dWFsIFN0cmluZyBpbm5lckhUTUwoKSBjb25zdCA9IDA7Cisg ICAgdmlydHVhbCBTdHJpbmcgb3V0ZXJIVE1MKCkgY29uc3QgPSAwOworCiBwcml2YXRlOgogICAg IC8vIERldGFjaGVzIHRoaXMgb2JqZWN0IGZyb20gdGhlIG9iamVjdHMgaXQgcmVmZXJlbmNlcyBh bmQgaXQgaXMgcmVmZXJlbmNlZCBieS4KICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoUmVtb3RlUGFy dHMoQWNjZXNzaWJpbGl0eURldGFjaG1lbnRUeXBlKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCmluZGV4IGZjNGQzOTdjYTU5MGZkYWI1NTE1ZDFhMmQwMjM3YmQ5YmNmMjVhMDYuLjg3 YTIwNzMzMDU1Mjc3ZjY5YjE4ZGYwZDQzYjMzYzRlNDc4YjVlYzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCkBAIC0yMDkxLDYgKzIwOTEsMzggQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0 OjpzZXRJc0lnbm9yZWRGcm9tUGFyZW50RGF0YUZvckNoaWxkKEFYQ29yZU9iamVjdCopCiAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKK1N0cmluZyBBWElzb2xhdGVkT2JqZWN0Ojppbm5l ckhUTUwoKSBjb25zdAoreworICAgIGlmIChtX3Byb3BlcnR5TWFwLmNvbnRhaW5zKEFYUHJvcGVy dHlOYW1lOjpJbm5lckhUTUwpKQorICAgICAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUo QVhQcm9wZXJ0eU5hbWU6OklubmVySFRNTCk7CisKKyAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6 cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFN0cmluZz4oW3RoaXNdICgpIC0+IFN0cmluZyB7 CisgICAgICAgIGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCk7CisgICAgICAg IFN0cmluZyB2YWx1ZSA9IGF4T2JqZWN0ID8gYXhPYmplY3QtPmlubmVySFRNTCgpLmlzb2xhdGVk Q29weSgpIDogU3RyaW5nKCk7CisKKyAgICAgICAgLy8gQ2FjaGUgdmFsdWUgc28gdGhhdCB0aGVy ZSBpcyBubyBuZWVkIHRvIGFjY2VzcyB0aGUgbWFpbiB0aHJlYWQgaW4gc3Vic2VxdWVudCBjYWxs cy4KKyAgICAgICAgY29uc3RfY2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcyktPnNldFByb3Bl cnR5KEFYUHJvcGVydHlOYW1lOjpJbm5lckhUTUwsIHZhbHVlKTsKKworICAgICAgICByZXR1cm4g dmFsdWU7CisgICAgfSk7Cit9CisKK1N0cmluZyBBWElzb2xhdGVkT2JqZWN0OjpvdXRlckhUTUwo KSBjb25zdAoreworICAgIGlmIChtX3Byb3BlcnR5TWFwLmNvbnRhaW5zKEFYUHJvcGVydHlOYW1l OjpPdXRlckhUTUwpKQorICAgICAgICByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9w ZXJ0eU5hbWU6Ok91dGVySFRNTCk7CisKKyAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmll dmVWYWx1ZUZyb21NYWluVGhyZWFkPFN0cmluZz4oW3RoaXNdICgpIC0+IFN0cmluZyB7CisgICAg ICAgIGF1dG8qIGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCk7CisgICAgICAgIFN0cmlu ZyB2YWx1ZSA9IGF4T2JqZWN0ID8gYXhPYmplY3QtPm91dGVySFRNTCgpLmlzb2xhdGVkQ29weSgp IDogU3RyaW5nKCk7CisKKyAgICAgICAgLy8gQ2FjaGUgdmFsdWUgc28gdGhhdCB0aGVyZSBpcyBu byBuZWVkIHRvIGFjY2VzcyB0aGUgbWFpbiB0aHJlYWQgaW4gc3Vic2VxdWVudCBjYWxscy4KKyAg ICAgICAgY29uc3RfY2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcyktPnNldFByb3BlcnR5KEFY UHJvcGVydHlOYW1lOjpPdXRlckhUTUwsIHZhbHVlKTsKKworICAgICAgICByZXR1cm4gdmFsdWU7 CisgICAgfSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJM RSgoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmlu ZGV4IDk0M2RiNmZjMTA4NjEwZmNlYjNkODUyNTJhY2YzZjgwZjhiZmY3MmYuLmI2N2Y4YWEwMzc2 YWMwMmI3ZjIwYWNhNWY0ZjgyMmQxYTU1MmNkZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgK QEAgLTY0Nyw2ICs2NDcsOSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVCYWNraW5nU3Rv cmUoKSBvdmVycmlkZTsKIAorICAgIFN0cmluZyBpbm5lckhUTUwoKSBjb25zdCBvdmVycmlkZTsK KyAgICBTdHJpbmcgb3V0ZXJIVE1MKCkgY29uc3Qgb3ZlcnJpZGU7CisKICAgICBBWElzb2xhdGVk VHJlZUlEIG1fdHJlZUlEOwogICAgIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gbV9jYWNoZWRUcmVl OwogICAgIEFYSUQgbV9wYXJlbnRJRCB7IEludmFsaWRBWElEIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu aAppbmRleCBhYTI4ZDE5ODVhZGFjNDg0ZjRjNzUwNWZmMDI2NTU0N2VkMDQxYTI5Li5jYzE5NWYz OTgzZDQ2MGQzZDI3ZmFlYTA0Y2JiMTc5YzdmY2NkMTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgK QEAgLTEyNiw4ICsxMjYsOSBAQCBlbnVtIGNsYXNzIEFYUHJvcGVydHlOYW1lIDogdWludDE2X3Qg ewogICAgIEhpZ2hlc3RFZGl0YWJsZUFuY2VzdG9yLAogICAgIEhvcml6b250YWxTY3JvbGxCYXIs CiAgICAgSWRlbnRpZmllckF0dHJpYnV0ZSwKLSAgICBJbnZhbGlkU3RhdHVzLAogICAgIEluY3Jl bWVudEJ1dHRvbiwKKyAgICBJbm5lckhUTUwsCisgICAgSW52YWxpZFN0YXR1cywKICAgICBJc0Fj Y2Vzc2liaWxpdHlJZ25vcmVkLAogICAgIElzQWN0aXZlRGVzY2VuZGFudE9mRm9jdXNlZENvbnRh aW5lciwKICAgICBJc0Fub255bW91c01hdGhPcGVyYXRvciwKQEAgLTI0OSw2ICsyNTAsNyBAQCBl bnVtIGNsYXNzIEFYUHJvcGVydHlOYW1lIDogdWludDE2X3QgewogICAgIE1pblZhbHVlRm9yUmFu Z2UsCiAgICAgTmV4dFNpYmxpbmcsCiAgICAgT3JpZW50YXRpb24sCisgICAgT3V0ZXJIVE1MLAog ICAgIFBhdGgsCiAgICAgUGxhY2Vob2xkZXJWYWx1ZSwKICAgICBQcmVzc2VkSXNQcmVzZW50LApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCmluZGV4IDlkYjY3NDIzOWVm MGY5NTdlZmU3OGEyNTAzNjQ2N2MzOWIzNTkxMDYuLjZkYjRkYzMxOGQ5NDc0ZGIzZjAwYTljNGRl NmRjMjU5NmNkNzc3MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2Uu bW0KQEAgLTYwMSwyMSArNjAxLDE5IEBAIHN0YXRpYyBOU0RpY3Rpb25hcnkgKmRpY3Rpb25hcnlS ZW1vdmluZ05vblN1cHBvcnRlZFR5cGVzKE5TRGljdGlvbmFyeSAqZGljdGlvbmFyCiAgICAgfQog fQogCi0jaWZuZGVmIE5ERUJVRwogLSAoTlNTdHJpbmcgKilpbm5lckhUTUwKIHsKLSAgICBpZiAo YXV0byogZWxlbWVudCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5lbGVtZW50KCkpCi0gICAgICAg IHJldHVybiBlbGVtZW50LT5pbm5lckhUTUwoKTsKKyAgICBpZiAoYXV0byogYmFja2luZ09iamVj dCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0KQorICAgICAgICByZXR1cm4gYmFja2luZ09iamVjdC0+ aW5uZXJIVE1MKCk7CiAgICAgcmV0dXJuIG5pbDsKIH0KIAogLSAoTlNTdHJpbmcgKilvdXRlckhU TUwKIHsKLSAgICBpZiAoYXV0byogZWxlbWVudCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0LT5lbGVt ZW50KCkpCi0gICAgICAgIHJldHVybiBlbGVtZW50LT5vdXRlckhUTUwoKTsKKyAgICBpZiAoYXV0 byogYmFja2luZ09iamVjdCA9IHNlbGYuYXhCYWNraW5nT2JqZWN0KQorICAgICAgICByZXR1cm4g YmFja2luZ09iamVjdC0+b3V0ZXJIVE1MKCk7CiAgICAgcmV0dXJuIG5pbDsKIH0KLSNlbmRpZgog CiAjcHJhZ21hIG1hcmsgU2VhcmNoIGhlbHBlcnMKIAo=