198267 2019-05-26 21:21:21 -0700 [iOS] Dropping in an editable element shouldn't result in a ranged selection 2019-05-27 22:09:58 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue dino simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1539321 0 wenson_hsieh 2019-05-26 21:21:21 -0700 <rdar://problem/51145977> 1539334 1 370669 wenson_hsieh 2019-05-26 22:49:56 -0700 Created attachment 370669 Patch 1539454 2 wenson_hsieh 2019-05-27 15:09:59 -0700 > Failures in API Test first run: set([u'TestWebKitAPI._WKDownload.DownloadMonitorCancel']) > Failures in API Test second run: set([u'TestWebKitAPI._WKDownload.DownloadMonitorCancel']) > Flaky Tests: set([]) > Failures in API Test on clean tree: set([]) > New failures: set([u'TestWebKitAPI._WKDownload.DownloadMonitorCancel']) The macOS API test failure seems unrelated. 1539463 3 370669 thorton 2019-05-27 17:26:22 -0700 Comment on attachment 370669 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370669&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:881 > static auto defaultTextIndicatorOptionsForEditDrag = TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection | TextIndicatorOptionExpandClipBeyondVisibleRect | TextIndicatorOptionPaintAllContent | TextIndicatorOptionIncludeMarginIfRangeMatchesSelection | TextIndicatorOptionPaintBackgrounds | TextIndicatorOptionComputeEstimatedBackgroundColor| TextIndicatorOptionUseSelectionRectForSizing | TextIndicatorOptionIncludeSnapshotWithSelectionHighlight; Ho-ly crap 1539464 4 370669 wenson_hsieh 2019-05-27 17:35:17 -0700 Comment on attachment 370669 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370669&action=review >> Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:881 >> static auto defaultTextIndicatorOptionsForEditDrag = TextIndicatorOptionIncludeSnapshotOfAllVisibleContentWithoutSelection | TextIndicatorOptionExpandClipBeyondVisibleRect | TextIndicatorOptionPaintAllContent | TextIndicatorOptionIncludeMarginIfRangeMatchesSelection | TextIndicatorOptionPaintBackgrounds | TextIndicatorOptionComputeEstimatedBackgroundColor| TextIndicatorOptionUseSelectionRectForSizing | TextIndicatorOptionIncludeSnapshotWithSelectionHighlight; > > Ho-ly crap Quite :/ 1539467 5 370669 commit-queue 2019-05-27 18:03:15 -0700 Comment on attachment 370669 Patch Clearing flags on attachment: 370669 Committed r245803: <https://trac.webkit.org/changeset/245803> 1539468 6 commit-queue 2019-05-27 18:03:17 -0700 All reviewed patches have been landed. Closing bug. 370669 2019-05-26 22:49:56 -0700 2019-05-27 18:03:15 -0700 Patch bug-198267-20190526224955.patch text/plain 20083 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1Nzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc1ZGY0OWUyY2ZkODRmYTVh YzRhMjgxYTBjNTQ4N2U5YWZkZjdhN2QuLmYzZDU1ZWJjYjY1NzQ1ZDhlMTcwYTJhODM4YmI0ODk3 YmIwOWJhYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTktMDUtMjYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRHJvcHBpbmcg aW4gYW4gZWRpdGFibGUgZWxlbWVudCBzaG91bGQgcmVzdWx0IGluIGEgcmFuZ2VkIHNlbGVjdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MjY3 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTE0NTk3Nz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGRyYWcgYW5kIGRyb3Agd2FzIGZpcnN0 IGltcGxlbWVudGVkIGZvciBpT1MgaW4gaU9TIDExLCBzZWxlY3Rpb24gYmVoYXZpb3Igd2hlbiBk cm9wcGluZyBpbnRvIGVkaXRhYmxlCisgICAgICAgIGVsZW1lbnRzIG1hdGNoZWQgdGhhdCBvZiBt YWNPUywgYnkgbGVhdmluZyB0aGUgaW5zZXJ0ZWQgY29udGVudCBzZWxlY3RlZCBhZnRlciBwZXJm b3JtaW5nIHRoZSBkcm9wLiBIb3dldmVyLCBpbgorICAgICAgICBvdGhlciBwYXJ0cyBvZiB0aGUg cGxhdGZvcm0gKGUuZy4gTm90ZXMpLCBib3RoIHRoZSBrZXlib2FyZCBhbmQgc2VsZWN0aW9uIHZp ZXdzIGFyZSBub3Qgc2hvd24gYWZ0ZXIgYSBkcm9wLgorCisgICAgICAgIEluc3RlYWQgb2YgbWF0 Y2hpbmcgbWFjT1MgYmVoYXZpb3IsIFdlYktpdCBvbiBpT1Mgc2hvdWxkIG1hdGNoIHRoZSByZXN0 IG9mIHRoZSBwbGF0Zm9ybS4gVGhpcyBpcyBhIGxpdHRsZQorICAgICAgICB0cmlja3ksIHNpbmNl IHdlIHVzZSB0aGUgc2VsZWN0aW9uIHJhbmdlIGFmdGVyIGEgZHJvcCB0byBjcmVhdGUgYSBUZXh0 SW5kaWNhdG9yIHNuYXBzaG90IHdoZW4gY3JlYXRpbmcgYSBkcmFnCisgICAgICAgIHByZXZpZXcu IFRvIHJlc29sdmUgdGhpcywgd2UgcmVmYWN0b3Igc29tZSBvZiB0aGUgbG9naWMgaW50cm9kdWNl ZCBpbiByMjQ1Nzc4IHRvIHJlbWVtYmVyIHRoZSBET00gcmFuZ2UgdG8KKyAgICAgICAgc25hcHNo b3QgYmVmb3JlIGNvbGxhcHNpbmcgdGhlIHJhbmdlIHRvIHRoZSBlbmQgb2YgdGhlIGluc2VydGVk IGNvbnRlbnQuCisKKyAgICAgICAgVGVzdGVkIGJ5IGFkanVzdGluZyBzb21lIGV4aXN0aW5nIEFQ SSB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbGVtZW50RGlkRm9jdXM6dXNlcklz SW50ZXJhY3Rpbmc6Ymx1clByZXZpb3VzTm9kZTphY3Rpdml0eVN0YXRlQ2hhbmdlczp1c2VyT2Jq ZWN0Ol0pOgorCisgICAgICAgIFJlbW92ZSBzb21lIGxvZ2ljIHRoYXQgY3VycmVudGx5IHByZXNl bnRzIHRoZSBrZXlib2FyZCB3aGlsZSB0aGUgdXNlciBpcyBwZXJmb3JtaW5nIGEgZHJvcCB0aGF0 IGZvY3VzZXMgYW4KKyAgICAgICAgZWRpdGFibGUgZWxlbWVudC4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisKKyAgICAgICAgQWRkIGEgbWVtYmVyIHZhcmlhYmxl IHRvIGtlZXAgdHJhY2sgb2Ygd2hpY2ggcmFuZ2Ugc2hvdWxkIGJlIHNuYXBzaG90dGVkIHdoZW4g Z2VuZXJhdGluZyBhIGRyb3AgcHJldmlldy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkQ29uY2x1 ZGVEcm9wKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkQ29uY2x1ZGVFZGl0RHJhZyk6 CisKKyAgICAgICAgQ29sbGFwc2UgdGhlIHNlbGVjdGlvbiByYW5nZSB0byB0aGUgZW5kIGFmdGVy IGFuIGVkaXQgZHJhZyAoaS5lLiwgYSBkcm9wIGluIGFuIGVkaXRhYmxlIGFyZWEgdGhhdCBpbnNl cnRlZAorICAgICAgICBjb250ZW50KS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb21w dXRlQW5kU2VuZEVkaXREcmFnU25hcHNob3QpOgorCiAyMDE5LTA1LTI2ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIERyb3BwZWQgdGV4dCwg YXR0YWNobWVudHMsIGFuZCBpbWFnZXMgc2hvdWxkIGFuaW1hdGUgaW50byBwbGFjZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KaW5kZXggNmNiNWE1M2Y1OTA5NDRkNDE0YWNkM2MwNGExNmVmZWUzODgwODM3ZS4uODk2 NjlkYzE2ZjkxYTU3NDA2MGRiMTk1Y2JlNzgyZDIyMjkzM2U3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBA IC01MDc0LDExICs1MDc0LDYgQEAgLSAodm9pZClfZWxlbWVudERpZEZvY3VzOihjb25zdCBXZWJL aXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24mKWluZm9ybWF0aW9uIHUKICAgICAgICAgICAg IGlmICh1c2VySXNJbnRlcmFjdGluZykKICAgICAgICAgICAgICAgICByZXR1cm4gWUVTOwogCi0j aWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKLSAgICAgICAgICAgIGlmIChfZHJhZ0Ryb3BJbnRlcmFj dGlvblN0YXRlLmlzUGVyZm9ybWluZ0Ryb3AoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gWUVT OwotI2VuZGlmCi0KICAgICAgICAgICAgIGlmIChzZWxmLmlzRmlyc3RSZXNwb25kZXIgfHwgX2Jl Y29taW5nRmlyc3RSZXNwb25kZXIpIHsKICAgICAgICAgICAgICAgICAvLyBXaGVuIHRoZSBzb2Z0 d2FyZSBrZXlib2FyZCBpcyBiZWluZyB1c2VkIHRvIGVudGVyIGFuIHVybCwgb25seSB0aGUgZm9j dXMgYWN0aXZpdHkgc3RhdGUgaXMgY2hhbmdpbmcuCiAgICAgICAgICAgICAgICAgLy8gSW4gdGhp cyBjYXNlLCBhdXRvIGZvY3VzIG9uIHRoZSBwYWdlIGJlaW5nIG5hdmlnYXRlZCB0byBzaG91bGQg YmUgZGlzYWJsZWQsIHVubGVzcyBhIGhhcmR3YXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMmE4MTQ2Yjc0NTA3NzMwMmUyM2U0M2U2YTc2NGIxMjZj OWU0MWJiZS4uYmNlODhjNjA5ZTQyZjlkZmI3ZjFmNmE1YjI1Njc0NWFjZjY0MGI0YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTc3Nyw2ICsxNzc3 LDcgQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpICYmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAgICAgSGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudD4+ IG1fcGVuZGluZ0ltYWdlRWxlbWVudHNGb3JEcm9wU25hcHNob3Q7CisgICAgUmVmUHRyPFdlYkNv cmU6OlJhbmdlPiBtX3JhbmdlRm9yRHJvcFNuYXBzaG90OwogI2VuZGlmCiAKICAgICBib29sIG1f Y2FjaGVkTWFpbkZyYW1lSXNQaW5uZWRUb0xlZnRTaWRlIHsgdHJ1ZSB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA5YmFl N2Q0NWE0MmU5YWUxZmUwZGY3MDczN2NmYmQ0YWJkMjYzZTY3Li5jOGEzNDM0NTJiNzM0ZWE5NTUy Y2JkMTIzNWZkNTc5MzAxYmU2YzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtODI3LDYgKzgyNyw3IEBAIHZvaWQgV2Vi UGFnZTo6cmVxdWVzdEFkZGl0aW9uYWxJdGVtc0ZvckRyYWdTZXNzaW9uKGNvbnN0IEludFBvaW50 JiBjbGllbnRQb3NpdGlvCiAKIHZvaWQgV2ViUGFnZTo6ZGlkQ29uY2x1ZGVEcm9wKCkKIHsKKyAg ICBtX3JhbmdlRm9yRHJvcFNuYXBzaG90ID0gbnVsbHB0cjsKICAgICBtX3BlbmRpbmdJbWFnZUVs ZW1lbnRzRm9yRHJvcFNuYXBzaG90LmNsZWFyKCk7CiB9CiAKQEAgLTgzOSw5ICs4NDAsOSBAQCB2 b2lkIFdlYlBhZ2U6OmRpZENvbmNsdWRlRWRpdERyYWcoKQogICAgIG1fcGVuZGluZ0ltYWdlRWxl bWVudHNGb3JEcm9wU25hcHNob3QuY2xlYXIoKTsKIAogICAgIGJvb2wgd2FpdGluZ0ZvckFueUlt YWdlVG9Mb2FkID0gZmFsc2U7Ci0gICAgYXV0byYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJv bGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwotICAgIGlmIChhdXRvIHJhbmdlID0gZnJhbWUu c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkudG9Ob3JtYWxpemVkUmFuZ2UoKSkgewotICAgICAgICBm b3IgKFRleHRJdGVyYXRvciBpdGVyYXRvcihyYW5nZS5nZXQoKSk7ICFpdGVyYXRvci5hdEVuZCgp OyBpdGVyYXRvci5hZHZhbmNlKCkpIHsKKyAgICBhdXRvIGZyYW1lID0gbWFrZVJlZihtX3BhZ2Ut PmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpKTsKKyAgICBpZiAoYXV0byBz ZWxlY3Rpb25SYW5nZSA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS50b05vcm1hbGl6 ZWRSYW5nZSgpKSB7CisgICAgICAgIGZvciAoVGV4dEl0ZXJhdG9yIGl0ZXJhdG9yKHNlbGVjdGlv blJhbmdlLmdldCgpKTsgIWl0ZXJhdG9yLmF0RW5kKCk7IGl0ZXJhdG9yLmFkdmFuY2UoKSkgewog ICAgICAgICAgICAgYXV0byogbm9kZSA9IGl0ZXJhdG9yLm5vZGUoKTsKICAgICAgICAgICAgIGlm ICghaXM8SFRNTEltYWdlRWxlbWVudD4obm9kZSkpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CkBAIC04NTMsNiArODU0LDEwIEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29uY2x1ZGVFZGl0RHJhZygp CiAgICAgICAgICAgICAgICAgd2FpdGluZ0ZvckFueUltYWdlVG9Mb2FkID0gdHJ1ZTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQorICAgICAgICBhdXRvIGNvbGxhcHNlZFJhbmdlID0gUmFuZ2U6 OmNyZWF0ZShzZWxlY3Rpb25SYW5nZS0+b3duZXJEb2N1bWVudCgpLCBzZWxlY3Rpb25SYW5nZS0+ ZW5kUG9zaXRpb24oKSwgc2VsZWN0aW9uUmFuZ2UtPmVuZFBvc2l0aW9uKCkpOworICAgICAgICBm cmFtZS0+c2VsZWN0aW9uKCkuc2V0U2VsZWN0ZWRSYW5nZShjb2xsYXBzZWRSYW5nZS5wdHIoKSwg RE9XTlNUUkVBTSwgRnJhbWVTZWxlY3Rpb246OlNob3VsZENsb3NlVHlwaW5nOjpZZXMsIFVzZXJU cmlnZ2VyZWQpOworCisgICAgICAgIG1fcmFuZ2VGb3JEcm9wU25hcHNob3QgPSBXVEZNb3ZlKHNl bGVjdGlvblJhbmdlKTsKICAgICB9CiAKICAgICBpZiAoIXdhaXRpbmdGb3JBbnlJbWFnZVRvTG9h ZCkKQEAgLTg3NCw4ICs4NzksNyBAQCB2b2lkIFdlYlBhZ2U6OmNvbXB1dGVBbmRTZW5kRWRpdERy YWdTbmFwc2hvdCgpCiB7CiAgICAgT3B0aW9uYWw8VGV4dEluZGljYXRvckRhdGE+IHRleHRJbmRp Y2F0b3JEYXRhOwogICAgIHN0YXRpYyBhdXRvIGRlZmF1bHRUZXh0SW5kaWNhdG9yT3B0aW9uc0Zv ckVkaXREcmFnID0gVGV4dEluZGljYXRvck9wdGlvbkluY2x1ZGVTbmFwc2hvdE9mQWxsVmlzaWJs ZUNvbnRlbnRXaXRob3V0U2VsZWN0aW9uIHwgVGV4dEluZGljYXRvck9wdGlvbkV4cGFuZENsaXBC ZXlvbmRWaXNpYmxlUmVjdCB8IFRleHRJbmRpY2F0b3JPcHRpb25QYWludEFsbENvbnRlbnQgfCBU ZXh0SW5kaWNhdG9yT3B0aW9uSW5jbHVkZU1hcmdpbklmUmFuZ2VNYXRjaGVzU2VsZWN0aW9uIHwg VGV4dEluZGljYXRvck9wdGlvblBhaW50QmFja2dyb3VuZHMgfCBUZXh0SW5kaWNhdG9yT3B0aW9u Q29tcHV0ZUVzdGltYXRlZEJhY2tncm91bmRDb2xvcnwgVGV4dEluZGljYXRvck9wdGlvblVzZVNl bGVjdGlvblJlY3RGb3JTaXppbmcgfCBUZXh0SW5kaWNhdG9yT3B0aW9uSW5jbHVkZVNuYXBzaG90 V2l0aFNlbGVjdGlvbkhpZ2hsaWdodDsKLSAgICBhdXRvJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXND b250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7Ci0gICAgaWYgKGF1dG8gcmFuZ2UgPSBm cmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS50b05vcm1hbGl6ZWRSYW5nZSgpKSB7CisgICAg aWYgKGF1dG8gcmFuZ2UgPSBzdGQ6OmV4Y2hhbmdlKG1fcmFuZ2VGb3JEcm9wU25hcHNob3QsIG51 bGxwdHIpKSB7CiAgICAgICAgIGlmIChhdXRvIHRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9y OjpjcmVhdGVXaXRoUmFuZ2UoKnJhbmdlLCBkZWZhdWx0VGV4dEluZGljYXRvck9wdGlvbnNGb3JF ZGl0RHJhZywgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246Ok5vbmUsIHsgfSkp CiAgICAgICAgICAgICB0ZXh0SW5kaWNhdG9yRGF0YSA9IHRleHRJbmRpY2F0b3ItPmRhdGEoKTsK ICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggYzU5OGYwNTQ0NzI0MmMxN2ZhNWY3MjZlNTk0NmRjNjQ4MWIwOTkxNi4uYzg0Y2UyMmFlY2Iz YWE2NzE4YWE1MjVjODIxYTI1YjQ1NWE5MjhkNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA1LTI2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIERyb3Bw aW5nIGluIGFuIGVkaXRhYmxlIGVsZW1lbnQgc2hvdWxkIHJlc3VsdCBpbiBhIHJhbmdlZCBzZWxl Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODI2NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTExNDU5Nzc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRqdXN0IHNvbWUgZXhpc3RpbmcgQVBJ IHRlc3RzIHRoYXQgY3VycmVudGx5IGNoZWNrIGZvciBzZWxlY3Rpb24gcmVjdHMgYWZ0ZXIgYSBk cm9wLiBJbnN0ZWFkIG9mIGNoZWNraW5nIGZvcgorICAgICAgICB2aXNpYmxlIHNlbGVjdGlvbiBy ZWN0cywgc2ltcGx5IGNoZWNrIGZvciB0aGUgc3RhcnQgY2FyZXQgcmVjdCwgYXMgZGV0ZXJtaW5l ZCBieSBXS0NvbnRlbnRWaWV3J3MKKyAgICAgICAgLXNlbGVjdGlvblJhbmdlLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRHJhZ0FuZERyb3BUZXN0c0lPUy5tbToKKyAgICAg ICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAobWFrZUNHUmVjdFZhbHVlKTogRGVs ZXRlZC4KKyAgICAgICAgKGNoZWNrU2VsZWN0aW9uUmVjdHNXaXRoTG9nZ2luZyk6IERlbGV0ZWQu CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9EcmFnQW5kRHJvcFNpbXVsYXRvci5oOgor CisgICAgICAgIFJlcGxhY2UgZmluYWxTZWxlY3Rpb25SZWN0cyB3aXRoIGZpbmFsU2VsZWN0aW9u U3RhcnRSZWN0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9pb3MvRHJhZ0FuZERyb3BTaW11 bGF0b3JJT1MubW06CisgICAgICAgICgtW0RyYWdBbmREcm9wU2ltdWxhdG9yIF9yZXNldFNpbXVs YXRlZFN0YXRlXSk6CisgICAgICAgICgtW0RyYWdBbmREcm9wU2ltdWxhdG9yIHJ1bkZyb206dG86 YWRkaXRpb25hbEl0ZW1SZXF1ZXN0TG9jYXRpb25zOl0pOgorICAgICAgICAoLVtEcmFnQW5kRHJv cFNpbXVsYXRvciBmaW5hbFNlbGVjdGlvblJlY3RzXSk6IERlbGV0ZWQuCisKIDIwMTktMDUtMjYg IFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10g RHJvcHBlZCB0ZXh0LCBhdHRhY2htZW50cywgYW5kIGltYWdlcyBzaG91bGQgYW5pbWF0ZSBpbnRv IHBsYWNlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EcmFnQW5k RHJvcFRlc3RzSU9TLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRHJhZ0FuZERy b3BUZXN0c0lPUy5tbQppbmRleCBmMWNjMjQwZTUzOWM4MTdmMzg4YzMxYWZkMWU5ODE4NDZiM2U1 MzczLi4wODc2YTRiM2IyNDJjYzZhZGM3ODA3ZTYzYzI0NWVhZjU0ZGFmYmZkIDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EcmFnQW5kRHJvcFRlc3RzSU9TLm1tCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RyYWdBbmREcm9wVGVzdHNJT1MubW0K QEAgLTExNywxMSArMTE3LDYgQEAgc3RhdGljIHZvaWQgbG9hZFRlc3RQYWdlQW5kRW5zdXJlSW5w dXRTZXNzaW9uKERyYWdBbmREcm9wU2ltdWxhdG9yICpzaW11bGF0b3IsIE4KICAgICBbc2ltdWxh dG9yIGVuc3VyZUlucHV0U2Vzc2lvbl07CiB9CiAKLXN0YXRpYyBOU1ZhbHVlICptYWtlQ0dSZWN0 VmFsdWUoQ0dGbG9hdCB4LCBDR0Zsb2F0IHksIENHRmxvYXQgd2lkdGgsIENHRmxvYXQgaGVpZ2h0 KQotewotICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6Q0dSZWN0TWFrZSh4LCB5 LCB3aWR0aCwgaGVpZ2h0KV07Ci19Ci0KIHN0YXRpYyB2b2lkIGNoZWNrQ0dSZWN0SXNFcXVhbFRv Q0dSZWN0V2l0aExvZ2dpbmcoQ0dSZWN0IGV4cGVjdGVkLCBDR1JlY3Qgb2JzZXJ2ZWQpCiB7CiAg ICAgQk9PTCBpc0VxdWFsID0gQ0dSZWN0RXF1YWxUb1JlY3QoZXhwZWN0ZWQsIG9ic2VydmVkKTsK QEAgLTEzMCwxMyArMTI1LDYgQEAgc3RhdGljIHZvaWQgY2hlY2tDR1JlY3RJc0VxdWFsVG9DR1Jl Y3RXaXRoTG9nZ2luZyhDR1JlY3QgZXhwZWN0ZWQsIENHUmVjdCBvYnNlcnYKICAgICAgICAgTlNM b2coQCJFeHBlY3RlZDogJUAgYnV0IG9ic2VydmVkOiAlQCIsIE5TU3RyaW5nRnJvbUNHUmVjdChl eHBlY3RlZCksIE5TU3RyaW5nRnJvbUNHUmVjdChvYnNlcnZlZCkpOwogfQogCi1zdGF0aWMgdm9p ZCBjaGVja1NlbGVjdGlvblJlY3RzV2l0aExvZ2dpbmcoTlNBcnJheSAqZXhwZWN0ZWQsIE5TQXJy YXkgKm9ic2VydmVkKQotewotICAgIGlmICghW2V4cGVjdGVkIGlzRXF1YWxUb0FycmF5Om9ic2Vy dmVkXSkKLSAgICAgICAgTlNMb2coQCJFeHBlY3RlZCBzZWxlY3Rpb24gcmVjdHM6ICVAIGJ1dCBv YnNlcnZlZDogJUAiLCBleHBlY3RlZCwgb2JzZXJ2ZWQpOwotICAgIEVYUEVDVF9UUlVFKFtleHBl Y3RlZCBpc0VxdWFsVG9BcnJheTpvYnNlcnZlZF0pOwotfQotCiBzdGF0aWMgdm9pZCBjaGVja1Jp Y2hUZXh0VHlwZVByZWNlZGVzUGxhaW5UZXh0VHlwZShEcmFnQW5kRHJvcFNpbXVsYXRvciAqc2lt dWxhdG9yKQogewogICAgIC8vIEF0IGxlYXN0IG9uZSBvZiAiY29tLmFwcGxlLmZsYXQtcnRmZCIg b3IgInB1YmxpYy5ydGYiIGlzIGV4cGVjdGVkIHRvIGhhdmUgaGlnaGVyIHByZWNlZGVuY2UgdGhh biAicHVibGljLnV0ZjgtcGxhaW4tdGV4dCIuCkBAIC0yNzUsNyArMjYzLDcgQEAgVEVTVChEcmFn QW5kRHJvcFRlc3RzLCBJbWFnZVRvQ29udGVudEVkaXRhYmxlKQogICAgIEVYUEVDVF9UUlVFKFtv YnNlcnZlZEV2ZW50TmFtZXMgY29udGFpbnNPYmplY3Q6QCJkcmFnZW50ZXIiXSk7CiAgICAgRVhQ RUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRyYWdvdmVyIl0p OwogICAgIEVYUEVDVF9UUlVFKFtvYnNlcnZlZEV2ZW50TmFtZXMgY29udGFpbnNPYmplY3Q6QCJk cm9wIl0pOwotICAgIGNoZWNrU2VsZWN0aW9uUmVjdHNXaXRoTG9nZ2luZyhAWyBtYWtlQ0dSZWN0 VmFsdWUoMSwgMjAxLCAyMTUsIDE3NCkgXSwgW3NpbXVsYXRvciBmaW5hbFNlbGVjdGlvblJlY3Rz XSk7CisgICAgY2hlY2tDR1JlY3RJc0VxdWFsVG9DR1JlY3RXaXRoTG9nZ2luZyhDR1JlY3RNYWtl KDIxNCwgMjAxLCAyLCAxNzQpLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0XSk7 CiAgICAgY2hlY2tGaXJzdFR5cGVJc1ByZXNlbnRBbmRTZWNvbmRUeXBlSXNNaXNzaW5nKHNpbXVs YXRvci5nZXQoKSwga1VUVHlwZVBORywga1VUVHlwZUZpbGVVUkwpOwogICAgIGNoZWNrRXN0aW1h dGVkU2l6ZShzaW11bGF0b3IuZ2V0KCksIHsgMjE1LCAxNzQgfSk7CiAgICAgRVhQRUNUX1RSVUUo W3NpbXVsYXRvciBsYXN0S25vd25Ecm9wUHJvcG9zYWxdLnByZWNpc2UpOwpAQCAtMzIwLDcgKzMw OCw3IEBAIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgSW1hZ2VJbkxpbmtUb0lucHV0KQogICAgIFtz aW11bGF0b3IgcnVuRnJvbTpDR1BvaW50TWFrZSgxMDAsIDUwKSB0bzpDR1BvaW50TWFrZSgxMDAs IDMwMCldOwogCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJodHRwczovL3d3dy5hcHBsZS5jb20vIiwg W3dlYlZpZXcgZWRpdG9yVmFsdWVdLlVURjhTdHJpbmcpOwotICAgIGNoZWNrU2VsZWN0aW9uUmVj dHNXaXRoTG9nZ2luZyhAWyBtYWtlQ0dSZWN0VmFsdWUoMTAxLCAyNDEsIDIwNTcsIDIzMikgXSwg W3NpbXVsYXRvciBmaW5hbFNlbGVjdGlvblJlY3RzXSk7CisgICAgY2hlY2tDR1JlY3RJc0VxdWFs VG9DR1JlY3RXaXRoTG9nZ2luZyhDR1JlY3RNYWtlKDIxNTYsIDI0MSwgMiwgMjMyKSwgW3NpbXVs YXRvciBmaW5hbFNlbGVjdGlvblN0YXJ0UmVjdF0pOwogICAgIGNoZWNrU3VnZ2VzdGVkTmFtZUFu ZEVzdGltYXRlZFNpemUoc2ltdWxhdG9yLmdldCgpLCBAImljb24ucG5nIiwgeyAyMTUsIDE3NCB9 KTsKICAgICBjaGVja1R5cGVJZGVudGlmaWVySXNSZWdpc3RlcmVkQXRJbmRleChzaW11bGF0b3Iu Z2V0KCksIChfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVQTkcsIDApOwogICAgIEVYUEVDVF9U UlVFKFtzaW11bGF0b3IgbGFzdEtub3duRHJvcFByb3Bvc2FsXS5wcmVjaXNlKTsKQEAgLTM5MCw3 ICszNzgsNyBAQCBURVNUKERyYWdBbmREcm9wVGVzdHMsIENvbnRlbnRFZGl0YWJsZVRvQ29udGVu dEVkaXRhYmxlKQogICAgIEVYUEVDVF9UUlVFKFtvYnNlcnZlZEV2ZW50TmFtZXMgY29udGFpbnNP YmplY3Q6QCJkcmFnZW50ZXIiXSk7CiAgICAgRVhQRUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1l cyBjb250YWluc09iamVjdDpAImRyYWdvdmVyIl0pOwogICAgIEVYUEVDVF9UUlVFKFtvYnNlcnZl ZEV2ZW50TmFtZXMgY29udGFpbnNPYmplY3Q6QCJkcm9wIl0pOwotICAgIGNoZWNrU2VsZWN0aW9u UmVjdHNXaXRoTG9nZ2luZyhAWyBtYWtlQ0dSZWN0VmFsdWUoMSwgMjAxLCA5NjEsIDIyNykgXSwg W3NpbXVsYXRvciBmaW5hbFNlbGVjdGlvblJlY3RzXSk7CisgICAgY2hlY2tDR1JlY3RJc0VxdWFs VG9DR1JlY3RXaXRoTG9nZ2luZyhDR1JlY3RNYWtlKDk2MCwgMjAxLCAyLCAyMjcpLCBbc2ltdWxh dG9yIGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0XSk7CiAgICAgY2hlY2tSaWNoVGV4dFR5cGVQcmVj ZWRlc1BsYWluVGV4dFR5cGUoc2ltdWxhdG9yLmdldCgpKTsKICAgICBFWFBFQ1RfVFJVRShbc2lt dWxhdG9yIGxhc3RLbm93bkRyb3BQcm9wb3NhbF0ucHJlY2lzZSk7CiAKQEAgLTQxNCw3ICs0MDIs NyBAQCBURVNUKERyYWdBbmREcm9wVGVzdHMsIENvbnRlbnRFZGl0YWJsZVRvVGV4dGFyZWEpCiAg ICAgRVhQRUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRyYWdl bnRlciJdKTsKICAgICBFWFBFQ1RfVFJVRShbb2JzZXJ2ZWRFdmVudE5hbWVzIGNvbnRhaW5zT2Jq ZWN0OkAiZHJhZ292ZXIiXSk7CiAgICAgRVhQRUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBj b250YWluc09iamVjdDpAImRyb3AiXSk7Ci0gICAgY2hlY2tTZWxlY3Rpb25SZWN0c1dpdGhMb2dn aW5nKEBbIG1ha2VDR1JlY3RWYWx1ZSgxMDEsIDIwMywgOTkwLCAyMzIpIF0sIFtzaW11bGF0b3Ig ZmluYWxTZWxlY3Rpb25SZWN0c10pOworICAgIGNoZWNrQ0dSZWN0SXNFcXVhbFRvQ0dSZWN0V2l0 aExvZ2dpbmcoQ0dSZWN0TWFrZSgxMDg5LCAyMDMsIDIsIDIzMiksIFtzaW11bGF0b3IgZmluYWxT ZWxlY3Rpb25TdGFydFJlY3RdKTsKICAgICBjaGVja1JpY2hUZXh0VHlwZVByZWNlZGVzUGxhaW5U ZXh0VHlwZShzaW11bGF0b3IuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFtzaW11bGF0b3IgbGFz dEtub3duRHJvcFByb3Bvc2FsXS5wcmVjaXNlKTsKIH0KQEAgLTQ3MSw3ICs0NTksNyBAQCBURVNU KERyYWdBbmREcm9wVGVzdHMsIENvbnRlbnRFZGl0YWJsZU1vdmVQYXJhZ3JhcGhzKQogICAgIEVY UEVDVF9GQUxTRShmaXJzdFBhcmFncmFwaE9mZnNldCA9PSBOU05vdEZvdW5kKTsKICAgICBFWFBF Q1RfRkFMU0Uoc2Vjb25kUGFyYWdyYXBoT2Zmc2V0ID09IE5TTm90Rm91bmQpOwogICAgIEVYUEVD VF9HVChmaXJzdFBhcmFncmFwaE9mZnNldCwgc2Vjb25kUGFyYWdyYXBoT2Zmc2V0KTsKLSAgICBj aGVja1NlbGVjdGlvblJlY3RzV2l0aExvZ2dpbmcoQFsgbWFrZUNHUmVjdFZhbHVlKDE5MCwgMTAw LCAxMzAsIDIwKSwgbWFrZUNHUmVjdFZhbHVlKDAsIDEyMCwgMzIwLCAxMDApLCBtYWtlQ0dSZWN0 VmFsdWUoMCwgMjIwLCAyNTIsIDIwKSBdLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uUmVjdHNd KTsKKyAgICBjaGVja0NHUmVjdElzRXF1YWxUb0NHUmVjdFdpdGhMb2dnaW5nKENHUmVjdE1ha2Uo MjUxLCAyMjAsIDIsIDIwKSwgW3NpbXVsYXRvciBmaW5hbFNlbGVjdGlvblN0YXJ0UmVjdF0pOwog ICAgIEVYUEVDVF9UUlVFKFtzaW11bGF0b3IgbGFzdEtub3duRHJvcFByb3Bvc2FsXS5wcmVjaXNl KTsKIH0KIApAQCAtNDk3LDcgKzQ4NSw3IEBAIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgVGV4dEFy ZWFUb0lucHV0KQogICAgIEVYUEVDVF9UUlVFKFtzaW11bGF0b3Igc3VwcHJlc3NlZFNlbGVjdGlv bkNvbW1hbmRzRHVyaW5nRHJvcF0pOwogICAgIEVYUEVDVF9FUShbd2ViVmlldyBzdHJpbmdCeUV2 YWx1YXRpbmdKYXZhU2NyaXB0OkAic291cmNlLnZhbHVlIl0ubGVuZ3RoLCAwVUwpOwogICAgIEVY UEVDVF9XS19TVFJFUSgiSGVsbG8gd29ybGQiLCBbd2ViVmlldyBlZGl0b3JWYWx1ZV0uVVRGOFN0 cmluZyk7Ci0gICAgY2hlY2tTZWxlY3Rpb25SZWN0c1dpdGhMb2dnaW5nKEBbIG1ha2VDR1JlY3RW YWx1ZSgxMDEsIDI0MSwgOTkwLCAyMzIpIF0sIFtzaW11bGF0b3IgZmluYWxTZWxlY3Rpb25SZWN0 c10pOworICAgIGNoZWNrQ0dSZWN0SXNFcXVhbFRvQ0dSZWN0V2l0aExvZ2dpbmcoQ0dSZWN0TWFr ZSgxMDg5LCAyNDEsIDIsIDIzMiksIFtzaW11bGF0b3IgZmluYWxTZWxlY3Rpb25TdGFydFJlY3Rd KTsKIH0KIAogVEVTVChEcmFnQW5kRHJvcFRlc3RzLCBTaW5nbGVQbGFpblRleHRXb3JkVHlwZUlk ZW50aWZpZXJzKQpAQCAtNTY4LDcgKzU1Niw3IEBAIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgTGlu a1RvSW5wdXQpCiAgICAgRVhQRUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09i amVjdDpAImRyYWdlbnRlciJdKTsKICAgICBFWFBFQ1RfVFJVRShbb2JzZXJ2ZWRFdmVudE5hbWVz IGNvbnRhaW5zT2JqZWN0OkAiZHJhZ292ZXIiXSk7CiAgICAgRVhQRUNUX1RSVUUoW29ic2VydmVk RXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRyb3AiXSk7Ci0gICAgY2hlY2tTZWxlY3Rpb25S ZWN0c1dpdGhMb2dnaW5nKEBbIG1ha2VDR1JlY3RWYWx1ZSgxMDEsIDI3MywgMjA1NywgMjMyKSBd LCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uUmVjdHNdKTsKKyAgICBjaGVja0NHUmVjdElzRXF1 YWxUb0NHUmVjdFdpdGhMb2dnaW5nKENHUmVjdE1ha2UoMjE1NiwgMjczLCAyLCAyMzIpLCBbc2lt dWxhdG9yIGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0XSk7CiAgICAgY2hlY2tUeXBlSWRlbnRpZmll cklzUmVnaXN0ZXJlZEF0SW5kZXgoc2ltdWxhdG9yLmdldCgpLCAoX19icmlkZ2UgTlNTdHJpbmcg KilrVVRUeXBlVVJMLCAwKTsKIH0KIApAQCAtNTg2LDcgKzU3NCw3IEBAIFRFU1QoRHJhZ0FuZERy b3BUZXN0cywgQmFja2dyb3VuZEltYWdlTGlua1RvSW5wdXQpCiAgICAgRVhQRUNUX1RSVUUoW29i c2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRyYWdlbnRlciJdKTsKICAgICBFWFBF Q1RfVFJVRShbb2JzZXJ2ZWRFdmVudE5hbWVzIGNvbnRhaW5zT2JqZWN0OkAiZHJhZ292ZXIiXSk7 CiAgICAgRVhQRUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRy b3AiXSk7Ci0gICAgY2hlY2tTZWxlY3Rpb25SZWN0c1dpdGhMb2dnaW5nKEBbIG1ha2VDR1JlY3RW YWx1ZSgxMDEsIDI0MSwgMjA1NywgMjMyKSBdLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uUmVj dHNdKTsKKyAgICBjaGVja0NHUmVjdElzRXF1YWxUb0NHUmVjdFdpdGhMb2dnaW5nKENHUmVjdE1h a2UoMjE1NiwgMjQxLCAyLCAyMzIpLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0 XSk7CiAgICAgY2hlY2tUeXBlSWRlbnRpZmllcklzUmVnaXN0ZXJlZEF0SW5kZXgoc2ltdWxhdG9y LmdldCgpLCAoX19icmlkZ2UgTlNTdHJpbmcgKilrVVRUeXBlVVJMLCAwKTsKIH0KIApAQCAtNjA0 LDcgKzU5Miw3IEBAIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgQ2FuUHJldmVudFN0YXJ0KQogICAg IE5TQXJyYXkgKm9ic2VydmVkRXZlbnROYW1lcyA9IFtzaW11bGF0b3Igb2JzZXJ2ZWRFdmVudE5h bWVzXTsKICAgICBFWFBFQ1RfRkFMU0UoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVj dDpAImRyYWdlbnRlciJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW29ic2VydmVkRXZlbnROYW1lcyBj b250YWluc09iamVjdDpAImRyYWdvdmVyIl0pOwotICAgIGNoZWNrU2VsZWN0aW9uUmVjdHNXaXRo TG9nZ2luZyhAWyBdLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uUmVjdHNdKTsKKyAgICBjaGVj a0NHUmVjdElzRXF1YWxUb0NHUmVjdFdpdGhMb2dnaW5nKENHUmVjdE1ha2UoMCwgMCwgMCwgMCks IFtzaW11bGF0b3IgZmluYWxTZWxlY3Rpb25TdGFydFJlY3RdKTsKIH0KIAogVEVTVChEcmFnQW5k RHJvcFRlc3RzLCBDYW5QcmV2ZW50T3BlcmF0aW9uKQpAQCAtNjIwLDcgKzYwOCw3IEBAIFRFU1Qo RHJhZ0FuZERyb3BUZXN0cywgQ2FuUHJldmVudE9wZXJhdGlvbikKICAgICBOU0FycmF5ICpvYnNl cnZlZEV2ZW50TmFtZXMgPSBbc2ltdWxhdG9yIG9ic2VydmVkRXZlbnROYW1lc107CiAgICAgRVhQ RUNUX1RSVUUoW29ic2VydmVkRXZlbnROYW1lcyBjb250YWluc09iamVjdDpAImRyYWdlbnRlciJd KTsKICAgICBFWFBFQ1RfVFJVRShbb2JzZXJ2ZWRFdmVudE5hbWVzIGNvbnRhaW5zT2JqZWN0OkAi ZHJhZ292ZXIiXSk7Ci0gICAgY2hlY2tTZWxlY3Rpb25SZWN0c1dpdGhMb2dnaW5nKEBbIF0sIFtz aW11bGF0b3IgZmluYWxTZWxlY3Rpb25SZWN0c10pOworICAgIGNoZWNrQ0dSZWN0SXNFcXVhbFRv Q0dSZWN0V2l0aExvZ2dpbmcoQ0dSZWN0TWFrZSgwLCAwLCAwLCAwKSwgW3NpbXVsYXRvciBmaW5h bFNlbGVjdGlvblN0YXJ0UmVjdF0pOwogfQogCiBURVNUKERyYWdBbmREcm9wVGVzdHMsIEVudGVy QW5kTGVhdmVFdmVudHMpCkBAIC02MzgsNyArNjI2LDcgQEAgVEVTVChEcmFnQW5kRHJvcFRlc3Rz LCBFbnRlckFuZExlYXZlRXZlbnRzKQogICAgIEVYUEVDVF9UUlVFKFtvYnNlcnZlZEV2ZW50TmFt ZXMgY29udGFpbnNPYmplY3Q6QCJkcmFnb3ZlciJdKTsKICAgICBFWFBFQ1RfVFJVRShbb2JzZXJ2 ZWRFdmVudE5hbWVzIGNvbnRhaW5zT2JqZWN0OkAiZHJhZ2xlYXZlIl0pOwogICAgIEVYUEVDVF9G QUxTRShbb2JzZXJ2ZWRFdmVudE5hbWVzIGNvbnRhaW5zT2JqZWN0OkAiZHJvcCJdKTsKLSAgICBj aGVja1NlbGVjdGlvblJlY3RzV2l0aExvZ2dpbmcoQFsgXSwgW3NpbXVsYXRvciBmaW5hbFNlbGVj dGlvblJlY3RzXSk7CisgICAgY2hlY2tDR1JlY3RJc0VxdWFsVG9DR1JlY3RXaXRoTG9nZ2luZyhD R1JlY3RNYWtlKDAsIDAsIDAsIDApLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0 XSk7CiB9CiAKIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgQ2FuU3RhcnREcmFnT25EaXZXaXRoRHJh Z2dhYmxlQXR0cmlidXRlKQpAQCAtMTAyNSw3ICsxMDEzLDcgQEAgVEVTVChEcmFnQW5kRHJvcFRl c3RzLCBFeHRlcm5hbFNvdXJjZVVURjhQbGFpblRleHRPbmx5KQogICAgIFtzaW11bGF0b3Igc2V0 RXh0ZXJuYWxJdGVtUHJvdmlkZXJzOkBbIHNpbXVsYXRlZEl0ZW1Qcm92aWRlci5nZXQoKSBdXTsK ICAgICBbc2ltdWxhdG9yIHJ1bkZyb206Q0dQb2ludE1ha2UoMzAwLCA0MDApIHRvOkNHUG9pbnRN YWtlKDEwMCwgMzAwKV07CiAgICAgRVhQRUNUX1dLX1NUUkVRKHRleHRQYXlsb2FkLlVURjhTdHJp bmcsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJlZGl0b3IudGV4dENv bnRlbnQiXS5VVEY4U3RyaW5nKTsKLSAgICBjaGVja1NlbGVjdGlvblJlY3RzV2l0aExvZ2dpbmco QFsgbWFrZUNHUmVjdFZhbHVlKDEsIDIwMSwgMTkzNiwgMjI3KSBdLCBbc2ltdWxhdG9yIGZpbmFs U2VsZWN0aW9uUmVjdHNdKTsKKyAgICBjaGVja0NHUmVjdElzRXF1YWxUb0NHUmVjdFdpdGhMb2dn aW5nKENHUmVjdE1ha2UoMTkzNSwgMjAxLCAyLCAyMjcpLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0 aW9uU3RhcnRSZWN0XSk7CiB9CiAKIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywgRXh0ZXJuYWxTb3Vy Y2VKUEVHT25seSkKQEAgLTEwNDUsNyArMTAzMyw3IEBAIFRFU1QoRHJhZ0FuZERyb3BUZXN0cywg RXh0ZXJuYWxTb3VyY2VKUEVHT25seSkKICAgICBbc2ltdWxhdG9yIHNldEV4dGVybmFsSXRlbVBy b3ZpZGVyczpAWyBzaW11bGF0ZWRJdGVtUHJvdmlkZXIuZ2V0KCkgXV07CiAgICAgW3NpbXVsYXRv ciBydW5Gcm9tOkNHUG9pbnRNYWtlKDMwMCwgNDAwKSB0bzpDR1BvaW50TWFrZSgxMDAsIDMwMCld OwogICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IGVkaXRvckNvbnRhaW5zSW1hZ2VFbGVtZW50XSk7 Ci0gICAgY2hlY2tTZWxlY3Rpb25SZWN0c1dpdGhMb2dnaW5nKEBbIG1ha2VDR1JlY3RWYWx1ZSgx LCAyMDEsIDIxNSwgMTc0KSBdLCBbc2ltdWxhdG9yIGZpbmFsU2VsZWN0aW9uUmVjdHNdKTsKKyAg ICBjaGVja0NHUmVjdElzRXF1YWxUb0NHUmVjdFdpdGhMb2dnaW5nKENHUmVjdE1ha2UoMjE0LCAy MDEsIDIsIDIyMyksIFtzaW11bGF0b3IgZmluYWxTZWxlY3Rpb25TdGFydFJlY3RdKTsKIH0KIAog VEVTVChEcmFnQW5kRHJvcFRlc3RzLCBFeHRlcm5hbFNvdXJjZVRpdGxlZE5TVVJMKQpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9EcmFnQW5kRHJvcFNpbXVsYXRvci5oIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9EcmFnQW5kRHJvcFNpbXVsYXRvci5oCmluZGV4IGM1 YmMwZGU3OTJmOGYzNjM5ZjNjZWIxYzFlMGQ4YWUwMGYxZDU2MDkuLjk5OWMxMThiNjBlNDUxZjhj OWNkYjZjZTZlODJlNWI1N2FjMWUxMTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Y29jb2EvRHJhZ0FuZERyb3BTaW11bGF0b3IuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2Nv Y29hL0RyYWdBbmREcm9wU2ltdWxhdG9yLmgKQEAgLTEwOCw3ICsxMDgsNyBAQCB0eXBlZGVmIE5T RGljdGlvbmFyeTxOU051bWJlciAqLCBOU1ZhbHVlICo+ICpQcm9ncmVzc1RvQ0dQb2ludFZhbHVl TWFwOwogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TQXJyYXkgKnNvdXJjZUl0 ZW1Qcm92aWRlcnM7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TQXJyYXkgKm9i c2VydmVkRXZlbnROYW1lczsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNBcnJh eSAqZmluYWxTZWxlY3Rpb25SZWN0czsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkg Q0dSZWN0IGZpbmFsU2VsZWN0aW9uU3RhcnRSZWN0OwogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBDR1JlY3QgbGFzdEtub3duRHJhZ0NhcmV0UmVjdDsKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgTlNBcnJheTxVSVRhcmdldGVkRHJhZ1ByZXZpZXcgKj4gKmxpZnRQcmV2 aWV3czsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNBcnJheSAqZHJvcFByZXZp ZXdzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3MvRHJhZ0FuZERyb3BTaW11 bGF0b3JJT1MubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9EcmFnQW5kRHJvcFNpbXVsYXRv cklPUy5tbQppbmRleCA4ZWRhZThjZThhOTQ4NDM1ODUzMjcyN2U2Njg1ZjAxYTc1MGNmYTIwLi5m NmZiNjU3ZDMzMzljNjIwYmJlZjZjYTk2YTdhMTcyODdjY2NiOTJjIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL2lvcy9EcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbQorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL2lvcy9EcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbQpAQCAtMzAzLDcg KzMwMyw3IEBAIEBpbXBsZW1lbnRhdGlvbiBEcmFnQW5kRHJvcFNpbXVsYXRvciB7CiAgICAgUmV0 YWluUHRyPE5TTXV0YWJsZUFycmF5PiBfb2JzZXJ2ZWRFdmVudE5hbWVzOwogICAgIFJldGFpblB0 cjxOU0FycmF5PiBfZXh0ZXJuYWxJdGVtUHJvdmlkZXJzOwogICAgIFJldGFpblB0cjxOU0FycmF5 PiBfc291cmNlSXRlbVByb3ZpZGVyczsKLSAgICBSZXRhaW5QdHI8TlNBcnJheT4gX2ZpbmFsU2Vs ZWN0aW9uUmVjdHM7CisgICAgQ0dSZWN0IF9maW5hbFNlbGVjdGlvblN0YXJ0UmVjdDsKICAgICBD R1BvaW50IF9zdGFydExvY2F0aW9uOwogICAgIENHUG9pbnQgX2VuZExvY2F0aW9uOwogICAgIENH UmVjdCBfbGFzdEtub3duRHJhZ0NhcmV0UmVjdDsKQEAgLTM4MSw3ICszODEsNyBAQCAtICh2b2lk KV9yZXNldFNpbXVsYXRlZFN0YXRlCiAgICAgX29ic2VydmVkRXZlbnROYW1lcyA9IGFkb3B0TlMo W1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOwogICAgIF9pbnNlcnRlZEF0dGFjaG1lbnRz ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CiAgICAgX3JlbW92ZWRB dHRhY2htZW50cyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOwotICAg IF9maW5hbFNlbGVjdGlvblJlY3RzID0gQFsgXTsKKyAgICBfZmluYWxTZWxlY3Rpb25TdGFydFJl Y3QgPSBDR1JlY3ROdWxsOwogICAgIF9kcmFnU2Vzc2lvbiA9IG5pbDsKICAgICBfZHJvcFNlc3Np b24gPSBuaWw7CiAgICAgX2xhc3RLbm93bkRyb3BQcm9wb3NhbCA9IG5pbDsKQEAgLTQ2MywxNCAr NDYzLDEyIEBAIC0gKHZvaWQpcnVuRnJvbTooQ0dQb2ludClzdGFydExvY2F0aW9uIHRvOihDR1Bv aW50KWVuZExvY2F0aW9uIGFkZGl0aW9uYWxJdGVtUmVxCiAgICAgVXRpbDo6cnVuKCZfaXNEb25l V2l0aEN1cnJlbnRSdW4pOwogICAgIFV0aWw6OnJ1bigmX2lzRG9uZVdhaXRpbmdGb3JEZWxheWVk RHJvcFByZXZpZXdzKTsKICAgICBbX3dlYlZpZXcgY2xlYXJNZXNzYWdlSGFuZGxlcnM6ZHJhZ0Fu ZERyb3BFdmVudE5hbWVzKCldOwotICAgIF9maW5hbFNlbGVjdGlvblJlY3RzID0gW193ZWJWaWV3 IHNlbGVjdGlvblJlY3RzQWZ0ZXJQcmVzZW50YXRpb25VcGRhdGVdOworICAgIFtfd2ViVmlldyB3 YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAKLSAgICBbZGVmYXVsdENlbnRlciByZW1v dmVPYnNlcnZlcjpzZWxmXTsKLX0KKyAgICBhdXRvIGNvbnRlbnRWaWV3ID0gW193ZWJWaWV3IHRl eHRJbnB1dENvbnRlbnRWaWV3XTsKKyAgICBfZmluYWxTZWxlY3Rpb25TdGFydFJlY3QgPSBbY29u dGVudFZpZXcgY2FyZXRSZWN0Rm9yUG9zaXRpb246Y29udGVudFZpZXcuc2VsZWN0ZWRUZXh0UmFu Z2Uuc3RhcnRdOwogCi0tIChOU0FycmF5ICopZmluYWxTZWxlY3Rpb25SZWN0cwotewotICAgIHJl dHVybiBfZmluYWxTZWxlY3Rpb25SZWN0cy5nZXQoKTsKKyAgICBbZGVmYXVsdENlbnRlciByZW1v dmVPYnNlcnZlcjpzZWxmXTsKIH0KIAogLSAodm9pZClfY29uY2x1ZGVEcm9wQW5kUGVyZm9ybU9w ZXJhdGlvbklmTmVjZXNzYXJ5Cg==