228251 2021-07-23 15:09:57 -0700 Add a method to WebAccessibilityObjectWrapper so that clients can retrieve the text of each line and their corresponding bounding rectangles. 2021-07-23 20:48:12 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1779197 0 andresg_22 2021-07-23 15:09:57 -0700 Add a method to WebAccessibilityObjectWrapper so that clients can retrieve the text of each line and their corresponding bounding rectangles. 1779198 1 webkit-bug-importer 2021-07-23 15:10:07 -0700 <rdar://problem/81038192> 1779199 2 andresg_22 2021-07-23 15:20:33 -0700 rdar://77184036 1779203 3 434130 andresg_22 2021-07-23 15:32:00 -0700 Created attachment 434130 Patch 1779263 4 434130 cfleizach 2021-07-23 17:23:02 -0700 Comment on attachment 434130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434130&action=review > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:2889 > + @"text": line.second.get() }; ERROR: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:2889: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 11 files 1779295 5 ews-feeder 2021-07-23 20:48:11 -0700 Committed r280282 (239940@main): <https://commits.webkit.org/239940@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434130. 434130 2021-07-23 15:32:00 -0700 2021-07-23 20:48:11 -0700 Patch bug-228251-20210723183158.patch text/plain 20475 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5ODQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRhOTZjZDFiZjQ5ZmI0 ZTk2ZGU1MDBmOWU1NjA0YzlhNWJiYjEwMS4uMTJjODI0ODU2ZGExYmE2ZGQ5MjY2OTNiMzEzNjkx NDZiNDM1NmZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA3LTIzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBtZXRo b2QgdG8gV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgc28gdGhhdCBjbGllbnRzIGNhbiBy ZXRyaWV2ZSB0aGUgdGV4dCBvZiBlYWNoIGxpbmUgYW5kIHRoZWlyIGNvcnJlc3BvbmRpbmcgYm91 bmRpbmcgcmVjdGFuZ2xlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyODI1MQorICAgICAgICByZGFyOi8vNzcxODQwMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2lv cy1zaW11bGF0b3IvZWxlbWVudC1saW5lLXJlY3RzLWFuZC10ZXh0Lmh0bWwKKworICAgICAgICBB Y2Nlc3NpYmlsaXR5IGNsaWVudHMgb2Z0ZW4gbmVlZCB0byByZXRyaWV2ZSBhIGxpbmUgb2YgdGV4 dCBhbmQgaXRzCisgICAgICAgIGNvcnJlc3BvbmRpbmcgYm91bmRpbmcgcmVjdGFuZ2xlIHNjcmVl biBjb29yZGluYXRlcy4gVGhlcmUgd2FzIG5vdCBhCisgICAgICAgIGNsZWFyIHdheSBvZiBkb2lu ZyB0aGlzLiBUaGlzIHBhdGNoIHByb3ZpZGVzIGxpbmVSZWN0c0FuZFRleHQgYXMgdGhlCisgICAg ICAgIG1lY2hhbmlzbSB0byByZXRyaWV2ZSB0aGUgbGluZXMgb2YgdGV4dCBhbmQgdGhlaXIgY29y cmVzcG9uZGluZworICAgICAgICByZWN0YW5nbGVzIGZvciBhIGdpdmVuIGFjY2Vzc2liaWxpdHkg b2JqZWN0LiBUaGlzIGlzIHRoZSBpT1MKKyAgICAgICAgaW1wbGVtZW50YXRpb24uIE1hY09TIGlt cGxlbWVudGF0aW9uIHdpbGwgYmUgZG9uZSBpbiBhIHNlcGFyYXRlIHBhdGNoLgorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW06 CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIHN0cmluZ3NGb3JTaW1w bGVSYW5nZTphdHRyaWJ1dGVkOl0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBhcnJheU9mVGV4dEZvclRleHRNYXJrZXJzOmF0dHJpYnV0ZWQ6XSk6CisgICAgICAg ICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGxpbmVSZWN0c0FuZFRleHRdKToKKyAg ICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgbGluZVJlY3RzRm9yVGV4dE1h cmtlclJhbmdlOl0pOgorCiAyMDIxLTA3LTEyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcGFydGlhbCByZXZlcnQgb2YgcjI3OTY2MSB0byBh ZGRyZXNzIGNyYXNoZXMgb24gaU9TIERlYnVnLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0gYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlcklPUy5tbQppbmRleCAyZjVmNjAwZWYwYjdlMjBiMjZmNzJkNzcwN2QwNGNjNTBkODMyZWM2 Li45MDQ3ZmQ0ZTc2NDU5MDkwODdiODU4MGJkM2NhYTI3NDk1NDlhMjUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQpAQCAtMjM1NCw1NSArMjM1NCwzNSBAQCBzdGF0 aWMgdm9pZCBBWEF0dHJpYnV0ZWRTdHJpbmdBcHBlbmRUZXh0KE5TTXV0YWJsZUF0dHJpYnV0ZWRT dHJpbmcqIGF0dHJTdHJpbmcsCiAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXRMYW5ndWFnZShhdHRy U3RyaW5nLCBub2RlLT5yZW5kZXJlcigpLCBhdHRyU3RyaW5nUmFuZ2UpOwogfQogCi0KLS8vIFRo aXMgbWV0aG9kIGlzIGludGVuZGVkIHRvIHJldHVybiBhbiBhcnJheSBvZiBzdHJpbmdzIGFuZCBh Y2Nlc3NpYmlsaXR5IGVsZW1lbnRzIHRoYXQgCi0vLyByZXByZXNlbnQgdGhlIG9iamVjdHMgb24g b25lIGxpbmUgb2YgcmVuZGVyZWQgd2ViIGNvbnRlbnQuIFRoZSBhcnJheSBvZiBtYXJrZXJzIHNl bnQKLS8vIGluIHNob3VsZCBiZSBvcmRlcmVkIGFuZCBjb250YWluIG9ubHkgYSBzdGFydCBhbmQg ZW5kIG1hcmtlci4KLS0gKE5TQXJyYXkgKilhcnJheU9mVGV4dEZvclRleHRNYXJrZXJzOihOU0Fy cmF5ICopbWFya2VycyBhdHRyaWJ1dGVkOihCT09MKWF0dHJpYnV0ZWQKKy0gKE5TQXJyYXkgKilz dHJpbmdzRm9yU2ltcGxlUmFuZ2U6KGNvbnN0IFNpbXBsZVJhbmdlJilyYW5nZSBhdHRyaWJ1dGVk OihCT09MKWF0dHJpYnV0ZWQKIHsKLSAgICBpZiAoIVtzZWxmIF9wcmVwYXJlQWNjZXNzaWJpbGl0 eUNhbGxdKQotICAgICAgICByZXR1cm4gbmlsOwotCi0gICAgaWYgKFttYXJrZXJzIGNvdW50XSAh PSAyKQotICAgICAgICByZXR1cm4gbmlsOwotICAgIAotICAgIFdlYkFjY2Vzc2liaWxpdHlUZXh0 TWFya2VyKiBzdGFydE1hcmtlciA9IFttYXJrZXJzIG9iamVjdEF0SW5kZXg6MF07Ci0gICAgV2Vi QWNjZXNzaWJpbGl0eVRleHRNYXJrZXIqIGVuZE1hcmtlciA9IFttYXJrZXJzIG9iamVjdEF0SW5k ZXg6MV07Ci0gICAgaWYgKCFbc3RhcnRNYXJrZXIgaXNLaW5kT2ZDbGFzczpbV2ViQWNjZXNzaWJp bGl0eVRleHRNYXJrZXIgY2xhc3NdXSB8fCAhW2VuZE1hcmtlciBpc0tpbmRPZkNsYXNzOltXZWJB Y2Nlc3NpYmlsaXR5VGV4dE1hcmtlciBjbGFzc11dKQotICAgICAgICByZXR1cm4gbmlsOwotCi0g ICAgYXV0byByYW5nZSA9IG1ha2VTaW1wbGVSYW5nZShbc3RhcnRNYXJrZXIgdmlzaWJsZVBvc2l0 aW9uXSwgW2VuZE1hcmtlciB2aXNpYmxlUG9zaXRpb25dKTsKLSAgICBpZiAoIXJhbmdlKQotICAg ICAgICByZXR1cm4gbmlsOwotCi0gICAgLy8gaXRlcmF0ZSBvdmVyIHRoZSByYW5nZSB0byBidWls ZCB0aGUgQVggYXR0cmlidXRlZCBzdHJpbmcKICAgICBhdXRvIGFycmF5ID0gYWRvcHROUyhbW05T TXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7Ci0gICAgVGV4dEl0ZXJhdG9yIGl0KCpyYW5nZSk7 CisKKyAgICAvLyBJdGVyYXRlIG92ZXIgdGhlIHJhbmdlIHRvIGJ1aWxkIHRoZSBBWCBhdHRyaWJ1 dGVkIHN0cmluZy4KKyAgICBUZXh0SXRlcmF0b3IgaXQocmFuZ2UpOwogICAgIGZvciAoOyAhaXQu YXRFbmQoKTsgaXQuYWR2YW5jZSgpKSB7CiAgICAgICAgIE5vZGUmIG5vZGUgPSBpdC5yYW5nZSgp LnN0YXJ0LmNvbnRhaW5lcjsKIAotICAgICAgICAvLyBub24temVybyBsZW5ndGggbWVhbnMgdGV4 dHVhbCBub2RlLCB6ZXJvIGxlbmd0aCBtZWFucyByZXBsYWNlZCBub2RlIChBS0EgImF0dGFjaG1l bnRzIiBpbiBBWCkKLSAgICAgICAgaWYgKGl0LnRleHQoKS5sZW5ndGgoKSAhPSAwKSB7CisgICAg ICAgIC8vIE5vbi16ZXJvIGxlbmd0aCBtZWFucyB0ZXh0dWFsIG5vZGUsIHplcm8gbGVuZ3RoIG1l YW5zIHJlcGxhY2VkIG5vZGUgKEFLQSAiYXR0YWNobWVudHMiIGluIEFYKS4KKyAgICAgICAgaWYg KGl0LnRleHQoKS5sZW5ndGgoKSkgewogICAgICAgICAgICAgaWYgKCFhdHRyaWJ1dGVkKSB7CiAg ICAgICAgICAgICAgICAgLy8gRmlyc3QgY2hlY2sgaWYgdGhpcyBpcyByZXByZXNlbnRlZCBieSBh IGxpbmsuCi0gICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogbGlua09iamVjdCA9 IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFuY2hvckVsZW1lbnRGb3JOb2RlKCZub2RlKTsKKyAgICAg ICAgICAgICAgICBhdXRvKiBsaW5rT2JqZWN0ID0gQWNjZXNzaWJpbGl0eU9iamVjdDo6YW5jaG9y RWxlbWVudEZvck5vZGUoJm5vZGUpOwogICAgICAgICAgICAgICAgIGlmIChbc2VsZiBfYWRkQWNj ZXNzaWJpbGl0eU9iamVjdDpsaW5rT2JqZWN0IHRvVGV4dE1hcmtlckFycmF5OmFycmF5LmdldCgp XSkKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgICAgICAvLyBO ZXh0IGNoZWNrIGlmIHRoaXMgcmVnaW9uIGlzIHJlcHJlc2VudGVkIGJ5IGEgaGVhZGluZy4KLSAg ICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBoZWFkaW5nT2JqZWN0ID0gQWNjZXNz aWJpbGl0eU9iamVjdDo6aGVhZGluZ0VsZW1lbnRGb3JOb2RlKCZub2RlKTsKKyAgICAgICAgICAg ICAgICBhdXRvKiBoZWFkaW5nT2JqZWN0ID0gQWNjZXNzaWJpbGl0eU9iamVjdDo6aGVhZGluZ0Vs ZW1lbnRGb3JOb2RlKCZub2RlKTsKICAgICAgICAgICAgICAgICBpZiAoW3NlbGYgX2FkZEFjY2Vz c2liaWxpdHlPYmplY3Q6aGVhZGluZ09iamVjdCB0b1RleHRNYXJrZXJBcnJheTphcnJheS5nZXQo KV0pCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICAgICAgU3Ry aW5nIGxpc3RNYXJrZXJUZXh0ID0gQWNjZXNzaWJpbGl0eU9iamVjdDo6bGlzdE1hcmtlclRleHRG b3JOb2RlQW5kUG9zaXRpb24oJm5vZGUsIG1ha2VDb250YWluZXJPZmZzZXRQb3NpdGlvbihpdC5y YW5nZSgpLnN0YXJ0KSk7Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgaWYgKCFs aXN0TWFya2VyVGV4dC5pc0VtcHR5KCkpIAorICAgICAgICAgICAgICAgIGlmICghbGlzdE1hcmtl clRleHQuaXNFbXB0eSgpKQogICAgICAgICAgICAgICAgICAgICBbYXJyYXkgYWRkT2JqZWN0Omxp c3RNYXJrZXJUZXh0XTsKICAgICAgICAgICAgICAgICAvLyBUaGVyZSB3YXMgbm90IGFuIGVsZW1l bnQgcmVwcmVzZW50YXRpb24sIHNvIGp1c3QgcmV0dXJuIHRoZSB0ZXh0LgogICAgICAgICAgICAg ICAgIFthcnJheSBhZGRPYmplY3Q6aXQudGV4dCgpLmNyZWF0ZU5TU3RyaW5nKCkuZ2V0KCldOwog ICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBTdHJpbmcgbGlzdE1hcmtlclRl eHQgPSBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3NpdGlv bigmbm9kZSwgbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0LnJhbmdlKCkuc3RhcnQpKTsK LQogICAgICAgICAgICAgICAgIGlmICghbGlzdE1hcmtlclRleHQuaXNFbXB0eSgpKSB7CiAgICAg ICAgICAgICAgICAgICAgIGF1dG8gYXR0clN0cmluZyA9IGFkb3B0TlMoW1tOU011dGFibGVBdHRy aWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0XSk7CiAgICAgICAgICAgICAgICAgICAgIEFYQXR0cmli dXRlZFN0cmluZ0FwcGVuZFRleHQoYXR0clN0cmluZy5nZXQoKSwgJm5vZGUsIGxpc3RNYXJrZXJU ZXh0KTsKQEAgLTI0MTQsMTEgKzIzOTQsMTAgQEAgc3RhdGljIHZvaWQgQVhBdHRyaWJ1dGVkU3Ry aW5nQXBwZW5kVGV4dChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3RyaW5nLAogICAg ICAgICAgICAgICAgIFthcnJheSBhZGRPYmplY3Q6YXR0clN0cmluZy5nZXQoKV07CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBOb2RlKiByZXBsYWNlZE5vZGUg PSBpdC5ub2RlKCk7Ci0gICAgICAgICAgICBpZiAocmVwbGFjZWROb2RlKSB7Ci0gICAgICAgICAg ICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqID0gc2VsZi5heEJhY2tpbmdPYmplY3QtPmF4 T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocmVwbGFjZWROb2RlLT5yZW5kZXJlcigpKTsKLSAg ICAgICAgICAgICAgICBpZiAob2JqICYmICFvYmotPmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkK LSAgICAgICAgICAgICAgICAgICAgW3NlbGYgX2FkZEFjY2Vzc2liaWxpdHlPYmplY3Q6b2JqIHRv VGV4dE1hcmtlckFycmF5OmFycmF5LmdldCgpXTsKKyAgICAgICAgICAgIGlmIChOb2RlKiByZXBs YWNlZE5vZGUgPSBpdC5ub2RlKCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvKiBvYmplY3QgPSBz ZWxmLmF4QmFja2luZ09iamVjdC0+YXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShyZXBsYWNl ZE5vZGUtPnJlbmRlcmVyKCkpOworICAgICAgICAgICAgICAgIGlmIChvYmplY3QgJiYgIW9iamVj dC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKQorICAgICAgICAgICAgICAgICAgICBbc2VsZiBf YWRkQWNjZXNzaWJpbGl0eU9iamVjdDpvYmplY3QgdG9UZXh0TWFya2VyQXJyYXk6YXJyYXkuZ2V0 KCldOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMjQyNiw2ICsyNDA1LDI2 IEBAIHN0YXRpYyB2b2lkIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVuZFRleHQoTlNNdXRhYmxlQXR0 cmlidXRlZFN0cmluZyogYXR0clN0cmluZywKICAgICByZXR1cm4gYXJyYXkuYXV0b3JlbGVhc2Uo KTsKIH0KIAorLy8gVGhpcyBtZXRob2QgaXMgaW50ZW5kZWQgdG8gcmV0dXJuIGFuIGFycmF5IG9m IHN0cmluZ3MgYW5kIGFjY2Vzc2liaWxpdHkgZWxlbWVudHMgdGhhdAorLy8gcmVwcmVzZW50IHRo ZSBvYmplY3RzIG9uIG9uZSBsaW5lIG9mIHJlbmRlcmVkIHdlYiBjb250ZW50LiBUaGUgYXJyYXkg b2YgbWFya2VycyBzZW50CisvLyBpbiBzaG91bGQgYmUgb3JkZXJlZCBhbmQgY29udGFpbiBvbmx5 IGEgc3RhcnQgYW5kIGVuZCBtYXJrZXIuCistIChOU0FycmF5ICopYXJyYXlPZlRleHRGb3JUZXh0 TWFya2VyczooTlNBcnJheSAqKW1hcmtlcnMgYXR0cmlidXRlZDooQk9PTClhdHRyaWJ1dGVkCit7 CisgICAgaWYgKCFbc2VsZiBfcHJlcGFyZUFjY2Vzc2liaWxpdHlDYWxsXSkKKyAgICAgICAgcmV0 dXJuIG5pbDsKKworICAgIGlmIChbbWFya2VycyBjb3VudF0gIT0gMikKKyAgICAgICAgcmV0dXJu IG5pbDsKKworICAgIFdlYkFjY2Vzc2liaWxpdHlUZXh0TWFya2VyKiBzdGFydE1hcmtlciA9IFtt YXJrZXJzIG9iamVjdEF0SW5kZXg6MF07CisgICAgV2ViQWNjZXNzaWJpbGl0eVRleHRNYXJrZXIq IGVuZE1hcmtlciA9IFttYXJrZXJzIG9iamVjdEF0SW5kZXg6MV07CisgICAgaWYgKCFbc3RhcnRN YXJrZXIgaXNLaW5kT2ZDbGFzczpbV2ViQWNjZXNzaWJpbGl0eVRleHRNYXJrZXIgY2xhc3NdXSB8 fCAhW2VuZE1hcmtlciBpc0tpbmRPZkNsYXNzOltXZWJBY2Nlc3NpYmlsaXR5VGV4dE1hcmtlciBj bGFzc11dKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byByYW5nZSA9IG1ha2VTaW1w bGVSYW5nZShbc3RhcnRNYXJrZXIgdmlzaWJsZVBvc2l0aW9uXSwgW2VuZE1hcmtlciB2aXNpYmxl UG9zaXRpb25dKTsKKyAgICByZXR1cm4gcmFuZ2UgPyBbc2VsZiBzdHJpbmdzRm9yU2ltcGxlUmFu Z2U6KnJhbmdlIGF0dHJpYnV0ZWQ6YXR0cmlidXRlZF0gOiBuaWw7Cit9CisKIC8vIEZJWE1FOiBO byByZWFzb24gZm9yIHRoaXMgdG8gYmUgYSBtZXRob2QgaW5zdGVhZCBvZiBhIGZ1bmN0aW9uLgog LSAoTlNSYW5nZSlfY29udmVydFRvTlNSYW5nZTooY29uc3QgU2ltcGxlUmFuZ2UmKXJhbmdlCiB7 CkBAIC0yODUxLDYgKzI4NTAsNjggQEAgc3RhdGljIHZvaWQgQVhBdHRyaWJ1dGVkU3RyaW5nQXBw ZW5kVGV4dChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3RyaW5nLAogICAgIHJldHVy biBbc2VsZiB0ZXh0TWFya2Vyc0ZvclJhbmdlOltzZWxmIHJhbmdlRnJvbU1hcmtlcnM6bWFya2Vy cyB3aXRoVGV4dDp0ZXh0XV07CiB9CiAKKy0gKE5TQXJyYXk8TlNEaWN0aW9uYXJ5ICo+ICopbGlu ZVJlY3RzQW5kVGV4dAoreworICAgIGlmICghW3NlbGYgX3ByZXBhcmVBY2Nlc3NpYmlsaXR5Q2Fs bF0pCisgICAgICAgIHJldHVybiBuaWw7CisgICAgYXV0byogYmFja2luZ09iamVjdCA9IHNlbGYu YXhCYWNraW5nT2JqZWN0OworCisgICAgYXV0byByYW5nZSA9IGJhY2tpbmdPYmplY3QtPmVsZW1l bnRSYW5nZSgpOworICAgIGlmICghcmFuZ2UgfHwgcmFuZ2UtPmNvbGxhcHNlZCgpKQorICAgICAg ICByZXR1cm4gbmlsOworCisgICAgVmVjdG9yPHN0ZDo6cGFpcjxJbnRSZWN0LCBSZXRhaW5QdHI8 aWQ+Pj4gbGluZXM7CisgICAgYXV0byBzdGFydCA9IFZpc2libGVQb3NpdGlvbiB7IG1ha2VDb250 YWluZXJPZmZzZXRQb3NpdGlvbihyYW5nZS0+c3RhcnQpIH07CisgICAgYXV0byByYW5nZUVuZCA9 IFZpc2libGVQb3NpdGlvbiB7IG1ha2VDb250YWluZXJPZmZzZXRQb3NpdGlvbihyYW5nZS0+ZW5k KSB9OworICAgIHdoaWxlICghc3RhcnQuaXNOdWxsKCkgJiYgc3RhcnQgPCByYW5nZUVuZCkgewor ICAgICAgICBhdXRvIGVuZCA9IGJhY2tpbmdPYmplY3QtPm5leHRMaW5lRW5kUG9zaXRpb24oc3Rh cnQpOworICAgICAgICBpZiAoZW5kIDw9IHN0YXJ0KQorICAgICAgICAgICAgYnJlYWs7CisKKyAg ICAgICAgYXV0byByZWN0ID0gYmFja2luZ09iamVjdC0+Ym91bmRzRm9yVmlzaWJsZVBvc2l0aW9u UmFuZ2Uoe3N0YXJ0LCBlbmR9KTsKKyAgICAgICAgTlNBcnJheSAqY29udGVudCA9IFtzZWxmIHN0 cmluZ3NGb3JTaW1wbGVSYW5nZToqbWFrZVNpbXBsZVJhbmdlKHN0YXJ0LCBlbmQpIGF0dHJpYnV0 ZWQ6WUVTXTsKKyAgICAgICAgYXV0byB0ZXh0ID0gYWRvcHROUyhbW05TTXV0YWJsZUF0dHJpYnV0 ZWRTdHJpbmcgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgZm9yIChpZCBpdGVtIGluIGNvbnRlbnQp IHsKKyAgICAgICAgICAgIGlmIChbaXRlbSBpc0tpbmRPZkNsYXNzOk5TQXR0cmlidXRlZFN0cmlu Zy5jbGFzc10pCisgICAgICAgICAgICAgICAgW3RleHQgYXBwZW5kQXR0cmlidXRlZFN0cmluZzpp dGVtXTsKKyAgICAgICAgfQorICAgICAgICBsaW5lcy5hcHBlbmQoe3JlY3QsIHRleHR9KTsKKwor ICAgICAgICBzdGFydCA9IGVuZDsKKyAgICAgICAgd2hpbGUgKGlzRW5kT2ZMaW5lKHN0YXJ0KSkK KyAgICAgICAgICAgIHN0YXJ0ID0gc3RhcnQubmV4dCgpOworICAgIH0KKworICAgIGlmIChsaW5l cy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBuaWw7CisgICAgcmV0dXJuIGNyZWF0ZU5TQXJy YXkobGluZXMsIFtzZWxmXSAoY29uc3QgYXV0byYgbGluZSkgeworICAgICAgICByZXR1cm4gQHsg QCJyZWN0IjogW05TVmFsdWUgdmFsdWVXaXRoUmVjdDpbc2VsZiBjb252ZXJ0UmVjdFRvU3BhY2U6 RmxvYXRSZWN0KGxpbmUuZmlyc3QpIHNwYWNlOkFjY2Vzc2liaWxpdHlDb252ZXJzaW9uU3BhY2U6 OlNjcmVlbl1dLAorICAgICAgICAgICAgICAgICAgQCJ0ZXh0IjogbGluZS5zZWNvbmQuZ2V0KCkg fTsKKyAgICB9KS5hdXRvcmVsZWFzZSgpOworfQorCistIChOU0FycmF5ICopbGluZVJlY3RzRm9y VGV4dE1hcmtlclJhbmdlOihOU0FycmF5ICopbWFya2VycworeworICAgIGlmICghW3NlbGYgX3By ZXBhcmVBY2Nlc3NpYmlsaXR5Q2FsbF0pCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBhdXRv IHJhbmdlID0gW3NlbGYgcmFuZ2VGb3JUZXh0TWFya2VyczptYXJrZXJzXTsKKyAgICBpZiAoIXJh bmdlIHx8IHJhbmdlLT5jb2xsYXBzZWQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIGF1 dG8gcmVjdHMgPSBSZW5kZXJPYmplY3Q6OmFic29sdXRlVGV4dFJlY3RzKCpyYW5nZSk7CisgICAg aWYgKHJlY3RzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJlY3RzLnJl bW92ZUFsbE1hdGNoaW5nKFtdIChjb25zdCBhdXRvJiByZWN0KSAtPiBib29sIHsKKyAgICAgICAg cmV0dXJuIHJlY3Qud2lkdGgoKSA8PSAxIHx8IHJlY3QuaGVpZ2h0KCkgPD0gMTsKKyAgICB9KTsK KworICAgIHJldHVybiBjcmVhdGVOU0FycmF5KHJlY3RzLCBbc2VsZl0gKGNvbnN0IGF1dG8mIHJl Y3QpIHsKKyAgICAgICAgcmV0dXJuIFtOU1ZhbHVlIHZhbHVlV2l0aFJlY3Q6W3NlbGYgY29udmVy dFJlY3RUb1NwYWNlOkZsb2F0UmVjdChyZWN0KSBzcGFjZTpBY2Nlc3NpYmlsaXR5Q29udmVyc2lv blNwYWNlOjpTY3JlZW5dXTsKKyAgICB9KS5hdXRvcmVsZWFzZSgpOworfQorCiAtIChOU0FycmF5 ICopdGV4dFJlY3RzRnJvbU1hcmtlcnM6KE5TQXJyYXkgKiltYXJrZXJzIHdpdGhUZXh0OihOU1N0 cmluZyAqKXRleHQKIHsKICAgICBpZiAoIVtzZWxmIF9wcmVwYXJlQWNjZXNzaWJpbGl0eUNhbGxd KQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDUz Zjc5ODIyNzI1NjlhYzkwZGEyMjEwNzdjYTk1ZGY3ZjNiZmQxMWMuLjhkNzg1NjFjNzQwM2Q2YTRi NmM3MmYxM2YwNGQ5MTUyZDA2YTNmMDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wNy0yMyAgQW5kcmVzIEdv bnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgbWV0aG9kIHRv IFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIHNvIHRoYXQgY2xpZW50cyBjYW4gcmV0cmll dmUgdGhlIHRleHQgb2YgZWFjaCBsaW5lIGFuZCB0aGVpciBjb3JyZXNwb25kaW5nIGJvdW5kaW5n IHJlY3RhbmdsZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjgyNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQWNjZXNzaWJpbGl0eVVJRWxl bWVudC5jcHA6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmxpbmVSZWN0 c0FuZFRleHQgY29uc3QpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5pZGw6CisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9pb3MvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudElPUy5tbToKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6bGlu ZVJlY3RzQW5kVGV4dCBjb25zdCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9tYWMvQWNjZXNzaWJpbGl0eUNvbW1vbk1hYy5tbToKKyAgICAgICAgKFdUUjo6bWFr ZUpTQXJyYXkpOgorCiAyMDIxLTA3LTEyICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIFtDb2NvYV0gSW5jb3JyZWN0IGRlcHJlY2F0aW9uIGRlY2xhcmF0aW9uIGZv ciAtW1dLV2ViVmlldyBjbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uczpdCmRpZmYgLS1naXQgYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnQuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9BY2Nlc3NpYmls aXR5VUlFbGVtZW50LmNwcAppbmRleCBkYWJiZjQ1OWVlMmYzOTIxZGViMzhiNTY3YWUxYzM4NDA1 ZDExZTk5Li5hYTZhM2UyYzM2Njc3MzMxMzA2NTg4YTZkMGFmNDRhZTE3ZGNiZWU4IDEwMDY0NAot LS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlV SUVsZW1lbnQuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv QWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAKQEAgLTg3LDYgKzg3LDcgQEAgYm9vbCBBY2Nlc3Np YmlsaXR5VUlFbGVtZW50Ojppc0luRGVmaW5pdGlvbkxpc3RUZXJtKCkgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KIGJvb2wgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNUZXh0QXJlYSgpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9CiBSZWZQdHI8QWNjZXNzaWJpbGl0eVRleHRNYXJrZXJSYW5nZT4g QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6dGV4dE1hcmtlclJhbmdlTWF0Y2hlc1RleHROZWFyTWFy a2VycyhKU1N0cmluZ1JlZiwgQWNjZXNzaWJpbGl0eVRleHRNYXJrZXIqLCBBY2Nlc3NpYmlsaXR5 VGV4dE1hcmtlciopIHsgcmV0dXJuIG51bGxwdHI7IH0KIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVm PiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphdHRyaWJ1dGVkU3RyaW5nRm9yRWxlbWVudCgpIHsg cmV0dXJuIG51bGxwdHI7IH0KK0pTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50OjpsaW5lUmVjdHNBbmRUZXh0KCkgY29uc3QgeyByZXR1cm4geyB9OyB9CiBib29s IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmlzSW5UYWJsZUNlbGwoKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQogYm9vbCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0luVGFibGUoKSBjb25zdCB7 IHJldHVybiBmYWxzZTsgfQogYm9vbCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0luTGFuZG1h cmsoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmggYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaApp bmRleCBlYzExMTU2ZGNiYWQ5ODRhNjUyNmM1YmIxZDZhZjdlZDk5YzA2Y2MzLi5mNDE5NmE1OWMz NGIxOGM1NDAxOWQ2Y2FkZjMwMzIzOWY3M2I4NjMwIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnQuaApAQCAtMTUyLDYgKzE1Miw4IEBAIHB1YmxpYzoKICAgICBkb3VibGUgeSgpOwogICAgIGRv dWJsZSB3aWR0aCgpOwogICAgIGRvdWJsZSBoZWlnaHQoKTsKKyAgICBKU1JldGFpblB0cjxKU1N0 cmluZ1JlZj4gbGluZVJlY3RzQW5kVGV4dCgpIGNvbnN0OworCiAgICAgZG91YmxlIGludFZhbHVl KCkgY29uc3Q7CiAgICAgZG91YmxlIG1pblZhbHVlKCk7CiAgICAgZG91YmxlIG1heFZhbHVlKCk7 CkBAIC00MTMsOSArNDE1LDExIEBAIHByaXZhdGU6CiAjZW5kaWYKICNlbmRpZgogfTsKLSAgICAK KwogI2lmZGVmIF9fT0JKQ19fCiBpbmxpbmUgc3RkOjpvcHRpb25hbDxSZWZQdHI8QWNjZXNzaWJp bGl0eVVJRWxlbWVudD4+IG1ha2VWZWN0b3JFbGVtZW50KGNvbnN0IFJlZlB0cjxBY2Nlc3NpYmls aXR5VUlFbGVtZW50PiosIGlkIGVsZW1lbnQpIHsgcmV0dXJuIHsgeyBBY2Nlc3NpYmlsaXR5VUlF bGVtZW50OjpjcmVhdGUoZWxlbWVudCkgfSB9OyB9CisKK0pTT2JqZWN0UmVmIG1ha2VKU0FycmF5 KE5TQXJyYXkgKik7CiAjZW5kaWYKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvQWNjZXNzaWJp bGl0eVVJRWxlbWVudC5pZGwgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L0JpbmRpbmdzL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaWRsCmluZGV4IDc5Mjc5YmUyYzg4ZjU4 ZWQ2MzhkY2UwYTI3MWE4ZDJlMTY2YTYyY2UuLjgzM2IyMDQzYTRkMDVhZGY0YWExYTZkNWNmNzM4 YjM3MGFlNjRmNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvQmluZGluZ3MvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5pZGwKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50LmlkbApAQCAtMTE4LDYgKzExOCw3IEBACiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGxvbmcg aGVpZ2h0OwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBsb25nIGNsaWNrUG9pbnRYOwogICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSBsb25nIGNsaWNrUG9pbnRZOworICAgIHJlYWRvbmx5IGF0dHJpYnV0 ZSBET01TdHJpbmcgbGluZVJlY3RzQW5kVGV4dDsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBv YmplY3QgY2hpbGRyZW47CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGxvbmcgY2hpbGRyZW5Db3Vu dDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvaW9z L0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL2lvcy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50SU9TLm1tCmluZGV4IDA1Yjc3 OGQ0ZGE2NTFmZjljYTFjMTZhOGVmNjU3OGU5NWI1MGI2MzYuLjA2NzM3OGMzNzQ3NWIxYTBmNTdl MjFjNWI2MjIyZjg0MzIwMzI0MmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvaW9zL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRJT1MubW0KKysrIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9pb3MvQWNjZXNzaWJpbGl0eVVJRWxl bWVudElPUy5tbQpAQCAtNTgsNiArNTgsNyBAQCB0eXBlZGVmIHZvaWQgKCpBWFBvc3RlZE5vdGlm aWNhdGlvbkNhbGxiYWNrKShpZCBlbGVtZW50LCBOU1N0cmluZyogbm90aWZpY2F0aW9uLAogLSAo TlNBdHRyaWJ1dGVkU3RyaW5nICopYXR0cmlidXRlZFN0cmluZ0ZvckVsZW1lbnQ7CiAtIChOU0Fy cmF5ICopZWxlbWVudHNGb3JSYW5nZTooTlNSYW5nZSlyYW5nZTsKIC0gKE5TU3RyaW5nICopc2Vs ZWN0aW9uUmFuZ2VTdHJpbmc7CistIChOU0FycmF5ICopbGluZVJlY3RzQW5kVGV4dDsKIC0gKENH UG9pbnQpYWNjZXNzaWJpbGl0eUNsaWNrUG9pbnQ7CiAtICh2b2lkKWFjY2Vzc2liaWxpdHlNb2Rp ZnlTZWxlY3Rpb246KFdlYkNvcmU6OlRleHRHcmFudWxhcml0eSlncmFudWxhcml0eSBpbmNyZWFz ZTooQk9PTClpbmNyZWFzZTsKIC0gKE5TUmFuZ2UpX2FjY2Vzc2liaWxpdHlTZWxlY3RlZFRleHRS YW5nZTsKQEAgLTU3Myw2ICs1NzQsMTEgQEAgZG91YmxlIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6 OmNsaWNrUG9pbnRZKCkKICAgICByZXR1cm4gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5Q2xpY2tQ b2ludF0ueTsKIH0KIAorSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQ6OmxpbmVSZWN0c0FuZFRleHQoKSBjb25zdAoreworICAgIHJldHVybiBbW1ttX2VsZW1l bnQgbGluZVJlY3RzQW5kVGV4dF0gY29tcG9uZW50c0pvaW5lZEJ5U3RyaW5nOkAifCJdIGNyZWF0 ZUpTU3RyaW5nUmVmXTsKK30KKwogZG91YmxlIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmludFZh bHVlKCkgY29uc3QKIHsKICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb21tb25NYWMubW0gYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5Q29t bW9uTWFjLm1tCmluZGV4IGY4ZTJkY2UyMjEwMjcyYWY2NmRlOGMyNzFmZjQ1ZDNiN2I1N2M2MGYu LjEyMGFjMGJiNDY1OTFiYzgwOTNkZjJmNmQ0OWU0MGI5ODVlNmI4NDkgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb21t b25NYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMv QWNjZXNzaWJpbGl0eUNvbW1vbk1hYy5tbQpAQCAtNzEsNiArNzEsMTMgQEAgc3RhdGljIEpTT2Jq ZWN0UmVmIG1ha2VKU0FycmF5KEpTQ29udGV4dFJlZiBjb250ZXh0LCBOU0FycmF5ICphcnJheSkK ICAgICByZXR1cm4gSlNPYmplY3RNYWtlQXJyYXkoY29udGV4dCwgY291bnQsIGFyZ3VtZW50cywg bnVsbHB0cik7CiB9CiAKK0pTT2JqZWN0UmVmIG1ha2VKU0FycmF5KE5TQXJyYXkgKmFycmF5KQor eworICAgIFdLQnVuZGxlRnJhbWVSZWYgbWFpbkZyYW1lID0gV0tCdW5kbGVQYWdlR2V0TWFpbkZy YW1lKEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKS5wYWdlKCktPnBhZ2UoKSk7CisgICAgSlND b250ZXh0UmVmIGNvbnRleHQgPSBXS0J1bmRsZUZyYW1lR2V0SmF2YVNjcmlwdENvbnRleHQobWFp bkZyYW1lKTsKKyAgICByZXR1cm4gbWFrZUpTQXJyYXkoY29udGV4dCwgYXJyYXkpOworfQorCiBz dGF0aWMgSlNPYmplY3RSZWYgbWFrZUpTT2JqZWN0KEpTQ29udGV4dFJlZiBjb250ZXh0LCBOU0Rp Y3Rpb25hcnkgKmRpY3Rpb25hcnkpCiB7CiAgICAgYXV0byBvYmplY3QgPSBKU09iamVjdE1ha2Uo Y29udGV4dCwgbnVsbHB0ciwgbnVsbHB0cik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjU3OTgxMzc1ZDhhYmY5NjNiNjVm ZTliOTdhNzdiOGFjMDAwNjFjNC4uYTA2YzNmMzJmMDI2NjE2ZDI3ZDZkZDMwM2YyMTFmMjZlZmI2 ZGI3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTIzICBBbmRyZXMgR29uemFsZXog IDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBtZXRob2QgdG8gV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgc28gdGhhdCBjbGllbnRzIGNhbiByZXRyaWV2ZSB0aGUg dGV4dCBvZiBlYWNoIGxpbmUgYW5kIHRoZWlyIGNvcnJlc3BvbmRpbmcgYm91bmRpbmcgcmVjdGFu Z2xlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy ODI1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog YWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2VsZW1lbnQtbGluZS1yZWN0cy1hbmQtdGV4dC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRv ci9lbGVtZW50LWxpbmUtcmVjdHMtYW5kLXRleHQuaHRtbDogQWRkZWQuCisKIDIwMjEtMDctMTIg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXN5bmMgY29udGVu dC1zZWN1cml0eS1wb2xpY3kgd2ViLXBsYXRmb3JtLXRlc3RzIGZyb20gdXBzdHJlYW0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9lbGVtZW50LWxp bmUtcmVjdHMtYW5kLXRleHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9pb3Mtc2ltdWxhdG9yL2VsZW1lbnQtbGluZS1yZWN0cy1hbmQtdGV4dC1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uM2FkOWU0YTUwMmVlYjQ5ZDYzZDdhYjc2NjhiNGJjZTYwOTY2MzRhOQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9l bGVtZW50LWxpbmUtcmVjdHMtYW5kLXRleHQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjEgQEAK K1RoaXMgaXMgc29tZSB0ZXN0aW5nIGNvbnRlbnQuIEEgbGluayBoZXJlLiBNT3JlIHRleHQuCit6 CitBbm90aGVyIGxpbmUgb2YgdGV4dC4KK1RoaXMgdGVzdHMgdGhhdCBsaW5lUmVjdHNBbmRUZXh0 IHJldHVybnMgdGhlIGNvcnJlY3QgdmFsdWVzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKwordGV4dCA9ICJUaGlzIGlzIHNvbWUgdGVzdGluZyBjb250ZW50LiB7XG4gICAgVUlBY2Nl c3NpYmlsaXR5VG9rZW5Gb250RmFtaWx5ID0gXCJUaW1lcyBOZXcgUm9tYW5cIjtcbiAgICBVSUFj Y2Vzc2liaWxpdHlUb2tlbkZvbnROYW1lID0gXCJUaW1lcyBOZXcgUm9tYW5cIjtcbiAgICBVSUFj Y2Vzc2liaWxpdHlUb2tlbkZvbnRTaXplID0gMTY7XG59QSBsaW5rIGhlcmUue1xuICAgIFVJQWNj ZXNzaWJpbGl0eVRva2VuRm9udEZhbWlseSA9IFwiVGltZXMgTmV3IFJvbWFuXCI7XG4gICAgVUlB Y2Nlc3NpYmlsaXR5VG9rZW5Gb250TmFtZSA9IFwiVGltZXMgTmV3IFJvbWFuXCI7XG4gICAgVUlB Y2Nlc3NpYmlsaXR5VG9rZW5Gb250U2l6ZSA9IDE2O1xuICAgIFVJQWNjZXNzaWJpbGl0eVRva2Vu VW5kZXJsaW5lID0gMTtcbn0gTU9yZSB0ZXh0LntcbiAgICBVSUFjY2Vzc2liaWxpdHlUb2tlbkZv bnRGYW1pbHkgPSBcIlRpbWVzIE5ldyBSb21hblwiO1xuICAgIFVJQWNjZXNzaWJpbGl0eVRva2Vu Rm9udE5hbWUgPSBcIlRpbWVzIE5ldyBSb21hblwiO1xuICAgIFVJQWNjZXNzaWJpbGl0eVRva2Vu Rm9udFNpemUgPSAxNjtcbn0iOword2lkdGggPiAwOiB0cnVlCitoZWlnaHQgPiAwOiB0cnVlCit0 ZXh0ID0gInp7XG4gICAgVUlBY2Nlc3NpYmlsaXR5VG9rZW5Gb250RmFtaWx5ID0gXCJUaW1lcyBO ZXcgUm9tYW5cIjtcbiAgICBVSUFjY2Vzc2liaWxpdHlUb2tlbkZvbnROYW1lID0gXCJUaW1lcyBO ZXcgUm9tYW5cIjtcbiAgICBVSUFjY2Vzc2liaWxpdHlUb2tlbkZvbnRTaXplID0gMTY7XG59IjsK K3dpZHRoID4gMDogdHJ1ZQoraGVpZ2h0ID4gMDogdHJ1ZQordGV4dCA9ICJBbm90aGVyIGxpbmUg b2YgdGV4dC57XG4gICAgVUlBY2Nlc3NpYmlsaXR5VG9rZW5Gb250RmFtaWx5ID0gXCJUaW1lcyBO ZXcgUm9tYW5cIjtcbiAgICBVSUFjY2Vzc2liaWxpdHlUb2tlbkZvbnROYW1lID0gXCJUaW1lcyBO ZXcgUm9tYW5cIjtcbiAgICBVSUFjY2Vzc2liaWxpdHlUb2tlbkZvbnRTaXplID0gMTY7XG59IjsK K3dpZHRoID4gMDogdHJ1ZQoraGVpZ2h0ID4gMDogdHJ1ZQorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9lbGVtZW50LWxpbmUtcmVjdHMtYW5kLXRleHQuaHRt bCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9lbGVtZW50LWxpbmUt cmVjdHMtYW5kLXRleHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNzYxY2I0YTk1YWNlZWYxMTNhY2ViNjA0 NTRiMTUwN2VhYmNmOTNkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9pb3Mtc2ltdWxhdG9yL2VsZW1lbnQtbGluZS1yZWN0cy1hbmQtdGV4dC5odG1sCkBAIC0w LDAgKzEsMzkgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VO Ij4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJ0ZXh0Ij4KK1Ro aXMgaXMgc29tZSB0ZXN0aW5nIGNvbnRlbnQuCis8YSBocmVmPSIjIj5BIGxpbmsgaGVyZS48L2E+ CitNT3JlIHRleHQuPGJyLz56PGJyLz4KK0Fub3RoZXIgbGluZSBvZiB0ZXh0LgorPC9kaXY+CisK KzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxz Y3JpcHQ+CisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBsaW5lUmVjdHNBbmRUZXh0 IHJldHVybnMgdGhlIGNvcnJlY3QgdmFsdWVzLiIpOworCisgICAgaWYgKHdpbmRvdy5hY2Nlc3Np YmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICBsZXQgdGV4dCA9IGFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidGV4dCIpOworICAgICAgICBsZXQgbGluZVJl Y3RzQW5kVGV4dCA9IHRleHQubGluZVJlY3RzQW5kVGV4dDsKKworICAgICAgICBsaW5lUmVjdHNB bmRUZXh0LnNwbGl0KCJ8IikuZm9yRWFjaCgobGluZSkgPT4geworICAgICAgICAgICAgbGV0IHRl eHQgPSBsaW5lLm1hdGNoKC90ZXh0ID0gXCIuKlwiOy8pOworICAgICAgICAgICAgZGVidWcodGV4 dFswXSk7CisKKyAgICAgICAgICAgIC8vIENhbm5vdCBsb2cgcmVjdCBjb29yZGluYXRlcyBiZWNh dXNlIGl0IHdvdWxkIHZhcnkgZnJvbSBkZXZpY2UgdG8gZGV2aWNlLgorICAgICAgICAgICAgLy8g VGh1cywgZ2V0IHRoZSByZWN0cyB3aWR0aCBhbmQgaGVpZ2h0IGFuZCBtYWtlIHN1cmUgdGhleSBh cmUgPiAwLgorICAgICAgICAgICAgbGV0IHNpemUgPSBsaW5lLm1hdGNoKC9OU1JlY3Q6IHt7W1xk XSssIFtcZF0rfSwgeyhbXGRdKyksIChbXGRdKyl9fS8pOworICAgICAgICAgICAgZGVidWcoYHdp ZHRoID4gMDogJHtzaXplWzFdID4gMH1gKTsKKyAgICAgICAgICAgIGRlYnVnKGBoZWlnaHQgPiAw OiAke3NpemVbMl0gPiAwfWApOworICAgICAgICB9KTsKKyAgICB9Cis8L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4K