212041 2020-05-18 13:28:46 -0700 Replace uses of +self with +class 2020-05-18 15:22:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aboxhall apinheiro cfleizach darin dmazzoni ews-watchlist jcraig jdiggs samuel_white simon.fraser thorton webkit-bug-importer oldest_to_newest 1653740 0 wenson_hsieh 2020-05-18 13:28:46 -0700 We currently use a mix of both (e.g. [Foo class] vs. [Foo self]) to retrieve the Objective-C Class instances. Ideally, we should be consistent. 1653750 1 399672 wenson_hsieh 2020-05-18 13:38:08 -0700 Created attachment 399672 Patch 1653772 2 399672 wenson_hsieh 2020-05-18 15:14:27 -0700 Comment on attachment 399672 Patch Thanks for the review! 1653774 3 ews-feeder 2020-05-18 15:22:07 -0700 Committed r261833: <https://trac.webkit.org/changeset/261833> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399672. 399672 2020-05-18 13:38:08 -0700 2020-05-18 15:22:07 -0700 Patch bug-212041-20200518133807.patch text/plain 21770 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY3NWJmNzBjZGY5ZmQz MGYwMjFhOTJhMWNkYmJjYzhkMTM5NjBhOC4uZDFiMmQ4NzZkM2YyZTNiMjVkMDcyMzc0NzQyNDE0 Y2ZjMjI1ZTFlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA1LTE4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlcGxhY2UgdXNl cyBvZiArc2VsZiB3aXRoICtjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEyMDQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYWNjZXNz aWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAg ICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIF9hY2Nlc3NpYmlsaXR5U2V0VmFsdWU6 Zm9yQXR0cmlidXRlOl0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ciBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6Zm9yUGFyYW1ldGVyOl0pOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjppc1dlYkxheWVyKToKKwogMjAyMC0wNS0x NiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBidWls ZCBhZnRlciByMjYxNzg1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA4MjMyMDAzYTYzYmUwNTNjYjZjMTI1YmI4NGU3 NDQ3Nzc1MmM4NzAwLi5iNWY3YjBhYjI2MzUwNmJhYTI3MTBjOTQ0YjlhZjRhMWQ1MGQyNzBlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTA1LTE4ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlcGxhY2UgdXNlcyBvZiArc2VsZiB3aXRo ICtjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjEyMDQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTaGFyZWQvQVBJL0NvY29hL19XS0ZyYW1lSGFuZGxlLm1tOgorICAgICAgICAoLVtfV0tGcmFt ZUhhbmRsZSBpc0VxdWFsOl0pOgorICAgICAgICAoLVtfV0tGcmFtZUhhbmRsZSBpbml0V2l0aENv ZGVyOl0pOgorICAgICAgICAqIFNoYXJlZC9Db2NvYS9BUElPYmplY3QubW06CisgICAgICAgIChB UEk6Ok9iamVjdDo6bmV3T2JqZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlld0NvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gX3NldEF0dGFjaG1lbnRGaWxlV3JhcHBlckNsYXNzOl0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25T dGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6 CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1BhZ2VDbGllbnRJbXBsQ29jb2EubW06CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsQ29jb2E6OmFsbG9jRmlsZVdyYXBwZXJJbnN0YW5j ZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsQ29jb2E6OnNlcmlhbGl6 YWJsZUZpbGVXcmFwcGVyQ2xhc3NlcyBjb25zdCk6CisgICAgICAgICogVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MubW06CisgICAgICAgICgrW1dLVHJh bnNmb3JtVmlldyBsYXllckNsYXNzXSk6CisgICAgICAgICgrW1dLU2ltcGxlQmFja2Ryb3BWaWV3 IGxheWVyQ2xhc3NdKTogRGVsZXRlZC4KKyAgICAgICAgKCtbV0tTaGFwZVZpZXcgbGF5ZXJDbGFz c10pOiBEZWxldGVkLgorICAgICAgICAoLVtXS1JlbW90ZVZpZXcgaW5pdFdpdGhGcmFtZTpjb250 ZXh0SUQ6XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9p b3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5tbToKKyAgICAgICAgKFdl YktpdDo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUzo6flNjcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MpOgorICAgICAgICAoV2ViS2l0OjpTY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TOjpyZXNldFNjcm9sbFZpZXdEZWxlZ2F0ZSk6Cisg ICAgICAgIChXZWJLaXQ6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1M6OnNj cm9sbFZpZXcgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHNlbGVjdEZvcm1BY2Nlc3Nv cnlQaWNrZXJSb3c6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgc2VsZWN0Rm9ybVBvcG92 ZXJUaXRsZV0pOgorCiAyMDIwLTA1LTE2ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4K IAogICAgICAgICBSRUdSRVNTSU9OIChyMjYwNzE3KTogaW5zdGFsbG1lbnRDb25maWd1cmF0aW9u IG1lbWJlciBpcyBubyBsb25nZXIgYXZhaWxhYmxlIG9uIEFwcGxlUGF5UGF5bWVudFJlcXVlc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggZWExMDE3ZTNjODk5 NDBjNDdmMTJmNGQ3OWYwYjJhN2M2YTNhMDhkNC4uMzdiODBlNzQ4OWRjNTI5MmMzNjYyOGMwZDQ3 ZjJlYjYwNjY5NThiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0K QEAgLTM1MTQsMTMgKzM1MTQsMTMgQEAgLSAodm9pZClfYWNjZXNzaWJpbGl0eVNldFZhbHVlOihp ZCl2YWx1ZSBmb3JBdHRyaWJ1dGU6KE5TU3RyaW5nKilhdHRyaWJ1dGVOYW1lCiAgICAgLy8gZGVj b2RlIHRoZSBwYXJhbWV0ZXIKICAgICBpZiAoQVhPYmplY3RJc1RleHRNYXJrZXJSYW5nZSh2YWx1 ZSkpCiAgICAgICAgIHRleHRNYXJrZXJSYW5nZSA9IHZhbHVlOwotICAgIGVsc2UgaWYgKFt2YWx1 ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBzZWxmXV0pCisgICAgZWxzZSBpZiAoW3ZhbHVlIGlz S2luZE9mQ2xhc3M6W05TTnVtYmVyIGNsYXNzXV0pCiAgICAgICAgIG51bWJlciA9IHZhbHVlOwot ICAgIGVsc2UgaWYgKFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBzZWxmXV0pCisgICAg ZWxzZSBpZiAoW3ZhbHVlIGlzS2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pCiAgICAgICAg IHN0cmluZyA9IHZhbHVlOwotICAgIGVsc2UgaWYgKFt2YWx1ZSBpc0tpbmRPZkNsYXNzOltOU1Zh bHVlIHNlbGZdXSkKKyAgICBlbHNlIGlmIChbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNWYWx1ZSBj bGFzc11dKQogICAgICAgICByYW5nZSA9IFt2YWx1ZSByYW5nZVZhbHVlXTsKLSAgICBlbHNlIGlm IChbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNBcnJheSBzZWxmXV0pCisgICAgZWxzZSBpZiAoW3Zh bHVlIGlzS2luZE9mQ2xhc3M6W05TQXJyYXkgY2xhc3NdXSkKICAgICAgICAgYXJyYXkgPSB2YWx1 ZTsKIAogICAgIC8vIGhhbmRsZSB0aGUgY29tbWFuZApAQCAtMzg5OCwyMSArMzg5OCwyMSBAQCBB TExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgdGV4dE1hcmtlciA9 IHBhcmFtZXRlcjsKICAgICBlbHNlIGlmIChBWE9iamVjdElzVGV4dE1hcmtlclJhbmdlKHBhcmFt ZXRlcikpCiAgICAgICAgIHRleHRNYXJrZXJSYW5nZSA9IHBhcmFtZXRlcjsKLSAgICBlbHNlIGlm IChbcGFyYW1ldGVyIGlzS2luZE9mQ2xhc3M6W1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy IHNlbGZdXSkKKyAgICBlbHNlIGlmIChbcGFyYW1ldGVyIGlzS2luZE9mQ2xhc3M6W1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGNsYXNzXV0pCiAgICAgICAgIHVpRWxlbWVudCA9IFsoV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIqKXBhcmFtZXRlciBheEJhY2tpbmdPYmplY3RdOwot ICAgIGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgc2VsZl1dKQor ICAgIGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkK ICAgICAgICAgbnVtYmVyID0gcGFyYW1ldGVyOwotICAgIGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNL aW5kT2ZDbGFzczpbTlNBcnJheSBzZWxmXV0pCisgICAgZWxzZSBpZiAoW3BhcmFtZXRlciBpc0tp bmRPZkNsYXNzOltOU0FycmF5IGNsYXNzXV0pCiAgICAgICAgIGFycmF5ID0gcGFyYW1ldGVyOwot ICAgIGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNEaWN0aW9uYXJ5IHNlbGZd XSkKKyAgICBlbHNlIGlmIChbcGFyYW1ldGVyIGlzS2luZE9mQ2xhc3M6W05TRGljdGlvbmFyeSBj bGFzc11dKQogICAgICAgICBkaWN0aW9uYXJ5ID0gcGFyYW1ldGVyOwotICAgIGVsc2UgaWYgKFtw YXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNWYWx1ZSBzZWxmXV0gJiYgIXN0cmNtcChbKE5TVmFs dWUqKXBhcmFtZXRlciBvYmpDVHlwZV0sIEBlbmNvZGUoTlNQb2ludCkpKSB7CisgICAgZWxzZSBp ZiAoW3BhcmFtZXRlciBpc0tpbmRPZkNsYXNzOltOU1ZhbHVlIGNsYXNzXV0gJiYgIXN0cmNtcChb KE5TVmFsdWUqKXBhcmFtZXRlciBvYmpDVHlwZV0sIEBlbmNvZGUoTlNQb2ludCkpKSB7CiAgICAg ICAgIHBvaW50U2V0ID0gdHJ1ZTsKICAgICAgICAgcG9pbnQgPSBbKE5TVmFsdWUqKXBhcmFtZXRl ciBwb2ludFZhbHVlXTsKLSAgICB9IGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpb TlNWYWx1ZSBzZWxmXV0gJiYgIXN0cmNtcChbKE5TVmFsdWUqKXBhcmFtZXRlciBvYmpDVHlwZV0s IEBlbmNvZGUoTlNSYW5nZSkpKSB7CisgICAgfSBlbHNlIGlmIChbcGFyYW1ldGVyIGlzS2luZE9m Q2xhc3M6W05TVmFsdWUgY2xhc3NdXSAmJiAhc3RyY21wKFsoTlNWYWx1ZSopcGFyYW1ldGVyIG9i akNUeXBlXSwgQGVuY29kZShOU1JhbmdlKSkpIHsKICAgICAgICAgcmFuZ2VTZXQgPSB0cnVlOwog ICAgICAgICByYW5nZSA9IFsoTlNWYWx1ZSopcGFyYW1ldGVyIHJhbmdlVmFsdWVdOwotICAgIH0g ZWxzZSBpZiAoW3BhcmFtZXRlciBpc0tpbmRPZkNsYXNzOltOU1ZhbHVlIHNlbGZdXSAmJiAhc3Ry Y21wKFsoTlNWYWx1ZSopcGFyYW1ldGVyIG9iakNUeXBlXSwgQGVuY29kZShOU1JlY3QpKSkKKyAg ICB9IGVsc2UgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNWYWx1ZSBjbGFzc11dICYm ICFzdHJjbXAoWyhOU1ZhbHVlKilwYXJhbWV0ZXIgb2JqQ1R5cGVdLCBAZW5jb2RlKE5TUmVjdCkp KQogICAgICAgICByZWN0ID0gWyhOU1ZhbHVlKilwYXJhbWV0ZXIgcmVjdFZhbHVlXTsKICAgICBl bHNlIHsKICAgICAgICAgLy8gQXR0cmlidXRlIHR5cGUgaXMgbm90IHN1cHBvcnRlZC4gQWxsb3cg c3VwZXIgdG8gaGFuZGxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCA1 Y2Q0NGYwOGRlY2U4ZmM5ODcwYmJmMDg0MTRhNGNmOTUzODAwMWFkLi45NTdkNzJhZDcxODUzNmQ1 NGExMTlkOTE4NDE1ZTRlY2M2MGZhMGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2Nv YS5tbQpAQCAtMTA5MCw3ICsxMDkwLDcgQEAgYm9vbCBQbGF0Zm9ybUNBTGF5ZXI6OmlzV2ViTGF5 ZXIoKQogewogICAgIEJPT0wgcmVzdWx0ID0gTk87CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENF UFRJT05TCi0gICAgcmVzdWx0ID0gW21fbGF5ZXIgaXNLaW5kT2ZDbGFzczpbV2ViTGF5ZXIgc2Vs Zl1dOworICAgIHJlc3VsdCA9IFttX2xheWVyIGlzS2luZE9mQ2xhc3M6W1dlYkxheWVyIGNsYXNz XV07CiAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwogICAgIHJldHVybiByZXN1bHQ7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvX1dLRnJhbWVIYW5k bGUubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvX1dLRnJhbWVIYW5kbGUubW0K aW5kZXggZDEwZjU4NDlhMmNmMjgyMjk1ODRmNjk2NzY5YTU1Njg0ZGZjYWE3OC4uNmNlZTcxY2U3 NWVlNGRkMjRmMDM0NDdkYTg0ZDk0ODdhN2FjZWQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvQVBJL0NvY29hL19XS0ZyYW1lSGFuZGxlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL0FQSS9Db2NvYS9fV0tGcmFtZUhhbmRsZS5tbQpAQCAtNDIsNyArNDIsNyBAQCAtIChC T09MKWlzRXF1YWw6KGlkKW9iamVjdAogICAgIGlmIChvYmplY3QgPT0gc2VsZikKICAgICAgICAg cmV0dXJuIFlFUzsKIAotICAgIGlmICghW29iamVjdCBpc0tpbmRPZkNsYXNzOltfV0tGcmFtZUhh bmRsZSBzZWxmXV0pCisgICAgaWYgKCFbb2JqZWN0IGlzS2luZE9mQ2xhc3M6W19XS0ZyYW1lSGFu ZGxlIGNsYXNzXV0pCiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIHJldHVybiBfZnJhbWVIYW5k bGUtPmZyYW1lSUQoKSA9PSAoKF9XS0ZyYW1lSGFuZGxlICopb2JqZWN0KS0+X2ZyYW1lSGFuZGxl LT5mcmFtZUlEKCk7CkBAIC03Nyw4ICs3Nyw4IEBAIC0gKGlkKWluaXRXaXRoQ29kZXI6KE5TQ29k ZXIgKilkZWNvZGVyCiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJl dHVybiBuaWw7CiAKLSAgICBOU051bWJlciAqZnJhbWVJRCA9IFtkZWNvZGVyIGRlY29kZU9iamVj dE9mQ2xhc3M6W05TTnVtYmVyIHNlbGZdIGZvcktleTpAImZyYW1lSUQiXTsKLSAgICBpZiAoIVtm cmFtZUlEIGlzS2luZE9mQ2xhc3M6W05TTnVtYmVyIHNlbGZdXSkgeworICAgIE5TTnVtYmVyICpm cmFtZUlEID0gW2RlY29kZXIgZGVjb2RlT2JqZWN0T2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdIGZv cktleTpAImZyYW1lSUQiXTsKKyAgICBpZiAoIVtmcmFtZUlEIGlzS2luZE9mQ2xhc3M6W05TTnVt YmVyIGNsYXNzXV0pIHsKICAgICAgICAgW3NlbGYgcmVsZWFzZV07CiAgICAgICAgIHJldHVybiBu aWw7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvQVBJT2Jq ZWN0Lm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCmluZGV4IGI5 ZDExZGFiNzlmZDI0OWIzNjYzNmM3NGVhOWEzYTA5YmJlOWRmMTUuLjE3MzBiZDQ5M2ZkMGI0NmRl ZWNjMjQ3ZDdjMTgyY2Q2ODI4ZGE2MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0NvY29hL0FQSU9iamVjdC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9BUElP YmplY3QubW0KQEAgLTE1NCw3ICsxNTQsNyBAQCB2b2lkKiBPYmplY3Q6Om5ld09iamVjdChzaXpl X3Qgc2l6ZSwgVHlwZSB0eXBlKQogCiAgICAgY2FzZSBUeXBlOjpBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZToKICAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICAg ICAgd3JhcHBlciA9IGFsbG9jYXRlV0tPYmplY3QoW1dLTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSBzZWxmXSwgc2l6ZSk7CisgICAgICAgIHdyYXBwZXIgPSBhbGxvY2F0ZVdLT2JqZWN0KFtX S05TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgY2xhc3NdLCBzaXplKTsKICAgICAgICAgQUxM T1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgICAgIGJyZWFrOwogCkBAIC0xOTAs NyArMTkwLDcgQEAgdm9pZCogT2JqZWN0OjpuZXdPYmplY3Qoc2l6ZV90IHNpemUsIFR5cGUgdHlw ZSkKICAgICAgICAgLy8gV2hpbGUgbm90IGFjdHVhbGx5IGEgV0tPYmplY3QgaW5zdGFuY2UsIFdL Q29ubmVjdGlvbiB1c2VzIGFsbG9jYXRlV0tPYmplY3QgdG8gYWxsb2NhdGUgZXh0cmEgc3BhY2UK ICAgICAgICAgLy8gaW5zdGVhZCBvZiB1c2luZyBPYmplY3RTdG9yYWdlIGJlY2F1c2UgdGhlIHdy YXBwZWQgQysrIG9iamVjdCBpcyBhIHN1YmNsYXNzIG9mIFdlYkNvbm5lY3Rpb24uCiAgICAgICAg IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAgICAgIHdyYXBwZXIgPSBh bGxvY2F0ZVdLT2JqZWN0KFtXS0Nvbm5lY3Rpb24gc2VsZl0sIHNpemUpOworICAgICAgICB3cmFw cGVyID0gYWxsb2NhdGVXS09iamVjdChbV0tDb25uZWN0aW9uIGNsYXNzXSwgc2l6ZSk7CiAgICAg ICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgICAgICBicmVhazsKIApA QCAtMjMxLDcgKzIzMSw3IEBAIHZvaWQqIE9iamVjdDo6bmV3T2JqZWN0KHNpemVfdCBzaXplLCBU eXBlIHR5cGUpCiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBUeXBlOjpFcnJvcjoKLSAgICAg ICAgd3JhcHBlciA9IGFsbG9jYXRlV0tPYmplY3QoW1dLTlNFcnJvciBzZWxmXSwgc2l6ZSk7Cisg ICAgICAgIHdyYXBwZXIgPSBhbGxvY2F0ZVdLT2JqZWN0KFtXS05TRXJyb3IgY2xhc3NdLCBzaXpl KTsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFR5cGU6OkZyYW1lSGFuZGxlOgpAQCAtMjk4 LDE1ICsyOTgsMTUgQEAgdm9pZCogT2JqZWN0OjpuZXdPYmplY3Qoc2l6ZV90IHNpemUsIFR5cGUg dHlwZSkKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFR5cGU6OlN0cmluZzoKLSAgICAgICAg d3JhcHBlciA9IGFsbG9jYXRlV0tPYmplY3QoW1dLTlNTdHJpbmcgc2VsZl0sIHNpemUpOworICAg ICAgICB3cmFwcGVyID0gYWxsb2NhdGVXS09iamVjdChbV0tOU1N0cmluZyBjbGFzc10sIHNpemUp OwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgVHlwZTo6VVJMOgotICAgICAgICB3cmFwcGVy ID0gYWxsb2NhdGVXS09iamVjdChbV0tOU1VSTCBzZWxmXSwgc2l6ZSk7CisgICAgICAgIHdyYXBw ZXIgPSBhbGxvY2F0ZVdLT2JqZWN0KFtXS05TVVJMIGNsYXNzXSwgc2l6ZSk7CiAgICAgICAgIGJy ZWFrOwogCiAgICAgY2FzZSBUeXBlOjpVUkxSZXF1ZXN0OgotICAgICAgICB3cmFwcGVyID0gYWxs b2NhdGVXS09iamVjdChbV0tOU1VSTFJlcXVlc3Qgc2VsZl0sIHNpemUpOworICAgICAgICB3cmFw cGVyID0gYWxsb2NhdGVXS09iamVjdChbV0tOU1VSTFJlcXVlc3QgY2xhc3NdLCBzaXplKTsKICAg ICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFR5cGU6OlVSTFNjaGVtZVRhc2s6CkBAIC00MjUsNyAr NDI1LDcgQEAgdm9pZCogT2JqZWN0OjpuZXdPYmplY3Qoc2l6ZV90IHNpemUsIFR5cGUgdHlwZSkK ICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0OgotICAgICAgICB3cmFwcGVyID0gYWxsb2Nh dGVXS09iamVjdChbV0tPYmplY3Qgc2VsZl0sIHNpemUpOworICAgICAgICB3cmFwcGVyID0gYWxs b2NhdGVXS09iamVjdChbV0tPYmplY3QgY2xhc3NdLCBzaXplKTsKICAgICAgICAgYnJlYWs7CiAg ICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Q29uZmlndXJhdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCmluZGV4IGEwZjEwMmI4MzNlOGJmZGE4MzEwNGU3 MmQ0M2YwNTg0MzU1MTAxYjMuLmYyNzZkZTQ1MzAyNTcxODY5MTdiYjhhNTU0MGI0NjhiZTllM2I0 ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdDb25maWd1cmF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCkBAIC04NjYsNyArODY2LDcgQEAgLSAoQ2xhc3Mp X2F0dGFjaG1lbnRGaWxlV3JhcHBlckNsYXNzCiAKIC0gKHZvaWQpX3NldEF0dGFjaG1lbnRGaWxl V3JhcHBlckNsYXNzOihDbGFzcylhdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzcwogewotICAgIGlm IChhdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzcyAmJiAhW2F0dGFjaG1lbnRGaWxlV3JhcHBlckNs YXNzIGlzU3ViY2xhc3NPZkNsYXNzOltOU0ZpbGVXcmFwcGVyIHNlbGZdXSkKKyAgICBpZiAoYXR0 YWNobWVudEZpbGVXcmFwcGVyQ2xhc3MgJiYgIVthdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzcyBp c1N1YmNsYXNzT2ZDbGFzczpbTlNGaWxlV3JhcHBlciBjbGFzc11dKQogICAgICAgICBbTlNFeGNl cHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiQ2xhc3MgJUAg ZG9lcyBub3QgaW5oZXJpdCBmcm9tIE5TRmlsZVdyYXBwZXIiLCBhdHRhY2htZW50RmlsZVdyYXBw ZXJDbGFzc107CiAKICAgICBfYXR0YWNobWVudEZpbGVXcmFwcGVyQ2xhc3MgPSBhdHRhY2htZW50 RmlsZVdyYXBwZXJDbGFzczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL05hdmlnYXRpb25TdGF0ZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05h dmlnYXRpb25TdGF0ZS5tbQppbmRleCBkOWEzMWQzMjNkNzM4ZjkzZGM3NzAyZWZjYmRlYjVkZjA4 NWE4MTU4Li4zMmJiMjNhOTI5MjNlYjBjOTdlM2U3YWM2OGMzMGRlZTI1MDE4MjJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC01 OTgsMTMgKzU5OCwxMyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUAogICAgICAgICBjaGVja2Vy LT5kaWRDYWxsQ29tcGxldGlvbkhhbmRsZXIoKTsKIAogICAgICAgICBSZWZQdHI8QVBJOjpXZWJz aXRlUG9saWNpZXM+IGFwaVdlYnNpdGVQb2xpY2llczsKLSAgICAgICAgaWYgKFtwb2xpY2llc09y UHJlZmVyZW5jZXMgaXNLaW5kT2ZDbGFzczpXS1dlYnBhZ2VQcmVmZXJlbmNlcy5zZWxmXSkKKyAg ICAgICAgaWYgKFtwb2xpY2llc09yUHJlZmVyZW5jZXMgaXNLaW5kT2ZDbGFzczpXS1dlYnBhZ2VQ cmVmZXJlbmNlcy5jbGFzc10pCiAgICAgICAgICAgICBhcGlXZWJzaXRlUG9saWNpZXMgPSAoKFdL V2VicGFnZVByZWZlcmVuY2VzICopcG9saWNpZXNPclByZWZlcmVuY2VzKS0+X3dlYnNpdGVQb2xp Y2llcy5nZXQoKTsKIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAgICAg IGVsc2UgaWYgKFtwb2xpY2llc09yUHJlZmVyZW5jZXMgaXNLaW5kT2ZDbGFzczpfV0tXZWJzaXRl UG9saWNpZXMuc2VsZl0pCisgICAgICAgIGVsc2UgaWYgKFtwb2xpY2llc09yUHJlZmVyZW5jZXMg aXNLaW5kT2ZDbGFzczpfV0tXZWJzaXRlUG9saWNpZXMuY2xhc3NdKQogICAgICAgICAgICAgYXBp V2Vic2l0ZVBvbGljaWVzID0gW3BvbGljaWVzT3JQcmVmZXJlbmNlcyB3ZWJwYWdlUHJlZmVyZW5j ZXNdLT5fd2Vic2l0ZVBvbGljaWVzLmdldCgpOwogICAgICAgICBlbHNlIGlmIChwb2xpY2llc09y UHJlZmVyZW5jZXMpCi0gICAgICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJn dW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiRXhwZWN0ZWQgcG9saWNpZXMgb2YgY2xhc3MgJUAsIGJ1 dCBnb3QgJUAiLCBOU1N0cmluZ0Zyb21DbGFzcyhfV0tXZWJzaXRlUG9saWNpZXMuc2VsZiksIFtw b2xpY2llc09yUHJlZmVyZW5jZXMgY2xhc3NdXTsKKyAgICAgICAgICAgIFtOU0V4Y2VwdGlvbiBy YWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCJFeHBlY3RlZCBwb2xpY2ll cyBvZiBjbGFzcyAlQCwgYnV0IGdvdCAlQCIsIE5TU3RyaW5nRnJvbUNsYXNzKF9XS1dlYnNpdGVQ b2xpY2llcy5jbGFzcyksIFtwb2xpY2llc09yUHJlZmVyZW5jZXMgY2xhc3NdXTsKIEFMTE9XX0RF UFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgICAgICBlbHNlCiAgICAgICAgICAgICBhcGlX ZWJzaXRlUG9saWNpZXMgPSBkZWZhdWx0V2Vic2l0ZVBvbGljaWVzOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvUGFnZUNsaWVudEltcGxDb2NvYS5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1BhZ2VDbGllbnRJbXBsQ29jb2EubW0KaW5kZXggZDk2 YTBlZjRmMDE3YjliNTA1MmY5MzcyYTQ5NTIyYjAzOGJhNGU4NC4uYWFmYTZiZmUwNGMxYzk1OGVk NjNkZWU0ZjllMmU4ZTRkM2E4ODU5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvUGFnZUNsaWVudEltcGxDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1wbENvY29hLm1tCkBAIC03NiwxMyArNzYsMTMgQEAgdm9p ZCBQYWdlQ2xpZW50SW1wbENvY29hOjpkaWRJbnZhbGlkYXRlRGF0YUZvckF0dGFjaG1lbnQoQVBJ OjpBdHRhY2htZW50JiBhdHRhY2gKIAogTlNGaWxlV3JhcHBlciAqUGFnZUNsaWVudEltcGxDb2Nv YTo6YWxsb2NGaWxlV3JhcHBlckluc3RhbmNlKCkgY29uc3QKIHsKLSAgICBDbGFzcyBjbHMgPSBb bV93ZWJWaWV3IGNvbmZpZ3VyYXRpb25dLl9hdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzcyA/OiBb TlNGaWxlV3JhcHBlciBzZWxmXTsKKyAgICBDbGFzcyBjbHMgPSBbbV93ZWJWaWV3IGNvbmZpZ3Vy YXRpb25dLl9hdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzcyA/OiBbTlNGaWxlV3JhcHBlciBjbGFz c107CiAgICAgcmV0dXJuIFtjbHMgYWxsb2NdOwogfQogCiBOU1NldCAqUGFnZUNsaWVudEltcGxD b2NvYTo6c2VyaWFsaXphYmxlRmlsZVdyYXBwZXJDbGFzc2VzKCkgY29uc3QKIHsKLSAgICBDbGFz cyBkZWZhdWx0RmlsZVdyYXBwZXJDbGFzcyA9IE5TRmlsZVdyYXBwZXIuc2VsZjsKKyAgICBDbGFz cyBkZWZhdWx0RmlsZVdyYXBwZXJDbGFzcyA9IE5TRmlsZVdyYXBwZXIuY2xhc3M7CiAgICAgQ2xh c3MgY29uZmlndXJlZEZpbGVXcmFwcGVyQ2xhc3MgPSBbbV93ZWJWaWV3IGNvbmZpZ3VyYXRpb25d Ll9hdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzczsKICAgICBpZiAoY29uZmlndXJlZEZpbGVXcmFw cGVyQ2xhc3MgJiYgY29uZmlndXJlZEZpbGVXcmFwcGVyQ2xhc3MgIT0gZGVmYXVsdEZpbGVXcmFw cGVyQ2xhc3MpCiAgICAgICAgIHJldHVybiBbTlNTZXQgc2V0V2l0aE9iamVjdHM6Y29uZmlndXJl ZEZpbGVXcmFwcGVyQ2xhc3MsIGRlZmF1bHRGaWxlV3JhcHBlckNsYXNzLCBuaWxdOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVM YXllclRyZWVWaWV3cy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MubW0KaW5kZXggNjlmMWZjMTYxY2Q2YWExZjU0MzUw YjlhNmY4MGQ1OGZkMTRjOTJkMC4uNTJhOGE3NTZiYjQ5ZGJkYTY0MTc4NDRiYWUxYTY0YWVjNDQ2 ODIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L2lvcy9SZW1vdGVMYXllclRyZWVWaWV3cy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLm1tCkBAIC0yODQsNyAr Mjg0LDcgQEAgQGltcGxlbWVudGF0aW9uIFdLVHJhbnNmb3JtVmlldwogCiArIChDbGFzcylsYXll ckNsYXNzCiB7Ci0gICAgcmV0dXJuIFtDQVRyYW5zZm9ybUxheWVyIHNlbGZdOworICAgIHJldHVy biBbQ0FUcmFuc2Zvcm1MYXllciBjbGFzc107CiB9CiAKIEBlbmQKQEAgLTI5Myw3ICsyOTMsNyBA QCBAaW1wbGVtZW50YXRpb24gV0tTaW1wbGVCYWNrZHJvcFZpZXcKIAogKyAoQ2xhc3MpbGF5ZXJD bGFzcwogewotICAgIHJldHVybiBbQ0FCYWNrZHJvcExheWVyIHNlbGZdOworICAgIHJldHVybiBb Q0FCYWNrZHJvcExheWVyIGNsYXNzXTsKIH0KIAogQGVuZApAQCAtMzAyLDcgKzMwMiw3IEBAIEBp bXBsZW1lbnRhdGlvbiBXS1NoYXBlVmlldwogCiArIChDbGFzcylsYXllckNsYXNzCiB7Ci0gICAg cmV0dXJuIFtDQVNoYXBlTGF5ZXIgc2VsZl07CisgICAgcmV0dXJuIFtDQVNoYXBlTGF5ZXIgY2xh c3NdOwogfQogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MubW0KaW5kZXggMjg4NzEzN2UwY2Q5ODI5MzZjOGZm MzIzZDJmNThiODk2OTI2ZDY1My4uNjcyMjYzYTFlN2MzYTFlNTRmNWJkOTBjMGFlZTE2YWM2ZDFm OTFkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9s bGluZ05vZGVEZWxlZ2F0ZUlPUy5tbQpAQCAtMjAxLDcgKzIwMSw3IEBAIFNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlRGVsZWdhdGVJT1M6On5TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVn YXRlSU9TKCkKIHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKICAgICBpZiAoVUlT Y3JvbGxWaWV3ICpzY3JvbGxWaWV3ID0gKFVJU2Nyb2xsVmlldyAqKVtzY3JvbGxMYXllcigpIGRl bGVnYXRlXSkgewotICAgICAgICBBU1NFUlQoW3Njcm9sbFZpZXcgaXNLaW5kT2ZDbGFzczpbVUlT Y3JvbGxWaWV3IHNlbGZdXSk7CisgICAgICAgIEFTU0VSVChbc2Nyb2xsVmlldyBpc0tpbmRPZkNs YXNzOltVSVNjcm9sbFZpZXcgY2xhc3NdXSk7CiAgICAgICAgIC8vIFRoZSBzY3JvbGxWaWV3IG1h eSBoYXZlIGJlZW4gYWRvcHRlZCBieSBhbm90aGVyIG5vZGUsIHNvIG9ubHkgY2xlYXIgdGhlIGRl bGVnYXRlIGlmIGl0J3Mgb3Vycy4KICAgICAgICAgaWYgKHNjcm9sbFZpZXcuZGVsZWdhdGUgPT0g bV9zY3JvbGxWaWV3RGVsZWdhdGUuZ2V0KCkpCiAgICAgICAgICAgICBzY3JvbGxWaWV3LmRlbGVn YXRlID0gbmlsOwpAQCAtMjEzLDcgKzIxMyw3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGVEZWxlZ2F0ZUlPUzo6cmVzZXRTY3JvbGxWaWV3RGVsZWdhdGUoKQogewogICAgIEJFR0lO X0JMT0NLX09CSkNfRVhDRVBUSU9OUwogICAgIGlmIChVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcg PSAoVUlTY3JvbGxWaWV3ICopW3Njcm9sbExheWVyKCkgZGVsZWdhdGVdKSB7Ci0gICAgICAgIEFT U0VSVChbc2Nyb2xsVmlldyBpc0tpbmRPZkNsYXNzOltVSVNjcm9sbFZpZXcgc2VsZl1dKTsKKyAg ICAgICAgQVNTRVJUKFtzY3JvbGxWaWV3IGlzS2luZE9mQ2xhc3M6W1VJU2Nyb2xsVmlldyBjbGFz c11dKTsKICAgICAgICAgc2Nyb2xsVmlldy5kZWxlZ2F0ZSA9IG5pbDsKICAgICB9CiAgICAgRU5E X0JMT0NLX09CSkNfRVhDRVBUSU9OUwpAQCAtMzQwLDcgKzM0MCw3IEBAIHZvaWQgU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUzo6Y3VycmVudFNuYXBQb2ludEluZGljZXNEaWRD aGFuZ2UodW5zCiBVSVNjcm9sbFZpZXcgKlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdh dGVJT1M6OnNjcm9sbFZpZXcoKSBjb25zdAogewogICAgIFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmll dyA9IChVSVNjcm9sbFZpZXcgKilbc2Nyb2xsTGF5ZXIoKSBkZWxlZ2F0ZV07Ci0gICAgQVNTRVJU KFtzY3JvbGxWaWV3IGlzS2luZE9mQ2xhc3M6W1VJU2Nyb2xsVmlldyBzZWxmXV0pOworICAgIEFT U0VSVChbc2Nyb2xsVmlldyBpc0tpbmRPZkNsYXNzOltVSVNjcm9sbFZpZXcgY2xhc3NdXSk7CiAg ICAgcmV0dXJuIHNjcm9sbFZpZXc7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDc3MTgyNjg4ZDk2 ZWM0NGE5Mzg5MmJhY2VlNmIwMDcxNGMxNmJiZjAuLjA2YTVmYWMwYmU1MTc3YjY0NzQyODljMzZh YmM4ZmMwZTcxZmNjZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtODc1Miw3ICs4NzUyLDcgQEAgLSAo dm9pZClzZWxlY3RGb3JtQWNjZXNzb3J5UGlja2VyUm93OihOU0ludGVnZXIpcm93SW5kZXgKICAg ICBpZiAoW19wcmVzZW50ZWRGdWxsU2NyZWVuSW5wdXRWaWV3Q29udHJvbGxlciBpc0tpbmRPZkNs YXNzOltXS1NlbGVjdE1lbnVMaXN0Vmlld0NvbnRyb2xsZXIgY2xhc3NdXSkKICAgICAgICAgWyhX S1NlbGVjdE1lbnVMaXN0Vmlld0NvbnRyb2xsZXIgKilfcHJlc2VudGVkRnVsbFNjcmVlbklucHV0 Vmlld0NvbnRyb2xsZXIuZ2V0KCkgc2VsZWN0SXRlbUF0SW5kZXg6cm93SW5kZXhdOwogI2Vsc2UK LSAgICBpZiAoW19pbnB1dFBlcmlwaGVyYWwgaXNLaW5kT2ZDbGFzczpbV0tGb3JtU2VsZWN0Q29u dHJvbCBzZWxmXV0pCisgICAgaWYgKFtfaW5wdXRQZXJpcGhlcmFsIGlzS2luZE9mQ2xhc3M6W1dL Rm9ybVNlbGVjdENvbnRyb2wgY2xhc3NdXSkKICAgICAgICAgWyhXS0Zvcm1TZWxlY3RDb250cm9s ICopX2lucHV0UGVyaXBoZXJhbCBzZWxlY3RSb3c6cm93SW5kZXggaW5Db21wb25lbnQ6MCBleHRl bmRpbmdTZWxlY3Rpb246Tk9dOwogI2VuZGlmCiB9CkBAIC04NzY4LDcgKzg3NjgsNyBAQCAtIChO U1N0cmluZyAqKXRleHRDb250ZW50VHlwZUZvclRlc3RpbmcKIAogLSAoTlNTdHJpbmcgKilzZWxl Y3RGb3JtUG9wb3ZlclRpdGxlCiB7Ci0gICAgaWYgKCFbX2lucHV0UGVyaXBoZXJhbCBpc0tpbmRP ZkNsYXNzOltXS0Zvcm1TZWxlY3RDb250cm9sIHNlbGZdXSkKKyAgICBpZiAoIVtfaW5wdXRQZXJp cGhlcmFsIGlzS2luZE9mQ2xhc3M6W1dLRm9ybVNlbGVjdENvbnRyb2wgY2xhc3NdXSkKICAgICAg ICAgcmV0dXJuIG5pbDsKIAogICAgIHJldHVybiBbKFdLRm9ybVNlbGVjdENvbnRyb2wgKilfaW5w dXRQZXJpcGhlcmFsIHNlbGVjdEZvcm1Qb3BvdmVyVGl0bGVdOwpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDM5NTkwOTE4ZmI2M2EwODUzMGRmMmRk ODhiMWYwYTkxYzIzZTU5OGYuLmQ2NmZiOTcwMGNkNDA4YTI3NzM5ZDQ2NDY5ZmYxYmQ1MDRjMjA3 NDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAyMC0wNS0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIHVzZXMgb2YgK3NlbGYgd2l0aCArY2xhc3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjA0MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW06CisgICAgICAgICgtW0V2ZW50U2Vu ZGluZ0NvbnRyb2xsZXIgbW9uaXRvcldoZWVsRXZlbnRzV2l0aE9wdGlvbnM6XSk6CisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbToK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvaW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbToKKyAgICAgICAgKFdUUjo6ZW5jbG9zaW5n U2Nyb2xsVmlld0luY2x1ZGluZ1NlbGYpOgorCiAyMDIwLTA1LTE1ICBMYXVybyBNb3VyYSAgPGxt b3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gQWRkIGRlZmF1bHQgaW5pdGlh bGl6YXRpb24gb2YgV2Vic2l0ZURhdGFTdG9yZSB0byBXZWJLaXRUZXN0UnVubmVyIGFmdGVyIHIy NjE3NTgKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNlbmRpbmdD b250cm9sbGVyLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRy b2xsZXIubW0KaW5kZXggNDhiNjY3ZGUxNDJiZWM1OWRiYzIyMWNiYWUwMGRjODUwNGRkMmU5Mi4u NWMwMTI4N2QwYWVkYTlkNGEzNzEyZGJjNjNiMTMyNGY3N2EyYmI3MiAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KKysrIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KQEAgLTEzOTks OSArMTM5OSw5IEBAIC0gKHZvaWQpbW9uaXRvcldoZWVsRXZlbnRzV2l0aE9wdGlvbnM6KFdlYlNj cmlwdE9iamVjdCopb3B0aW9ucwogCiAgICAgYm9vbCByZXNldExhdGNoaW5nID0gdHJ1ZTsKIAot ICAgIGlmICghW29wdGlvbnMgaXNLaW5kT2ZDbGFzczpbV2ViVW5kZWZpbmVkIHNlbGZdXSkgewor ICAgIGlmICghW29wdGlvbnMgaXNLaW5kT2ZDbGFzczpbV2ViVW5kZWZpbmVkIGNsYXNzXV0pIHsK ICAgICAgICAgaWYgKGlkIHJlc2V0TGF0Y2hpbmdWYWx1ZSA9IFtvcHRpb25zIHZhbHVlRm9yS2V5 OkAicmVzZXRMYXRjaGluZyJdKSB7Ci0gICAgICAgICAgICBpZiAoW3Jlc2V0TGF0Y2hpbmdWYWx1 ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBzZWxmXV0pCisgICAgICAgICAgICBpZiAoW3Jlc2V0 TGF0Y2hpbmdWYWx1ZSBpc0tpbmRPZkNsYXNzOltOU051bWJlciBjbGFzc11dKQogICAgICAgICAg ICAgICAgIHJlc2V0TGF0Y2hpbmcgPSBbcmVzZXRMYXRjaGluZ1ZhbHVlIGJvb2xWYWx1ZV07CiAg ICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQppbmRleCAxZGY4Mjk1NzIwMzIxNmVl NmZhNjRkY2VmNDcxNTI1OWZmYWIyMWY3Li4xMmZhNTA2N2IzY2YxMTkzZTc5ZGEzOTUwZTA3Yjkz NzRiNGEzN2ZlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dLQXR0YWNobWVudFRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KQEAgLTE0NzAsMTMgKzE0NzAsMTMgQEAg VEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQ3VzdG9tRmlsZVdyYXBwZXJTdWJjbGFzcykKICAgICBb Y29uZmlndXJhdGlvbiBfc2V0QXR0YWNobWVudEVsZW1lbnRFbmFibGVkOllFU107CiAgICAgUmV0 YWluUHRyPE5TRXhjZXB0aW9uPiBleGNlcHRpb247CiAgICAgQHRyeSB7Ci0gICAgICAgIFtjb25m aWd1cmF0aW9uIF9zZXRBdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzczpbTlNBcnJheSBzZWxmXV07 CisgICAgICAgIFtjb25maWd1cmF0aW9uIF9zZXRBdHRhY2htZW50RmlsZVdyYXBwZXJDbGFzczpb TlNBcnJheSBjbGFzc11dOwogICAgIH0gQGNhdGNoKE5TRXhjZXB0aW9uICpjYXVnaHQpIHsKICAg ICAgICAgZXhjZXB0aW9uID0gY2F1Z2h0OwogICAgIH0KICAgICBFWFBFQ1RfVFJVRShleGNlcHRp b24pOwogCi0gICAgW2NvbmZpZ3VyYXRpb24gX3NldEF0dGFjaG1lbnRGaWxlV3JhcHBlckNsYXNz OltGaWxlV3JhcHBlciBzZWxmXV07CisgICAgW2NvbmZpZ3VyYXRpb24gX3NldEF0dGFjaG1lbnRG aWxlV3JhcHBlckNsYXNzOltGaWxlV3JhcHBlciBjbGFzc11dOwogCiAgICAgYXV0byB3ZWJWaWV3 ID0gd2ViVmlld0ZvclRlc3RpbmdBdHRhY2htZW50cyhDR1NpemVaZXJvLCBjb25maWd1cmF0aW9u LmdldCgpKTsKIApAQCAtMTQ4Niw3ICsxNDg2LDcgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywg Q3VzdG9tRmlsZVdyYXBwZXJTdWJjbGFzcykKICAgICBOU0FycmF5PF9XS0F0dGFjaG1lbnQgKj4g KiBpbnNlcnRlZEF0dGFjaG1lbnRzID0gb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5pbnNlcnRlZDsKIAog ICAgIEVYUEVDVF9FUSgxVSwgaW5zZXJ0ZWRBdHRhY2htZW50cy5jb3VudCk7Ci0gICAgRVhQRUNU X0VRKFtGaWxlV3JhcHBlciBzZWxmXSwgW2luc2VydGVkQXR0YWNobWVudHMuZmlyc3RPYmplY3Qu aW5mby5maWxlV3JhcHBlciBjbGFzc10pOworICAgIEVYUEVDVF9FUShbRmlsZVdyYXBwZXIgY2xh c3NdLCBbaW5zZXJ0ZWRBdHRhY2htZW50cy5maXJzdE9iamVjdC5pbmZvLmZpbGVXcmFwcGVyIGNs YXNzXSk7CiB9CiAKIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyB2ZXJzaW9uIGd1YXJkIG9uY2UgcmRh cjovLzUxNzUyNTkzIGlzIHJlc29sdmVkLgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tCmluZGV4IDE0ZTZkZjg3MWJhYTYxY2UyZGRm YWNkMjYxNDI5Y2Y3OTM2YzEyYmMuLjQ0MWMwYWE0NGNhNGQwZDI2OTZhNDUxMzZkZTQ0NzgyNjFl YTY2NTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1VJU2NyaXB0Q29u dHJvbGxlcklPUy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9VSVNjcmlwdENv bnRyb2xsZXJJT1MubW0KQEAgLTY3Nyw3ICs2NzcsNyBAQCB2b2lkIFVJU2NyaXB0Q29udHJvbGxl cklPUzo6aW1tZWRpYXRlU2Nyb2xsVG9PZmZzZXQobG9uZyB4LCBsb25nIHkpCiBzdGF0aWMgVUlT Y3JvbGxWaWV3ICplbmNsb3NpbmdTY3JvbGxWaWV3SW5jbHVkaW5nU2VsZihVSVZpZXcgKnZpZXcp CiB7CiAgICAgZG8gewotICAgICAgICBpZiAoW3ZpZXcgaXNLaW5kT2ZDbGFzczpbVUlTY3JvbGxW aWV3IHNlbGZdXSkKKyAgICAgICAgaWYgKFt2aWV3IGlzS2luZE9mQ2xhc3M6W1VJU2Nyb2xsVmll dyBjbGFzc11dKQogICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFVJU2Nyb2xsVmlldyAq Pih2aWV3KTsKICAgICB9IHdoaWxlICgodmlldyA9IFt2aWV3IHN1cGVydmlld10pKTsKIAo=