239560 2022-04-20 12:54:33 -0700 Address recent deprecation warnings on iOS 2022-04-20 20:58:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner graouts simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1863024 0 megan_gardner 2022-04-20 12:54:33 -0700 Move off of depricated methods and add allow deprication for harder to refector code. 1863025 1 458005 megan_gardner 2022-04-20 12:55:50 -0700 Created attachment 458005 Patch 1863028 2 458005 wenson_hsieh 2022-04-20 13:07:58 -0700 Comment on attachment 458005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458005&action=review > Source/WebKit/ChangeLog:3 > + Move off of depricated methods and add allow deprication for harder to refector code. Nit - Spelling errors, but I would also just change this to something like: "Address recent deprecation warnings on iOS" > Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:288 > + //[item setDontDismiss:!_customMenuActionInfo->dismissesAutomatically]; It's not clear to me why this is going away. IIRC, the layout test that uses this bit checks that the WebKit client can install a custom action in the callout bar that is configured to not dismiss the callout bar when activated (this simulates what Mail on iOS does in compose). 1863050 3 458012 megan_gardner 2022-04-20 14:03:18 -0700 Created attachment 458012 Patch 1863052 4 458013 megan_gardner 2022-04-20 14:08:27 -0700 Created attachment 458013 Patch for landing 1863074 5 ews-feeder 2022-04-20 14:44:10 -0700 Committed r293117 (249823@main): <https://commits.webkit.org/249823@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458013. 1863075 6 webkit-bug-importer 2022-04-20 14:45:14 -0700 <rdar://problem/92052936> 1863187 7 simon.fraser 2022-04-20 20:34:26 -0700 This broke internal iOS builds against 15.4 SDKs 1863192 8 wenson_hsieh 2022-04-20 20:58:13 -0700 (In reply to Simon Fraser (smfr) from comment #7) > This broke internal iOS builds against 15.4 SDKs Landed https://trac.webkit.org/r293142 458005 2022-04-20 12:55:50 -0700 2022-04-20 14:03:17 -0700 Patch bug-239560-20220420125549.patch text/plain 20271 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5MTc0NWJiYjE1YjVjYjE1 ZTg3NDJjZmM2MjBlZjQ2NmVkNjZmMjcuLjEzNzI3MjExZTBiN2Y1OTY1NjNlMmExZWNjNWE2YmZi OTQ5ZDM3ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjItMDQtMjAgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIG9mZiBvZiBk ZXByaWNhdGVkIG1ldGhvZHMgYW5kIGFkZCBhbGxvdyBkZXByaWNhdGlvbiBmb3IgaGFyZGVyIHRv IHJlZmVjdG9yIGNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzk1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW06CisgICAgICAgICgtW1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uOmhpZ2hsaWdo dFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgICgtW1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5n TWVudVdpdGhDb25maWd1cmF0aW9uOl0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IHNldFVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjYW5QZXJmb3Jt QWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IHBhc3RlRm9yV2ViVmlldzpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfaGFuZGxlRE9N UGFzdGVSZXF1ZXN0V2l0aFJlc3VsdDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcmVx dWVzdERPTVBhc3RlQWNjZXNzRm9yQ2F0ZWdvcnk6ZWxlbWVudFJlY3Q6b3JpZ2luSWRlbnRpZmll cjpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0 TWVudUludGVyYWN0aW9uOmNvbmZpZ3VyYXRpb246cHJldmlld0ZvckhpZ2hsaWdodGluZ0l0ZW1X aXRoSWRlbnRpZmllcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0TWVudUlu dGVyYWN0aW9uOmNvbmZpZ3VyYXRpb246ZGlzbWlzc2FsUHJldmlld0Zvckl0ZW1XaXRoSWRlbnRp ZmllcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9u OnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6IERlbGV0ZWQu CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3 Rm9yRGlzbWlzc2luZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpdKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5tbToKKyAg ICAgICAgKC1bV0tEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24gY29udGV4dE1lbnVJbnRlcmFj dGlvbjpjb25maWd1cmF0aW9uOmhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6 XSk6CisgICAgICAgICgtW1dLRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duIGNvbnRleHRNZW51 SW50ZXJhY3Rpb246cHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpd KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1 dENvbnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4dE1lbnVJbnRl cmFjdGlvbjpjb25maWd1cmF0aW9uOmhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZp ZXI6XSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4dE1lbnVJbnRlcmFjdGlv bjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW06Cisg ICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGNvbnRleHRNZW51SW50ZXJhY3Rpb246Y29uZmln dXJhdGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlmaWVyOl0pOgorICAgICAg ICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JI aWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQaWNrZXIubW06CisgICAgICAgICgtW1dL U2VsZWN0UGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbjpoaWdobGln aHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlmaWVyOl0pOgorICAgICAgICAoLVtXS1NlbGVjdFBp Y2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0 aENvbmZpZ3VyYXRpb246XSk6IERlbGV0ZWQuCisKIDIwMjItMDQtMjAgIERpZWdvIFBpbm8gR2Fy Y2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBub24tdW5pZmll ZCBidWlsZCBmaXhlcyBhZnRlciByMjkzMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv cy9VSUtpdFNQSS5oCmluZGV4IDc0OWJiZWJjNGUwNjg0MDZkZmYzMWQ0ZmZiM2FhZWRkNWU5MjQ2 OTMuLjFjZGI0Yjg0ZjQwMmMwMjQ4MGI1NTQwYTg3ODE3NjQzOThkZjlhMTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC01Myw3ICs1Myw3IEBACiAjaW1w b3J0IDxVSUtpdC9VSUtleWJvYXJkUHJlZmVyZW5jZXNDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxV SUtpdC9VSUtleWJvYXJkX1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJS2l0L1VJTG9uZ1ByZXNzR2Vz dHVyZVJlY29nbml6ZXJfUHJpdmF0ZS5oPgotI2ltcG9ydCA8VUlLaXQvVUlNZW51Q29udHJvbGxl cl9Qcml2YXRlLmg+CisjaW1wb3J0IDxVSUtpdC9VSUVkaXRNZW51SW50ZXJhY3Rpb25fUHJpdmF0 ZS5oPgogI2ltcG9ydCA8VUlLaXQvVUlQYXN0ZWJvYXJkX1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJ S2l0L1VJUGVyaXBoZXJhbEhvc3QuaD4KICNpbXBvcnQgPFVJS2l0L1VJUGVyaXBoZXJhbEhvc3Rf UHJpdmF0ZS5oPgpAQCAtMTIxMiw5ICsxMjEyLDExIEBAIFdURl9FWFRFUk5fQ19FTkQKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgVUlLZXlib2FyZFByZWZlcmVuY2VzQ29udHJvbGxl cjxUSVByZWZlcmVuY2VzQ29udHJvbGxlckFjdGlvbnM+ICpwcmVmZXJlbmNlc0FjdGlvbnM7CiBA ZW5kCiAKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiBAaW50ZXJmYWNlIFVJ TWVudUl0ZW0gKFVJTWVudUNvbnRyb2xsZXJfU1BJKQogQHByb3BlcnR5IChub25hdG9taWMpIEJP T0wgZG9udERpc21pc3M7CiBAZW5kCitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQK IAogQGludGVyZmFjZSBVSUNhbGxvdXRCYXIgOiBVSVZpZXcKICsgKFVJQ2FsbG91dEJhciAqKWFj dGl2ZUNhbGxvdXRCYXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IDE1MDEyNGYxMTAwNjhmNTczMDI2YzAxZTFh MGI2NzZjZjhhYTFmZmIuLmI0MTUxOTNmODEzY2M4MGExZmRlOTgwNTAzMGIxYzRhYTk2ZmU0YmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNz aXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0 QXNzaXN0YW50Lm1tCkBAIC05MjQsNyArOTI0LDcgQEAgc3RhdGljIE5TQXJyYXk8VUlNZW51RWxl bWVudCAqPiAqbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKFJldGFpblB0cjxOU0FycmEK ICAgICByZXR1cm4gbmlsOwogfQogCi0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51 SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZp ZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25m aWd1cmF0aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0 TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBj b25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24g aGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVu dGlmaWVyCiB7CiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQogICAgIGlmIChpbnRlcmFjdGlv biA9PSBfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbikgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K aW5kZXggODYzZTdiNGQ0ZjRkZGE3YzhhOTUyMmU5Y2EzOTYzY2RmOTFmYWNjZi4uY2Y5ZWVmMjk3 MWVkODQxNDQ2ODA0MDU1MGQ3MjI4YTU1MjBmMTVkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMDc3 LDggKzEwNzcsMTIgQEAgc3RhdGljIFdLRHJhZ1Nlc3Npb25Db250ZXh0ICplbnN1cmVMb2NhbERy YWdTZXNzaW9uQ29udGV4dChpZCA8VUlEcmFnU2Vzc2lvbj4gc2UKICNlbmRpZgogCiAgICAgTlNO b3RpZmljYXRpb25DZW50ZXIgKmNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0 Q2VudGVyXTsKKyAgICAKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgog ICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3dpbGxIaWRl TWVudTopIG5hbWU6VUlNZW51Q29udHJvbGxlcldpbGxIaWRlTWVudU5vdGlmaWNhdGlvbiBvYmpl Y3Q6bmlsXTsKICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9y KF9kaWRIaWRlTWVudTopIG5hbWU6VUlNZW51Q29udHJvbGxlckRpZEhpZGVNZW51Tm90aWZpY2F0 aW9uIG9iamVjdDpuaWxdOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAor ICAgIAogICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2tl eWJvYXJkRGlkUmVxdWVzdERpc21pc3NhbDopIG5hbWU6VUlLZXlib2FyZFByaXZhdGVEaWRSZXF1 ZXN0RGlzbWlzc2FsTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwogCiAgICAgX3Nob3dpbmdUZXh0 U3R5bGVPcHRpb25zID0gTk87CkBAIC00MTE3LDEwICs0MTIxLDEyIEBAIFdFQkNPUkVfQ09NTUFO RF9GT1JfV0VCVklFVyhwYXN0ZUFuZE1hdGNoU3R5bGUpOwogICAgIH0KIAogICAgIGlmIChhY3Rp b24gPT0gQHNlbGVjdG9yKHNlbGVjdEFsbDopKSB7CisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCiAgICAgICAgIGlmIChbc2VuZGVyIGlzS2luZE9mQ2xhc3M6VUlN ZW51Q29udHJvbGxlci5jbGFzc10pIHsKICAgICAgICAgICAgIC8vIEJ5IHBsYXRmb3JtIGNvbnZl bnRpb24gd2UgZG9uJ3Qgc2hvdyBTZWxlY3QgQWxsIGluIHRoZSBjYWxsb3V0IG1lbnUgZm9yIGEg cmFuZ2Ugc2VsZWN0aW9uLgogICAgICAgICAgICAgcmV0dXJuICFlZGl0b3JTdGF0ZS5zZWxlY3Rp b25Jc1JhbmdlICYmIHNlbGYuaGFzQ29udGVudDsKICAgICAgICAgfQorICAgICAgICBBTExPV19E RVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICAgICAgcmV0dXJuIFlFUzsKICAgICB9CiAK QEAgLTQxNTAsOCArNDE1NiwxMCBAQCBXRUJDT1JFX0NPTU1BTkRfRk9SX1dFQlZJRVcocGFzdGVB bmRNYXRjaFN0eWxlKTsKICAgICAgICAgaWYgKCFtYXlDb250YWluU2VsZWN0YWJsZVRleHQoX2Zv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHx8IF9mb2N1c2VkRWxlbWVudElu Zm9ybWF0aW9uLmlzUmVhZE9ubHkpCiAgICAgICAgICAgICByZXR1cm4gTk87CiAKKyAgICAgICAg QUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICAgICAgaWYgKFtzZW5kZXIg aXNLaW5kT2ZDbGFzczpVSU1lbnVDb250cm9sbGVyLmNsYXNzXSAmJiBlZGl0b3JTdGF0ZS5zZWxl Y3Rpb25Jc1JhbmdlKQogICAgICAgICAgICAgcmV0dXJuIE5POworICAgICAgICBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0FO QUxZU0lTKQogCkBAIC00MjA2LDggKzQyMTQsMTAgQEAgV0VCQ09SRV9DT01NQU5EX0ZPUl9XRUJW SUVXKHBhc3RlQW5kTWF0Y2hTdHlsZSk7CiAKIC0gKHZvaWQpcGFzdGVGb3JXZWJWaWV3OihpZClz ZW5kZXIKIHsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIGlm IChzZW5kZXIgPT0gVUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51Q29udHJvbGxlciAmJiBbc2Vs ZiBfaGFuZGxlRE9NUGFzdGVSZXF1ZXN0V2l0aFJlc3VsdDpXZWJDb3JlOjpET01QYXN0ZUFjY2Vz c1Jlc3BvbnNlOjpHcmFudGVkRm9yR2VzdHVyZV0pCiAgICAgICAgIHJldHVybjsKKyAgICBBTExP V19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIAogICAgIF9hdXRvY29ycmVjdGlvbkNvbnRl eHROZWVkc1VwZGF0ZSA9IFlFUzsKICAgICBfcGFnZS0+ZXhlY3V0ZUVkaXRDb21tYW5kKCJwYXN0 ZSJfcyk7CkBAIC00MzcwLDcgKzQzODAsOSBAQCBzdGF0aWMgVUlQYXN0ZWJvYXJkICpwYXN0ZWJv YXJkRm9yQWNjZXNzQ2F0ZWdvcnkoV2ViQ29yZTo6RE9NUGFzdGVBY2Nlc3NDYXRlZ29yeQogICAg IH0KIAogICAgIGlmIChhdXRvIHBhc3RlSGFuZGxlciA9IFdURk1vdmUoX2RvbVBhc3RlUmVxdWVz dEhhbmRsZXIpKSB7CisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lO CiAgICAgICAgIFtVSU1lbnVDb250cm9sbGVyLnNoYXJlZE1lbnVDb250cm9sbGVyIGhpZGVNZW51 RnJvbVZpZXc6c2VsZl07CisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VO RAogICAgICAgICBwYXN0ZUhhbmRsZXIocmVzcG9uc2UpOwogICAgICAgICByZXR1cm4gWUVTOwog ICAgIH0KQEAgLTcwNTAsOCArNzA2Miw5IEBAIHN0YXRpYyBCT09MIGFsbFBhc3RlYm9hcmRJdGVt T3JpZ2luc01hdGNoT3JpZ2luKFVJUGFzdGVib2FyZCAqcGFzdGVib2FyZCwgY29uc3QKICAgICAg ICAgbWVudUNvbnRyb2xsZXJSZWN0ID0geyBXZWJDb3JlOjpJbnRQb2ludChfbGFzdEludGVyYWN0 aW9uTG9jYXRpb24pLCB7IH0gfTsKICAgICAgICAgbWVudUNvbnRyb2xsZXJSZWN0LmluZmxhdGUo aW50ZXJhY3Rpb25Mb2NhdGlvbk1hcmdpbik7CiAgICAgfQotCisgICAgQUxMT1dfREVQUkVDQVRF RF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBbVUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51Q29u dHJvbGxlciBzaG93TWVudUZyb21WaWV3OnNlbGYgcmVjdDptZW51Q29udHJvbGxlclJlY3RdOwor ICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogfQogCiAtICh2b2lkKWRvQWZ0 ZXJFZGl0b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXNpbmdFbGVtZW50OihkaXNwYXRjaF9ibG9ja190 KWJsb2NrCkBAIC0xMTg3OCw3ICsxMTg5MSw3IEBAIHN0YXRpYyBVSU1lbnUgKm1lbnVGcm9tTGVn YWN5UHJldmlld09yRGVmYXVsdEFjdGlvbnMoVUlWaWV3Q29udHJvbGxlciAqcHJldmlld1ZpCiAg ICAgcmV0dXJuIFtfYWN0aW9uU2hlZXRBc3Npc3RhbnQgc3VnZ2VzdGVkQWN0aW9uc0ZvckNvbnRl eHRNZW51V2l0aFBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb25dOwogfQog Ci0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51 V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJh dGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNv bnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRl eHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gcHJldmlld0ZvckhpZ2hsaWdodGlu Z0l0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7CiAgICAgW3Nl bGYgX3N0YXJ0U3VwcHJlc3NpbmdTZWxlY3Rpb25Bc3Npc3RhbnRGb3JSZWFzb246V2ViS2l0OjpJ bnRlcmFjdGlvbklzSGFwcGVuaW5nXTsKICAgICBbc2VsZiBfY2FuY2VsVG91Y2hFdmVudEdlc3R1 cmVSZWNvZ25pemVyXTsKQEAgLTExOTEyLDcgKzExOTI1LDcgQEAgc3RhdGljIFVJTWVudSAqbWVu dUZyb21MZWdhY3lQcmV2aWV3T3JEZWZhdWx0QWN0aW9ucyhVSVZpZXdDb250cm9sbGVyICpwcmV2 aWV3VmkKICAgICB9CiB9CiAKLS0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRl cmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gcHJldmlld0Zv ckRpc21pc3NpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0 aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUlu dGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1 cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gZGlzbWlz c2FsUHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVudGlmaWVy CiB7CiAgICAgcmV0dXJuIHN0ZDo6ZXhjaGFuZ2UoX2NvbnRleHRNZW51SW50ZXJhY3Rpb25UYXJn ZXRlZFByZXZpZXcsIG5pbCkuYXV0b3JlbGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bk b3duSU9TLm1tCmluZGV4IGVmNmRmNjU4Y2QyOTAzYTVmM2Y2YTcwMmFiYmNmYjVkMmY0ZjdkMzEu LjUyZDkxMTlhN2EyNzk1NjZjYjg5MzA1YjA2ODE1YmVmZDMyMzYzYTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25J T1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2Vz dGlvbnNEcm9wZG93bklPUy5tbQpAQCAtNTUyLDcgKzU1Miw3IEBAIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0VORAogCiAjcHJhZ21hIG1hcmsgVUlDb250ZXh0TWVudUludGVyYWN0aW9u RGVsZWdhdGUKIAotLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9u OihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxp Z2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAq KWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFj dGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlv bjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFBy ZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWluZz4paWRlbnRpZmllcgogewog ICAgIHJldHVybiBbc2VsZi52aWV3IF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZp ZXdGb3JGb2N1c2VkRWxlbWVudF07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCmluZGV4IDJkYzY1 NWM5ZDBhMDU1M2M5ZGU2NzA3OTI4ZTI3Mjc0OTQ0MGVlNTQuLjgyNWRjZWRlMjRlZDM1Y2ZmM2Yz MmIxNWVmYWEyMTY2ODZkODZiMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCkBAIC00MTYsNyAr NDE2LDggQEAgc3RhdGljIGNvbnN0IENHRmxvYXQga0RhdGVUaW1lUGlja2VyQ29udHJvbE1hcmdp biA9IDY7CiAgICAgcmV0dXJuIFVJRWRnZUluc2V0c1plcm87CiB9CiAKLS0gKFVJVGFyZ2V0ZWRQ cmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9u ICopaW50ZXJhY3Rpb24gcHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlv bjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCisKKy0gKFVJVGFy Z2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVy YWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3Vy YXRpb24gKiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZp ZXI6KGlkPE5TQ29weWluZz4paWRlbnRpZmllcgogewogICAgIHJldHVybiBbX3ZpZXcgX2NyZWF0 ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVtZW50XTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbQppbmRleCAzODY1MmRjMWJhNmJhZmE1ZjQ5ODA5YjhjZGM0N2YyMjFkNDM2MDBkLi43 MTBhZmQzMjU0M2QzNTI3ZTgxOGFjNDQ1NDM0NGJiZGZhMjhiZGI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCkBA IC02MzcsNyArNjM3LDcgQEAgc3RhdGljIE5TU2V0PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5 cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykKIAogI2lmIFVTRShVSUNPTlRFWFRNRU5VKQogCi0tIChV SVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJ bnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENv bmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgor LSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRN ZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51 Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gaGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRo SWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7CiAgICAgcmV0dXJuIFtfdmll dyBfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZV07CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0 UGlja2VyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVj dFBpY2tlci5tbQppbmRleCBmOWYwNTZlYjQ5ZTk2ODAzMDgxZmJjZGExMThmOTJhM2U0ZTNjMGE1 Li43YzdjMWQ1M2JkMzUwMjkzYmE2ODI0YTFiNmFkZGVkOTkwYTFjYmVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQaWNrZXIu bW0KQEAgLTY0OSw3ICs2NDksNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgR3JvdXBPcHRpb25UZXh0 Q29sb3JBbHBoYSA9IDAuNTsKICAgICByZXR1cm4gbmlsOwogfQogCi0tIChVSVRhcmdldGVkUHJl dmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAq KWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246 KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRl ZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlv biAqKWNvbmZpZ3VyYXRpb24gaGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjoo aWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7CiAgICAgcmV0dXJuIFtfdmlldyBfY3JlYXRlVGFy Z2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3Rm9yRm9jdXNlZEVsZW1lbnRdOwogfQpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDVjODdhYjI1ZDQ2 NGI5ZmUyZGJkMTI3ODIwNzc5OTdlNzZlMTJkYTYuLmI3MGFkYTQ3ODViMTFlNTRiM2YxNmFmYTdm MjUxZjY2YzI3N2I0MzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMi0wNC0yMCAgTWVnYW4gR2FyZG5lciAgPG1l Z2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgb2ZmIG9mIGRlcHJpY2F0ZWQg bWV0aG9kcyBhbmQgYWRkIGFsbG93IGRlcHJpY2F0aW9uIGZvciBoYXJkZXIgdG8gcmVmZWN0b3Ig Y29kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz OTU2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlv bnMubW06CisgICAgICAgIChURVNUKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2NvY29h L1Rlc3RSdW5uZXJXS1dlYlZpZXcubW06CisgICAgICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZpZXcg aW5pdFdpdGhGcmFtZTpjb25maWd1cmF0aW9uOl0pOgorICAgICAgICAoLVtUZXN0UnVubmVyV0tX ZWJWaWV3IF9hZGRDdXN0b21JdGVtVG9NZW51Q29udHJvbGxlcklmTmVjZXNzYXJ5XSk6CisgICAg ICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZpZXcgcmVzZXRDdXN0b21NZW51QWN0aW9uXSk6CisgICAg ICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZpZXcgY2FuUGVyZm9ybUFjdGlvbjp3aXRoU2VuZGVyOl0p OgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tOgor ICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1Jbml0aWFsaXplKToKKyAgICAg ICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtRGVzdHJveSk6CisKIDIwMjItMDQtMjAg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2Vi R1BVXSBVcGRhdGUgV2ViR1BVIENUUyB0byByZXZpc2lvbiA1NDlkN2MyZjE2MzczMjFhOTI0N2Yw YTNhYjAyMmY5MTllNWNhNWRhCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1dLQ29udGVudFZpZXdFZGl0aW5nQWN0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1t CmluZGV4IGY2OGJjM2RjYzdmZmY2ZDNkOGU1OWU1NzA5YzNhYjAzMGE4NGMzZWYuLjdmODQ4MDVm ZTFjNjZiYzRlMGViYjcwNjZmZDc3ZGUxNTdlN2VhZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1t CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmll d0VkaXRpbmdBY3Rpb25zLm1tCkBAIC0xMzYsNyArMTM2LDkgQEAgVEVTVChXZWJLaXQsIENhcHR1 cmVUZXh0RnJvbUNhbWVyYSkKICAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKICAgICBbd2Vi VmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAgICAgRVhQRUNUX1RSVUUoW3dl YlZpZXcgY2FuUGVyZm9ybUFjdGlvbjpAc2VsZWN0b3IoY2FwdHVyZVRleHRGcm9tQ2FtZXJhOikg d2l0aFNlbmRlcjpuaWxdKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJ TgogICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBjYW5QZXJmb3JtQWN0aW9uOkBzZWxlY3Rvcihj YXB0dXJlVGV4dEZyb21DYW1lcmE6KSB3aXRoU2VuZGVyOlVJTWVudUNvbnRyb2xsZXIuc2hhcmVk TWVudUNvbnRyb2xsZXJdKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQK IAogICAgIFt3ZWJWaWV3IGNvbGxhcHNlVG9FbmRdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0 UHJlc2VudGF0aW9uVXBkYXRlXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv Y29jb2EvVGVzdFJ1bm5lcldLV2ViVmlldy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29j b2EvVGVzdFJ1bm5lcldLV2ViVmlldy5tbQppbmRleCBjZDA3MWIxODYyNWQ3NjEwZGZhN2MxYWQ1 ODU4MjNhYTI1N2MxMTViLi44ZDc0OGYxN2ViMTRlYzM2Y2QzNTcxODQyZTk4NGQzZjBjZDBjZTU3 IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RSdW5uZXJXS1dl YlZpZXcubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0UnVubmVyV0tX ZWJWaWV3Lm1tCkBAIC0xMTEsOSArMTExLDExIEBAIElHTk9SRV9XQVJOSU5HU19FTkQKICNlbHNl CiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2lu dm9rZVNob3dLZXlib2FyZENhbGxiYWNrSWZOZWNlc3NhcnkpIG5hbWU6VUlLZXlib2FyZERpZFNo b3dOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6 c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2ludm9rZUhpZGVLZXlib2FyZENhbGxiYWNrSWZOZWNl c3NhcnkpIG5hbWU6VUlLZXlib2FyZERpZEhpZGVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07Cisg ICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgICAgIFtjZW50 ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2RpZFNob3dNZW51KSBuYW1l OlVJTWVudUNvbnRyb2xsZXJEaWRTaG93TWVudU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAg ICAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2lsbEhp ZGVNZW51KSBuYW1lOlVJTWVudUNvbnRyb2xsZXJXaWxsSGlkZU1lbnVOb3RpZmljYXRpb24gb2Jq ZWN0Om5pbF07CiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2Vs ZWN0b3IoX2RpZEhpZGVNZW51KSBuYW1lOlVJTWVudUNvbnRyb2xsZXJEaWRIaWRlTWVudU5vdGlm aWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfRU5ECiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0 b3IoX3dpbGxQcmVzZW50UG9wb3ZlcikgbmFtZTpAIlVJUG9wb3ZlckNvbnRyb2xsZXJXaWxsUHJl c2VudFBvcG92ZXJOb3RpZmljYXRpb24iIG9iamVjdDpuaWxdOwogICAgICAgICBbY2VudGVyIGFk ZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9kaWREaXNtaXNzUG9wb3ZlcikgbmFt ZTpAIlVJUG9wb3ZlckNvbnRyb2xsZXJEaWREaXNtaXNzUG9wb3Zlck5vdGlmaWNhdGlvbiIgb2Jq ZWN0Om5pbF07CiAgICAgICAgIHNlbGYuVUlEZWxlZ2F0ZSA9IHNlbGY7CkBAIC0yODIsOCArMjg0 LDEwIEBAIElHTk9SRV9XQVJOSU5HU19FTkQKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBp dGVtID0gYWRvcHROUyhbW1VJTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6X2N1c3RvbU1l bnVBY3Rpb25JbmZvLT5uYW1lLmdldCgpIGFjdGlvbjpAc2VsZWN0b3IocGVyZm9ybUN1c3RvbUFj dGlvbjopXSk7Ci0gICAgW2l0ZW0gc2V0RG9udERpc21pc3M6IV9jdXN0b21NZW51QWN0aW9uSW5m by0+ZGlzbWlzc2VzQXV0b21hdGljYWxseV07CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJB VElPTlNfQkVHSU4KKyAgICAvL1tpdGVtIHNldERvbnREaXNtaXNzOiFfY3VzdG9tTWVudUFjdGlv bkluZm8tPmRpc21pc3Nlc0F1dG9tYXRpY2FsbHldOwogICAgIFVJTWVudUNvbnRyb2xsZXIgKmNv bnRyb2xsZXIgPSBVSU1lbnVDb250cm9sbGVyLnNoYXJlZE1lbnVDb250cm9sbGVyOworICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIGNvbnRyb2xsZXIubWVudUl0ZW1z ID0gQFsgaXRlbS5nZXQoKSBdOwogICAgIFtjb250cm9sbGVyIHVwZGF0ZV07CiB9CkBAIC0zMDIs NyArMzA2LDkgQEAgSUdOT1JFX1dBUk5JTkdTX0VORAogLSAodm9pZClyZXNldEN1c3RvbU1lbnVB Y3Rpb24KIHsKICAgICBfY3VzdG9tTWVudUFjdGlvbkluZm8ucmVzZXQoKTsKKyAgICBBTExPV19E RVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIFVJTWVudUNvbnRyb2xsZXIuc2hhcmVk TWVudUNvbnRyb2xsZXIubWVudUl0ZW1zID0gQFsgXTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19FTkQKIH0KIAogLSAodm9pZClwZXJmb3JtQ3VzdG9tQWN0aW9uOihpZClzZW5k ZXIKQEAgLTMyNSw3ICszMzEsOSBAQCBJR05PUkVfV0FSTklOR1NfRU5ECiAgICAgaWYgKGlzQ3Vz dG9tQWN0aW9uKQogICAgICAgICBjYW5QZXJmb3JtQWN0aW9uQnlEZWZhdWx0ID0gX2N1c3RvbU1l bnVBY3Rpb25JbmZvLmhhc192YWx1ZSgpOwogCisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJB VElPTlNfQkVHSU4KICAgICBpZiAoY2FuUGVyZm9ybUFjdGlvbkJ5RGVmYXVsdCAmJiBfYWxsb3dl ZE1lbnVBY3Rpb25zICYmIHNlbmRlciA9PSBVSU1lbnVDb250cm9sbGVyLnNoYXJlZE1lbnVDb250 cm9sbGVyKSB7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgICAg IEJPT0wgaXNBbGxvd2VkID0gTk87CiAgICAgICAgIGlmIChpc0N1c3RvbUFjdGlvbikgewogICAg ICAgICAgICAgZm9yIChOU1N0cmluZyAqYWxsb3dlZEFjdGlvbiBpbiBfYWxsb3dlZE1lbnVBY3Rp b25zLmdldCgpKSB7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9UZXN0 Q29udHJvbGxlcklPUy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9s bGVySU9TLm1tCmluZGV4IDE0MmEyYzExOTUzMGYzYTMzMzI1OTBjODhhMDFkYWQ1NTI3ZmY3ODcu LjRhMTFlODc4N2MwMzI1NWYzZmFiYzQ3Mzc1ZTdhODFiNmJmY2I3Y2UgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tCisrKyBiL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tCkBAIC0xMTAsOCArMTEw LDEwIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtSW5pdGlhbGl6ZShjb25zdCBPcHRp b25zJiBvcHRpb25zKQogICAgIGF1dG8gY2VudGVyID0gQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXRM b2NhbENlbnRlcigpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2ZXIoY2VudGVy LCB0aGlzLCBoYW5kbGVLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uLCAoQ0ZTdHJpbmdSZWYp VUlLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uLCBudWxscHRyLCBDRk5vdGlmaWNhdGlvblN1 c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7CiAgICAgQ0ZOb3RpZmljYXRpb25D ZW50ZXJBZGRPYnNlcnZlcihjZW50ZXIsIHRoaXMsIGhhbmRsZUtleWJvYXJkRGlkSGlkZU5vdGlm aWNhdGlvbiwgKENGU3RyaW5nUmVmKVVJS2V5Ym9hcmREaWRIaWRlTm90aWZpY2F0aW9uLCBudWxs cHRyLCBDRk5vdGlmaWNhdGlvblN1c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7 CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBDRk5vdGlmaWNh dGlvbkNlbnRlckFkZE9ic2VydmVyKGNlbnRlciwgdGhpcywgaGFuZGxlTWVudVdpbGxIaWRlTm90 aWZpY2F0aW9uLCAoQ0ZTdHJpbmdSZWYpVUlNZW51Q29udHJvbGxlcldpbGxIaWRlTWVudU5vdGlm aWNhdGlvbiwgbnVsbHB0ciwgQ0ZOb3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVy SW1tZWRpYXRlbHkpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2ZXIoY2VudGVy LCB0aGlzLCBoYW5kbGVNZW51RGlkSGlkZU5vdGlmaWNhdGlvbiwgKENGU3RyaW5nUmVmKVVJTWVu dUNvbnRyb2xsZXJEaWRIaWRlTWVudU5vdGlmaWNhdGlvbiwgbnVsbHB0ciwgQ0ZOb3RpZmljYXRp b25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVySW1tZWRpYXRlbHkpOworICAgIEFMTE9XX0RFUFJF Q0FURURfREVDTEFSQVRJT05TX0VORAogfQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9y bURlc3Ryb3koKQpAQCAtMTIxLDggKzEyMywxMCBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0 Zm9ybURlc3Ryb3koKQogICAgIGF1dG8gY2VudGVyID0gQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXRM b2NhbENlbnRlcigpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyUmVtb3ZlT2JzZXJ2ZXIoY2Vu dGVyLCB0aGlzLCAoQ0ZTdHJpbmdSZWYpVUlLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uLCBu dWxscHRyKTsKICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJlbW92ZU9ic2VydmVyKGNlbnRlciwg dGhpcywgKENGU3RyaW5nUmVmKVVJS2V5Ym9hcmREaWRIaWRlTm90aWZpY2F0aW9uLCBudWxscHRy KTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIENGTm90aWZp Y2F0aW9uQ2VudGVyUmVtb3ZlT2JzZXJ2ZXIoY2VudGVyLCB0aGlzLCAoQ0ZTdHJpbmdSZWYpVUlN ZW51Q29udHJvbGxlcldpbGxIaWRlTWVudU5vdGlmaWNhdGlvbiwgbnVsbHB0cik7CiAgICAgQ0ZO b3RpZmljYXRpb25DZW50ZXJSZW1vdmVPYnNlcnZlcihjZW50ZXIsIHRoaXMsIChDRlN0cmluZ1Jl ZilVSU1lbnVDb250cm9sbGVyRGlkSGlkZU1lbnVOb3RpZmljYXRpb24sIG51bGxwdHIpOworICAg IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogfQogCiB2b2lkIFRlc3RDb250cm9s bGVyOjppbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVQYXRoKCkK 458012 2022-04-20 14:03:18 -0700 2022-04-20 14:08:26 -0700 Patch bug-239560-20220420140318.patch text/plain 20056 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5MTc0NWJiYjE1YjVjYjE1 ZTg3NDJjZmM2MjBlZjQ2NmVkNjZmMjcuLjI1NGQ2YzhmYmRhYTljMzE4MDIzNTkxZjZjYjgxMDhk Y2Q1MzAxYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjItMDQtMjAgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRyZXNzIHJlY2Vu dCBkZXByZWNhdGlvbiB3YXJuaW5ncyBvbiBpT1MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW06CisgICAgICAg ICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1 cmF0aW9uOmhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6XSk6CisgICAgICAg ICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3 Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOiBEZWxldGVkLgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IHNldFVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBjYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IHBhc3RlRm9yV2ViVmlldzpdKToKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBfaGFuZGxlRE9NUGFzdGVSZXF1ZXN0V2l0aFJlc3VsdDpdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfcmVxdWVzdERPTVBhc3RlQWNjZXNzRm9yQ2F0ZWdvcnk6ZWxlbWVudFJlY3Q6 b3JpZ2luSWRlbnRpZmllcjpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9uOmNvbmZpZ3VyYXRpb246cHJldmlld0Zvckhp Z2hsaWdodGluZ0l0ZW1XaXRoSWRlbnRpZmllcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBjb250ZXh0TWVudUludGVyYWN0aW9uOmNvbmZpZ3VyYXRpb246ZGlzbWlzc2FsUHJldmlld0Zv ckl0ZW1XaXRoSWRlbnRpZmllcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250ZXh0 TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRp b246XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1lbnVJbnRl cmFjdGlvbjpwcmV2aWV3Rm9yRGlzbWlzc2luZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpdKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9w ZG93bklPUy5tbToKKyAgICAgICAgKC1bV0tEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd24gY29u dGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uOmhpZ2hsaWdodFByZXZpZXdGb3JJdGVt V2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgICgtW1dLRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bk b3duIGNvbnRleHRNZW51SW50ZXJhY3Rpb246cHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRo Q29uZmlndXJhdGlvbjpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1z L1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIg Y29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uOmhpZ2hsaWdodFByZXZpZXdGb3JJ dGVtV2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4 dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0 aW9uOl0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBs b2FkUGFuZWwubW06CisgICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGNvbnRleHRNZW51SW50 ZXJhY3Rpb246Y29uZmlndXJhdGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlm aWVyOl0pOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBjb250ZXh0TWVudUludGVyYWN0 aW9uOnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6IERlbGV0 ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQaWNrZXIubW06 CisgICAgICAgICgtW1dLU2VsZWN0UGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246Y29uZmln dXJhdGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlmaWVyOl0pOgorICAgICAg ICAoLVtXS1NlbGVjdFBpY2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdo bGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6IERlbGV0ZWQuCisKIDIwMjItMDQtMjAg IERpZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCBub24tdW5pZmllZCBidWlsZCBmaXhlcyBhZnRlciByMjkzMDUyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDc0OWJiZWJjNGUwNjg0MDZkZmYzMWQ0 ZmZiM2FhZWRkNWU5MjQ2OTMuLjg5ZDUwNjY0YThlN2E3Zjg4MmYzZmQ0ZjJiZGI2YTZjMzE4M2My YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC00MSw2 ICs0MSw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSURldmljZV9Qcml2YXRlLmg+CiAjaW1wb3J0IDxV SUtpdC9VSURvY3VtZW50UGFzc3dvcmRWaWV3Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSURvY3VtZW50 UGlja2VyVmlld0NvbnRyb2xsZXJfUHJpdmF0ZS5oPgorI2ltcG9ydCA8VUlLaXQvVUlFZGl0TWVu dUludGVyYWN0aW9uX1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJS2l0L1VJRm9udF9Qcml2YXRlLmg+ CiAjaW1wb3J0IDxVSUtpdC9VSUdlb21ldHJ5X1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJS2l0L1VJ R2VzdHVyZVJlY29nbml6ZXJfUHJpdmF0ZS5oPgpAQCAtMTIxMiw5ICsxMjEzLDExIEBAIFdURl9F WFRFUk5fQ19FTkQKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgVUlLZXlib2FyZFBy ZWZlcmVuY2VzQ29udHJvbGxlcjxUSVByZWZlcmVuY2VzQ29udHJvbGxlckFjdGlvbnM+ICpwcmVm ZXJlbmNlc0FjdGlvbnM7CiBAZW5kCiAKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JF R0lOCiBAaW50ZXJmYWNlIFVJTWVudUl0ZW0gKFVJTWVudUNvbnRyb2xsZXJfU1BJKQogQHByb3Bl cnR5IChub25hdG9taWMpIEJPT0wgZG9udERpc21pc3M7CiBAZW5kCitBTExPV19ERVBSRUNBVEVE X0RFQ0xBUkFUSU9OU19FTkQKIAogQGludGVyZmFjZSBVSUNhbGxvdXRCYXIgOiBVSVZpZXcKICsg KFVJQ2FsbG91dEJhciAqKWFjdGl2ZUNhbGxvdXRCYXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IDE1MDEyNGYx MTAwNjhmNTczMDI2YzAxZTFhMGI2NzZjZjhhYTFmZmIuLmI0MTUxOTNmODEzY2M4MGExZmRlOTgw NTAzMGIxYzRhYTk2ZmU0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCkBAIC05MjQsNyArOTI0LDcgQEAgc3RhdGlj IE5TQXJyYXk8VUlNZW51RWxlbWVudCAqPiAqbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25z KFJldGFpblB0cjxOU0FycmEKICAgICByZXR1cm4gbmlsOwogfQogCi0tIChVSVRhcmdldGVkUHJl dmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAq KWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246 KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRl ZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlv biAqKWNvbmZpZ3VyYXRpb24gaGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjoo aWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7CiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQog ICAgIGlmIChpbnRlcmFjdGlvbiA9PSBfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlv bikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggODYzZTdiNGQ0ZjRkZGE3YzhhOTUyMmU5Y2EzOTYzY2Rm OTFmYWNjZi4uY2Y5ZWVmMjk3MWVkODQxNDQ2ODA0MDU1MGQ3MjI4YTU1MjBmMTVkYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCkBAIC0xMDc3LDggKzEwNzcsMTIgQEAgc3RhdGljIFdLRHJhZ1Nlc3Npb25Db250 ZXh0ICplbnN1cmVMb2NhbERyYWdTZXNzaW9uQ29udGV4dChpZCA8VUlEcmFnU2Vzc2lvbj4gc2UK ICNlbmRpZgogCiAgICAgTlNOb3RpZmljYXRpb25DZW50ZXIgKmNlbnRlciA9IFtOU05vdGlmaWNh dGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKKyAgICAKKyAgICBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19CRUdJTgogICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpA c2VsZWN0b3IoX3dpbGxIaWRlTWVudTopIG5hbWU6VUlNZW51Q29udHJvbGxlcldpbGxIaWRlTWVu dU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKF9kaWRIaWRlTWVudTopIG5hbWU6VUlNZW51Q29udHJvbGxlckRp ZEhpZGVNZW51Tm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOworICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0VORAorICAgIAogICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxl Y3RvcjpAc2VsZWN0b3IoX2tleWJvYXJkRGlkUmVxdWVzdERpc21pc3NhbDopIG5hbWU6VUlLZXli b2FyZFByaXZhdGVEaWRSZXF1ZXN0RGlzbWlzc2FsTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwog CiAgICAgX3Nob3dpbmdUZXh0U3R5bGVPcHRpb25zID0gTk87CkBAIC00MTE3LDEwICs0MTIxLDEy IEBAIFdFQkNPUkVfQ09NTUFORF9GT1JfV0VCVklFVyhwYXN0ZUFuZE1hdGNoU3R5bGUpOwogICAg IH0KIAogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHNlbGVjdEFsbDopKSB7CisgICAgICAg IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgICAgIGlmIChbc2VuZGVy IGlzS2luZE9mQ2xhc3M6VUlNZW51Q29udHJvbGxlci5jbGFzc10pIHsKICAgICAgICAgICAgIC8v IEJ5IHBsYXRmb3JtIGNvbnZlbnRpb24gd2UgZG9uJ3Qgc2hvdyBTZWxlY3QgQWxsIGluIHRoZSBj YWxsb3V0IG1lbnUgZm9yIGEgcmFuZ2Ugc2VsZWN0aW9uLgogICAgICAgICAgICAgcmV0dXJuICFl ZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc1JhbmdlICYmIHNlbGYuaGFzQ29udGVudDsKICAgICAgICAg fQorICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICAgICAgcmV0 dXJuIFlFUzsKICAgICB9CiAKQEAgLTQxNTAsOCArNDE1NiwxMCBAQCBXRUJDT1JFX0NPTU1BTkRf Rk9SX1dFQlZJRVcocGFzdGVBbmRNYXRjaFN0eWxlKTsKICAgICAgICAgaWYgKCFtYXlDb250YWlu U2VsZWN0YWJsZVRleHQoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHx8 IF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmlzUmVhZE9ubHkpCiAgICAgICAgICAgICByZXR1 cm4gTk87CiAKKyAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAg ICAgICAgaWYgKFtzZW5kZXIgaXNLaW5kT2ZDbGFzczpVSU1lbnVDb250cm9sbGVyLmNsYXNzXSAm JiBlZGl0b3JTdGF0ZS5zZWxlY3Rpb25Jc1JhbmdlKQogICAgICAgICAgICAgcmV0dXJuIE5POwor ICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICB9CiAjZW5kaWYg Ly8gRU5BQkxFKElNQUdFX0FOQUxZU0lTKQogCkBAIC00MjA2LDggKzQyMTQsMTAgQEAgV0VCQ09S RV9DT01NQU5EX0ZPUl9XRUJWSUVXKHBhc3RlQW5kTWF0Y2hTdHlsZSk7CiAKIC0gKHZvaWQpcGFz dGVGb3JXZWJWaWV3OihpZClzZW5kZXIKIHsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFU SU9OU19CRUdJTgogICAgIGlmIChzZW5kZXIgPT0gVUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51 Q29udHJvbGxlciAmJiBbc2VsZiBfaGFuZGxlRE9NUGFzdGVSZXF1ZXN0V2l0aFJlc3VsdDpXZWJD b3JlOjpET01QYXN0ZUFjY2Vzc1Jlc3BvbnNlOjpHcmFudGVkRm9yR2VzdHVyZV0pCiAgICAgICAg IHJldHVybjsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIAogICAgIF9h dXRvY29ycmVjdGlvbkNvbnRleHROZWVkc1VwZGF0ZSA9IFlFUzsKICAgICBfcGFnZS0+ZXhlY3V0 ZUVkaXRDb21tYW5kKCJwYXN0ZSJfcyk7CkBAIC00MzcwLDcgKzQzODAsOSBAQCBzdGF0aWMgVUlQ YXN0ZWJvYXJkICpwYXN0ZWJvYXJkRm9yQWNjZXNzQ2F0ZWdvcnkoV2ViQ29yZTo6RE9NUGFzdGVB Y2Nlc3NDYXRlZ29yeQogICAgIH0KIAogICAgIGlmIChhdXRvIHBhc3RlSGFuZGxlciA9IFdURk1v dmUoX2RvbVBhc3RlUmVxdWVzdEhhbmRsZXIpKSB7CisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCiAgICAgICAgIFtVSU1lbnVDb250cm9sbGVyLnNoYXJlZE1lbnVD b250cm9sbGVyIGhpZGVNZW51RnJvbVZpZXc6c2VsZl07CisgICAgICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0VORAogICAgICAgICBwYXN0ZUhhbmRsZXIocmVzcG9uc2UpOwogICAg ICAgICByZXR1cm4gWUVTOwogICAgIH0KQEAgLTcwNTAsOCArNzA2Miw5IEBAIHN0YXRpYyBCT09M IGFsbFBhc3RlYm9hcmRJdGVtT3JpZ2luc01hdGNoT3JpZ2luKFVJUGFzdGVib2FyZCAqcGFzdGVi b2FyZCwgY29uc3QKICAgICAgICAgbWVudUNvbnRyb2xsZXJSZWN0ID0geyBXZWJDb3JlOjpJbnRQ b2ludChfbGFzdEludGVyYWN0aW9uTG9jYXRpb24pLCB7IH0gfTsKICAgICAgICAgbWVudUNvbnRy b2xsZXJSZWN0LmluZmxhdGUoaW50ZXJhY3Rpb25Mb2NhdGlvbk1hcmdpbik7CiAgICAgfQotCisg ICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBbVUlNZW51Q29udHJv bGxlci5zaGFyZWRNZW51Q29udHJvbGxlciBzaG93TWVudUZyb21WaWV3OnNlbGYgcmVjdDptZW51 Q29udHJvbGxlclJlY3RdOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAog fQogCiAtICh2b2lkKWRvQWZ0ZXJFZGl0b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXNpbmdFbGVtZW50 OihkaXNwYXRjaF9ibG9ja190KWJsb2NrCkBAIC0xMTg3OCw3ICsxMTg5MSw3IEBAIHN0YXRpYyBV SU1lbnUgKm1lbnVGcm9tTGVnYWN5UHJldmlld09yRGVmYXVsdEFjdGlvbnMoVUlWaWV3Q29udHJv bGxlciAqcHJldmlld1ZpCiAgICAgcmV0dXJuIFtfYWN0aW9uU2hlZXRBc3Npc3RhbnQgc3VnZ2Vz dGVkQWN0aW9uc0ZvckNvbnRleHRNZW51V2l0aFBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9u SW5mb3JtYXRpb25dOwogfQogCi0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50 ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdG b3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1 cmF0aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVu dUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25m aWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gcHJl dmlld0ZvckhpZ2hsaWdodGluZ0l0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVu dGlmaWVyCiB7CiAgICAgW3NlbGYgX3N0YXJ0U3VwcHJlc3NpbmdTZWxlY3Rpb25Bc3Npc3RhbnRG b3JSZWFzb246V2ViS2l0OjpJbnRlcmFjdGlvbklzSGFwcGVuaW5nXTsKICAgICBbc2VsZiBfY2Fu Y2VsVG91Y2hFdmVudEdlc3R1cmVSZWNvZ25pemVyXTsKQEAgLTExOTEyLDcgKzExOTI1LDcgQEAg c3RhdGljIFVJTWVudSAqbWVudUZyb21MZWdhY3lQcmV2aWV3T3JEZWZhdWx0QWN0aW9ucyhVSVZp ZXdDb250cm9sbGVyICpwcmV2aWV3VmkKICAgICB9CiB9CiAKLS0gKFVJVGFyZ2V0ZWRQcmV2aWV3 ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50 ZXJhY3Rpb24gcHJldmlld0ZvckRpc21pc3NpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29u dGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRlZFByZXZp ZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilp bnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNv bmZpZ3VyYXRpb24gZGlzbWlzc2FsUHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlND b3B5aW5nPilpZGVudGlmaWVyCiB7CiAgICAgcmV0dXJuIHN0ZDo6ZXhjaGFuZ2UoX2NvbnRleHRN ZW51SW50ZXJhY3Rpb25UYXJnZXRlZFByZXZpZXcsIG5pbCkuYXV0b3JlbGVhc2UoKTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rp b25zRHJvcGRvd25JT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxp c3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TLm1tCmluZGV4IGVmNmRmNjU4Y2QyOTAzYTVmM2Y2YTcw MmFiYmNmYjVkMmY0ZjdkMzEuLjUyZDkxMTlhN2EyNzk1NjZjYjg5MzA1YjA2ODE1YmVmZDMyMzYz YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5tbQpAQCAtNTUyLDcgKzU1Miw3IEBA IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogCiAjcHJhZ21hIG1hcmsgVUlDb250 ZXh0TWVudUludGVyYWN0aW9uRGVsZWdhdGUKIAotLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250 ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlv biBwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRN ZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICop Y29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJh Y3Rpb24gY29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1 cmF0aW9uIGhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWlu Zz4paWRlbnRpZmllcgogewogICAgIHJldHVybiBbc2VsZi52aWV3IF9jcmVhdGVUYXJnZXRlZENv bnRleHRNZW51SGludFByZXZpZXdGb3JGb2N1c2VkRWxlbWVudF07CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250 cm9sLm1tCmluZGV4IDJkYzY1NWM5ZDBhMDU1M2M5ZGU2NzA3OTI4ZTI3Mjc0OTQ0MGVlNTQuLjgy NWRjZWRlMjRlZDM1Y2ZmM2YzMmIxNWVmYWEyMTY2ODZkODZiMGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250 cm9sLm1tCkBAIC00MTYsNyArNDE2LDggQEAgc3RhdGljIGNvbnN0IENHRmxvYXQga0RhdGVUaW1l UGlja2VyQ29udHJvbE1hcmdpbiA9IDY7CiAgICAgcmV0dXJuIFVJRWRnZUluc2V0c1plcm87CiB9 CiAKLS0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250 ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gcHJldmlld0ZvckhpZ2hsaWdodGluZ01l bnVXaXRoQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1 cmF0aW9uCisKKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjoo VUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlvbjooVUlD b250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFByZXZpZXdG b3JJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWluZz4paWRlbnRpZmllcgogewogICAgIHJl dHVybiBbX3ZpZXcgX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3Vz ZWRFbGVtZW50XTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQppbmRleCAzODY1MmRjMWJhNmJhZmE1ZjQ5ODA5Yjhj ZGM0N2YyMjFkNDM2MDBkLi43MTBhZmQzMjU0M2QzNTI3ZTgxOGFjNDQ1NDM0NGJiZGZhMjhiZGI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBs b2FkUGFuZWwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmls ZVVwbG9hZFBhbmVsLm1tCkBAIC02MzcsNyArNjM3LDcgQEAgc3RhdGljIE5TU2V0PE5TU3RyaW5n ICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykKIAogI2lmIFVTRShVSUNP TlRFWFRNRU5VKQogCi0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rp b246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdo bGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9u ICopY29uZmlndXJhdGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVy YWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0 aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gaGlnaGxpZ2h0 UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7 CiAgICAgcmV0dXJuIFtfdmlldyBfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3 SWZQb3NzaWJsZV07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv Zm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L2Zvcm1zL1dLRm9ybVNlbGVjdFBpY2tlci5tbQppbmRleCBmOWYwNTZlYjQ5ZTk2ODAzMDgxZmJj ZGExMThmOTJhM2U0ZTNjMGE1Li43YzdjMWQ1M2JkMzUwMjkzYmE2ODI0YTFiNmFkZGVkOTkwYTFj YmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3Jt U2VsZWN0UGlja2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0Zvcm1TZWxlY3RQaWNrZXIubW0KQEAgLTY0OSw3ICs2NDksNyBAQCBzdGF0aWMgY29uc3QgZmxv YXQgR3JvdXBPcHRpb25UZXh0Q29sb3JBbHBoYSA9IDAuNTsKICAgICByZXR1cm4gbmlsOwogfQog Ci0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51 V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJh dGlvbgorLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNv bnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1cmF0aW9uOihVSUNvbnRl eHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gaGlnaGxpZ2h0UHJldmlld0Zvckl0 ZW1XaXRoSWRlbnRpZmllcjooaWQ8TlNDb3B5aW5nPilpZGVudGlmaWVyCiB7CiAgICAgcmV0dXJu IFtfdmlldyBfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3Rm9yRm9jdXNlZEVs ZW1lbnRdOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDVjODdhYjI1ZDQ2NGI5ZmUyZGJkMTI3ODIwNzc5OTdlNzZlMTJkYTYuLjczODVhZTgz YWI0ZDE0ZjllOGY2MTMzMTZjNGM4MDY3MDFiZmExMzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMi0wNC0yMCAg TWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZHJl c3MgcmVjZW50IGRlcHJlY2F0aW9uIHdhcm5pbmdzIG9uIGlPUy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTU2MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XS0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlvbnMubW06CisgICAgICAgIChURVNUKToK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RSdW5uZXJXS1dlYlZpZXcubW06 CisgICAgICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZpZXcgaW5pdFdpdGhGcmFtZTpjb25maWd1cmF0 aW9uOl0pOgorICAgICAgICAoLVtUZXN0UnVubmVyV0tXZWJWaWV3IF9hZGRDdXN0b21JdGVtVG9N ZW51Q29udHJvbGxlcklmTmVjZXNzYXJ5XSk6CisgICAgICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZp ZXcgcmVzZXRDdXN0b21NZW51QWN0aW9uXSk6CisgICAgICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZp ZXcgY2FuUGVyZm9ybUFjdGlvbjp3aXRoU2VuZGVyOl0pOgorICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJv bGxlcjo6cGxhdGZvcm1Jbml0aWFsaXplKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OnBsYXRmb3JtRGVzdHJveSk6CisKIDIwMjItMDQtMjAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1h eGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BVXSBVcGRhdGUgV2ViR1BVIENUUyB0 byByZXZpc2lvbiA1NDlkN2MyZjE2MzczMjFhOTI0N2YwYTNhYjAyMmY5MTllNWNhNWRhCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudFZp ZXdFZGl0aW5nQWN0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1tCmluZGV4IGY2OGJjM2RjYzdmZmY2ZDNk OGU1OWU1NzA5YzNhYjAzMGE4NGMzZWYuLjdmODQ4MDVmZTFjNjZiYzRlMGViYjcwNjZmZDc3ZGUx NTdlN2VhZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0VkaXRpbmdBY3Rpb25zLm1tCkBAIC0x MzYsNyArMTM2LDkgQEAgVEVTVChXZWJLaXQsIENhcHR1cmVUZXh0RnJvbUNhbWVyYSkKICAgICBb d2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKICAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRh dGlvblVwZGF0ZV07CiAgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgY2FuUGVyZm9ybUFjdGlvbjpA c2VsZWN0b3IoY2FwdHVyZVRleHRGcm9tQ2FtZXJhOikgd2l0aFNlbmRlcjpuaWxdKTsKKyAgICBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIEVYUEVDVF9GQUxTRShbd2Vi VmlldyBjYW5QZXJmb3JtQWN0aW9uOkBzZWxlY3RvcihjYXB0dXJlVGV4dEZyb21DYW1lcmE6KSB3 aXRoU2VuZGVyOlVJTWVudUNvbnRyb2xsZXIuc2hhcmVkTWVudUNvbnRyb2xsZXJdKTsKKyAgICBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIAogICAgIFt3ZWJWaWV3IGNvbGxhcHNl VG9FbmRdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdFJ1bm5lcldLV2ViVmll dy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdFJ1bm5lcldLV2ViVmlldy5t bQppbmRleCBjZDA3MWIxODYyNWQ3NjEwZGZhN2MxYWQ1ODU4MjNhYTI1N2MxMTViLi5iZjM4MTBi NjZiOTg4NjE5ZjMyNTFjYjZkMmYxNzdhZDFjMzJmMGFjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL2NvY29hL1Rlc3RSdW5uZXJXS1dlYlZpZXcubW0KKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0UnVubmVyV0tXZWJWaWV3Lm1tCkBAIC0xMTEsOSArMTEx LDExIEBAIElHTk9SRV9XQVJOSU5HU19FTkQKICNlbHNlCiAgICAgICAgIFtjZW50ZXIgYWRkT2Jz ZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2ludm9rZVNob3dLZXlib2FyZENhbGxiYWNr SWZOZWNlc3NhcnkpIG5hbWU6VUlLZXlib2FyZERpZFNob3dOb3RpZmljYXRpb24gb2JqZWN0Om5p bF07CiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3Io X2ludm9rZUhpZGVLZXlib2FyZENhbGxiYWNrSWZOZWNlc3NhcnkpIG5hbWU6VUlLZXlib2FyZERp ZEhpZGVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxl Y3RvcjpAc2VsZWN0b3IoX2RpZFNob3dNZW51KSBuYW1lOlVJTWVudUNvbnRyb2xsZXJEaWRTaG93 TWVudU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZl cjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2lsbEhpZGVNZW51KSBuYW1lOlVJTWVudUNvbnRy b2xsZXJXaWxsSGlkZU1lbnVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAgICAgICAgIFtjZW50 ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2RpZEhpZGVNZW51KSBuYW1l OlVJTWVudUNvbnRyb2xsZXJEaWRIaWRlTWVudU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAg ICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgICAgIFtjZW50ZXIg YWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3dpbGxQcmVzZW50UG9wb3Zlcikg bmFtZTpAIlVJUG9wb3ZlckNvbnRyb2xsZXJXaWxsUHJlc2VudFBvcG92ZXJOb3RpZmljYXRpb24i IG9iamVjdDpuaWxdOwogICAgICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6 QHNlbGVjdG9yKF9kaWREaXNtaXNzUG9wb3ZlcikgbmFtZTpAIlVJUG9wb3ZlckNvbnRyb2xsZXJE aWREaXNtaXNzUG9wb3Zlck5vdGlmaWNhdGlvbiIgb2JqZWN0Om5pbF07CiAgICAgICAgIHNlbGYu VUlEZWxlZ2F0ZSA9IHNlbGY7CkBAIC0yODIsOCArMjg0LDEwIEBAIElHTk9SRV9XQVJOSU5HU19F TkQKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBpdGVtID0gYWRvcHROUyhbW1VJTWVudUl0 ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6X2N1c3RvbU1lbnVBY3Rpb25JbmZvLT5uYW1lLmdldCgp IGFjdGlvbjpAc2VsZWN0b3IocGVyZm9ybUN1c3RvbUFjdGlvbjopXSk7CisgICAgQUxMT1dfREVQ UkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBbaXRlbSBzZXREb250RGlzbWlzczohX2N1 c3RvbU1lbnVBY3Rpb25JbmZvLT5kaXNtaXNzZXNBdXRvbWF0aWNhbGx5XTsKICAgICBVSU1lbnVD b250cm9sbGVyICpjb250cm9sbGVyID0gVUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51Q29udHJv bGxlcjsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICBjb250cm9s bGVyLm1lbnVJdGVtcyA9IEBbIGl0ZW0uZ2V0KCkgXTsKICAgICBbY29udHJvbGxlciB1cGRhdGVd OwogfQpAQCAtMzAyLDcgKzMwNiw5IEBAIElHTk9SRV9XQVJOSU5HU19FTkQKIC0gKHZvaWQpcmVz ZXRDdXN0b21NZW51QWN0aW9uCiB7CiAgICAgX2N1c3RvbU1lbnVBY3Rpb25JbmZvLnJlc2V0KCk7 CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBVSU1lbnVDb250 cm9sbGVyLnNoYXJlZE1lbnVDb250cm9sbGVyLm1lbnVJdGVtcyA9IEBbIF07CisgICAgQUxMT1df REVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiB9CiAKIC0gKHZvaWQpcGVyZm9ybUN1c3RvbUFj dGlvbjooaWQpc2VuZGVyCkBAIC0zMjUsNyArMzMxLDkgQEAgSUdOT1JFX1dBUk5JTkdTX0VORAog ICAgIGlmIChpc0N1c3RvbUFjdGlvbikKICAgICAgICAgY2FuUGVyZm9ybUFjdGlvbkJ5RGVmYXVs dCA9IF9jdXN0b21NZW51QWN0aW9uSW5mby5oYXNfdmFsdWUoKTsKIAorICAgIEFMTE9XX0RFUFJF Q0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgaWYgKGNhblBlcmZvcm1BY3Rpb25CeURlZmF1 bHQgJiYgX2FsbG93ZWRNZW51QWN0aW9ucyAmJiBzZW5kZXIgPT0gVUlNZW51Q29udHJvbGxlci5z aGFyZWRNZW51Q29udHJvbGxlcikgeworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05T X0VORAogICAgICAgICBCT09MIGlzQWxsb3dlZCA9IE5POwogICAgICAgICBpZiAoaXNDdXN0b21B Y3Rpb24pIHsKICAgICAgICAgICAgIGZvciAoTlNTdHJpbmcgKmFsbG93ZWRBY3Rpb24gaW4gX2Fs bG93ZWRNZW51QWN0aW9ucy5nZXQoKSkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9pb3MvVGVzdENvbnRyb2xsZXJJT1MubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lv cy9UZXN0Q29udHJvbGxlcklPUy5tbQppbmRleCAxNDJhMmMxMTk1MzBmM2EzMzMyNTkwYzg4YTAx ZGFkNTUyN2ZmNzg3Li40YTExZTg3ODdjMDMyNTVmM2ZhYmM0NzM3NWU3YTgxYjZiZmNiN2NlIDEw MDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9UZXN0Q29udHJvbGxlcklPUy5t bQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9UZXN0Q29udHJvbGxlcklPUy5tbQpA QCAtMTEwLDggKzExMCwxMCBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRpYWxp emUoY29uc3QgT3B0aW9ucyYgb3B0aW9ucykKICAgICBhdXRvIGNlbnRlciA9IENGTm90aWZpY2F0 aW9uQ2VudGVyR2V0TG9jYWxDZW50ZXIoKTsKICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9i c2VydmVyKGNlbnRlciwgdGhpcywgaGFuZGxlS2V5Ym9hcmRXaWxsSGlkZU5vdGlmaWNhdGlvbiwg KENGU3RyaW5nUmVmKVVJS2V5Ym9hcmRXaWxsSGlkZU5vdGlmaWNhdGlvbiwgbnVsbHB0ciwgQ0ZO b3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVySW1tZWRpYXRlbHkpOwogICAgIENG Tm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2ZXIoY2VudGVyLCB0aGlzLCBoYW5kbGVLZXlib2Fy ZERpZEhpZGVOb3RpZmljYXRpb24sIChDRlN0cmluZ1JlZilVSUtleWJvYXJkRGlkSGlkZU5vdGlm aWNhdGlvbiwgbnVsbHB0ciwgQ0ZOb3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVy SW1tZWRpYXRlbHkpOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAg ICAgQ0ZOb3RpZmljYXRpb25DZW50ZXJBZGRPYnNlcnZlcihjZW50ZXIsIHRoaXMsIGhhbmRsZU1l bnVXaWxsSGlkZU5vdGlmaWNhdGlvbiwgKENGU3RyaW5nUmVmKVVJTWVudUNvbnRyb2xsZXJXaWxs SGlkZU1lbnVOb3RpZmljYXRpb24sIG51bGxwdHIsIENGTm90aWZpY2F0aW9uU3VzcGVuc2lvbkJl aGF2aW9yRGVsaXZlckltbWVkaWF0ZWx5KTsKICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9i c2VydmVyKGNlbnRlciwgdGhpcywgaGFuZGxlTWVudURpZEhpZGVOb3RpZmljYXRpb24sIChDRlN0 cmluZ1JlZilVSU1lbnVDb250cm9sbGVyRGlkSGlkZU1lbnVOb3RpZmljYXRpb24sIG51bGxwdHIs IENGTm90aWZpY2F0aW9uU3VzcGVuc2lvbkJlaGF2aW9yRGVsaXZlckltbWVkaWF0ZWx5KTsKKyAg ICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIH0KIAogdm9pZCBUZXN0Q29udHJv bGxlcjo6cGxhdGZvcm1EZXN0cm95KCkKQEAgLTEyMSw4ICsxMjMsMTAgQEAgdm9pZCBUZXN0Q29u dHJvbGxlcjo6cGxhdGZvcm1EZXN0cm95KCkKICAgICBhdXRvIGNlbnRlciA9IENGTm90aWZpY2F0 aW9uQ2VudGVyR2V0TG9jYWxDZW50ZXIoKTsKICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJlbW92 ZU9ic2VydmVyKGNlbnRlciwgdGhpcywgKENGU3RyaW5nUmVmKVVJS2V5Ym9hcmRXaWxsSGlkZU5v dGlmaWNhdGlvbiwgbnVsbHB0cik7CiAgICAgQ0ZOb3RpZmljYXRpb25DZW50ZXJSZW1vdmVPYnNl cnZlcihjZW50ZXIsIHRoaXMsIChDRlN0cmluZ1JlZilVSUtleWJvYXJkRGlkSGlkZU5vdGlmaWNh dGlvbiwgbnVsbHB0cik7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4K ICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJlbW92ZU9ic2VydmVyKGNlbnRlciwgdGhpcywgKENG U3RyaW5nUmVmKVVJTWVudUNvbnRyb2xsZXJXaWxsSGlkZU1lbnVOb3RpZmljYXRpb24sIG51bGxw dHIpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyUmVtb3ZlT2JzZXJ2ZXIoY2VudGVyLCB0aGlz LCAoQ0ZTdHJpbmdSZWYpVUlNZW51Q29udHJvbGxlckRpZEhpZGVNZW51Tm90aWZpY2F0aW9uLCBu dWxscHRyKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIH0KIAogdm9p ZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZUluamVjdGVkQnVuZGxlUGF0aCgpCg== 458013 2022-04-20 14:08:27 -0700 2022-04-20 14:44:12 -0700 Patch for landing bug-239560-20220420140827.patch text/plain 20052 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5MTc0NWJiYjE1YjVjYjE1 ZTg3NDJjZmM2MjBlZjQ2NmVkNjZmMjcuLjBhOWU3ZWZiNzZkMmQyNjBjYjQ2NzViOTFhMTI5ZTY2 YWI1ZjMxYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjItMDQtMjAgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRyZXNzIHJlY2Vu dCBkZXByZWNhdGlvbiB3YXJuaW5ncyBvbiBpT1MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBXZW5z b24gSHNpZWguCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tOgorICAgICAgICAo LVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGNvbnRleHRNZW51SW50ZXJhY3Rpb246Y29uZmlndXJh dGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlmaWVyOl0pOgorICAgICAgICAo LVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGNvbnRleHRNZW51SW50ZXJhY3Rpb246cHJldmlld0Zv ckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlvbjpdKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBzZXRVcEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgY2FuUGVyZm9ybUFjdGlvbkZvcldlYlZpZXc6d2l0aFNlbmRlcjpdKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBwYXN0ZUZvcldlYlZpZXc6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgX2hhbmRsZURPTVBhc3RlUmVxdWVzdFdpdGhSZXN1bHQ6XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgX3JlcXVlc3RET01QYXN0ZUFjY2Vzc0ZvckNhdGVnb3J5OmVsZW1lbnRSZWN0Om9y aWdpbklkZW50aWZpZXI6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uOnByZXZpZXdGb3JIaWdo bGlnaHRpbmdJdGVtV2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg Y29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uOmRpc21pc3NhbFByZXZpZXdGb3JJ dGVtV2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1l bnVJbnRlcmFjdGlvbjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9u Ol0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGNvbnRleHRNZW51SW50ZXJh Y3Rpb246cHJldmlld0ZvckRpc21pc3NpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6IERlbGV0 ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRv d25JT1MubW06CisgICAgICAgICgtW1dLRGF0YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duIGNvbnRl eHRNZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdp dGhJZGVudGlmaWVyOl0pOgorICAgICAgICAoLVtXS0RhdGFMaXN0U3VnZ2VzdGlvbnNEcm9wZG93 biBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENv bmZpZ3VyYXRpb246XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0RhdGVUaW1lSW5wdXRDb250cm9sLm1tOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNv bnRleHRNZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbjpoaWdobGlnaHRQcmV2aWV3Rm9ySXRl bVdpdGhJZGVudGlmaWVyOl0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRN ZW51SW50ZXJhY3Rpb246cHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlv bjpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9h ZFBhbmVsLm1tOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBjb250ZXh0TWVudUludGVy YWN0aW9uOmNvbmZpZ3VyYXRpb246aGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmll cjpdKToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgY29udGV4dE1lbnVJbnRlcmFjdGlv bjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tOgor ICAgICAgICAoLVtXS1NlbGVjdFBpY2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOmNvbmZpZ3Vy YXRpb246aGlnaGxpZ2h0UHJldmlld0Zvckl0ZW1XaXRoSWRlbnRpZmllcjpdKToKKyAgICAgICAg KC1bV0tTZWxlY3RQaWNrZXIgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpwcmV2aWV3Rm9ySGlnaGxp Z2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOiBEZWxldGVkLgorCiAyMDIyLTA0LTIwICBE aWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgbm9uLXVuaWZpZWQgYnVpbGQgZml4ZXMgYWZ0ZXIgcjI5MzA1MgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRleCA3NDliYmViYzRlMDY4NDA2ZGZmMzFkNGZm YjNhYWVkZDVlOTI0NjkzLi44OWQ1MDY2NGE4ZTdhN2Y4ODJmM2ZkNGYyYmRiNmE2YzMxODNjMmJh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaApAQCAtNDEsNiAr NDEsNyBAQAogI2ltcG9ydCA8VUlLaXQvVUlEZXZpY2VfUHJpdmF0ZS5oPgogI2ltcG9ydCA8VUlL aXQvVUlEb2N1bWVudFBhc3N3b3JkVmlldy5oPgogI2ltcG9ydCA8VUlLaXQvVUlEb2N1bWVudFBp Y2tlclZpZXdDb250cm9sbGVyX1ByaXZhdGUuaD4KKyNpbXBvcnQgPFVJS2l0L1VJRWRpdE1lbnVJ bnRlcmFjdGlvbl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSUZvbnRfUHJpdmF0ZS5oPgog I2ltcG9ydCA8VUlLaXQvVUlHZW9tZXRyeV9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSUdl c3R1cmVSZWNvZ25pemVyX1ByaXZhdGUuaD4KQEAgLTEyMTIsOSArMTIxMywxMSBAQCBXVEZfRVhU RVJOX0NfRU5ECiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFVJS2V5Ym9hcmRQcmVm ZXJlbmNlc0NvbnRyb2xsZXI8VElQcmVmZXJlbmNlc0NvbnRyb2xsZXJBY3Rpb25zPiAqcHJlZmVy ZW5jZXNBY3Rpb25zOwogQGVuZAogCitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJ TgogQGludGVyZmFjZSBVSU1lbnVJdGVtIChVSU1lbnVDb250cm9sbGVyX1NQSSkKIEBwcm9wZXJ0 eSAobm9uYXRvbWljKSBCT09MIGRvbnREaXNtaXNzOwogQGVuZAorQUxMT1dfREVQUkVDQVRFRF9E RUNMQVJBVElPTlNfRU5ECiAKIEBpbnRlcmZhY2UgVUlDYWxsb3V0QmFyIDogVUlWaWV3CiArIChV SUNhbGxvdXRCYXIgKilhY3RpdmVDYWxsb3V0QmFyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQppbmRleCAxNTAxMjRmMTEw MDY4ZjU3MzAyNmMwMWUxYTBiNjc2Y2Y4YWExZmZiLi5iNDE1MTkzZjgxM2NjODBhMWZkZTk4MDUw MzBiMWM0YWE5NmZlNGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpAQCAtOTI0LDcgKzkyNCw3IEBAIHN0YXRpYyBO U0FycmF5PFVJTWVudUVsZW1lbnQgKj4gKm1lbnVFbGVtZW50c0Zyb21EZWZhdWx0QWN0aW9ucyhS ZXRhaW5QdHI8TlNBcnJhCiAgICAgcmV0dXJuIG5pbDsKIH0KIAotLSAoVUlUYXJnZXRlZFByZXZp ZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilp bnRlcmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihV SUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQ cmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9u ICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24g Kiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6KGlk PE5TQ29weWluZz4paWRlbnRpZmllcgogewogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKICAg ICBpZiAoaW50ZXJhY3Rpb24gPT0gX2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb24p IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCmluZGV4IDg2M2U3YjRkNGY0ZGRhN2M4YTk1MjJlOWNhMzk2M2NkZjkx ZmFjY2YuLmNmOWVlZjI5NzFlZDg0MTQ0NjgwNDA1NTBkNzIyOGE1NTIwZjE1ZGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtMTA3Nyw4ICsxMDc3LDEyIEBAIHN0YXRpYyBXS0RyYWdTZXNzaW9uQ29udGV4 dCAqZW5zdXJlTG9jYWxEcmFnU2Vzc2lvbkNvbnRleHQoaWQgPFVJRHJhZ1Nlc3Npb24+IHNlCiAj ZW5kaWYKIAogICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpjZW50ZXIgPSBbTlNOb3RpZmljYXRp b25DZW50ZXIgZGVmYXVsdENlbnRlcl07CisgICAgCisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfQkVHSU4KICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNl bGVjdG9yKF93aWxsSGlkZU1lbnU6KSBuYW1lOlVJTWVudUNvbnRyb2xsZXJXaWxsSGlkZU1lbnVO b3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNl bGVjdG9yOkBzZWxlY3RvcihfZGlkSGlkZU1lbnU6KSBuYW1lOlVJTWVudUNvbnRyb2xsZXJEaWRI aWRlTWVudU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19FTkQKKyAgICAKICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0 b3I6QHNlbGVjdG9yKF9rZXlib2FyZERpZFJlcXVlc3REaXNtaXNzYWw6KSBuYW1lOlVJS2V5Ym9h cmRQcml2YXRlRGlkUmVxdWVzdERpc21pc3NhbE5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKIAog ICAgIF9zaG93aW5nVGV4dFN0eWxlT3B0aW9ucyA9IE5POwpAQCAtNDExNywxMCArNDEyMSwxMiBA QCBXRUJDT1JFX0NPTU1BTkRfRk9SX1dFQlZJRVcocGFzdGVBbmRNYXRjaFN0eWxlKTsKICAgICB9 CiAKICAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihzZWxlY3RBbGw6KSkgeworICAgICAgICBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgICAgICBpZiAoW3NlbmRlciBp c0tpbmRPZkNsYXNzOlVJTWVudUNvbnRyb2xsZXIuY2xhc3NdKSB7CiAgICAgICAgICAgICAvLyBC eSBwbGF0Zm9ybSBjb252ZW50aW9uIHdlIGRvbid0IHNob3cgU2VsZWN0IEFsbCBpbiB0aGUgY2Fs bG91dCBtZW51IGZvciBhIHJhbmdlIHNlbGVjdGlvbi4KICAgICAgICAgICAgIHJldHVybiAhZWRp dG9yU3RhdGUuc2VsZWN0aW9uSXNSYW5nZSAmJiBzZWxmLmhhc0NvbnRlbnQ7CiAgICAgICAgIH0K KyAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgICAgIHJldHVy biBZRVM7CiAgICAgfQogCkBAIC00MTUwLDggKzQxNTYsMTAgQEAgV0VCQ09SRV9DT01NQU5EX0ZP Ul9XRUJWSUVXKHBhc3RlQW5kTWF0Y2hTdHlsZSk7CiAgICAgICAgIGlmICghbWF5Q29udGFpblNl bGVjdGFibGVUZXh0KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlKSB8fCBf Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5pc1JlYWRPbmx5KQogICAgICAgICAgICAgcmV0dXJu IE5POwogCisgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAg ICAgIGlmIChbc2VuZGVyIGlzS2luZE9mQ2xhc3M6VUlNZW51Q29udHJvbGxlci5jbGFzc10gJiYg ZWRpdG9yU3RhdGUuc2VsZWN0aW9uSXNSYW5nZSkKICAgICAgICAgICAgIHJldHVybiBOTzsKKyAg ICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgfQogI2VuZGlmIC8v IEVOQUJMRShJTUFHRV9BTkFMWVNJUykKIApAQCAtNDIwNiw4ICs0MjE0LDEwIEBAIFdFQkNPUkVf Q09NTUFORF9GT1JfV0VCVklFVyhwYXN0ZUFuZE1hdGNoU3R5bGUpOwogCiAtICh2b2lkKXBhc3Rl Rm9yV2ViVmlldzooaWQpc2VuZGVyCiB7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfQkVHSU4KICAgICBpZiAoc2VuZGVyID09IFVJTWVudUNvbnRyb2xsZXIuc2hhcmVkTWVudUNv bnRyb2xsZXIgJiYgW3NlbGYgX2hhbmRsZURPTVBhc3RlUmVxdWVzdFdpdGhSZXN1bHQ6V2ViQ29y ZTo6RE9NUGFzdGVBY2Nlc3NSZXNwb25zZTo6R3JhbnRlZEZvckdlc3R1cmVdKQogICAgICAgICBy ZXR1cm47CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAKICAgICBfYXV0 b2NvcnJlY3Rpb25Db250ZXh0TmVlZHNVcGRhdGUgPSBZRVM7CiAgICAgX3BhZ2UtPmV4ZWN1dGVF ZGl0Q29tbWFuZCgicGFzdGUiX3MpOwpAQCAtNDM3MCw3ICs0MzgwLDkgQEAgc3RhdGljIFVJUGFz dGVib2FyZCAqcGFzdGVib2FyZEZvckFjY2Vzc0NhdGVnb3J5KFdlYkNvcmU6OkRPTVBhc3RlQWNj ZXNzQ2F0ZWdvcnkKICAgICB9CiAKICAgICBpZiAoYXV0byBwYXN0ZUhhbmRsZXIgPSBXVEZNb3Zl KF9kb21QYXN0ZVJlcXVlc3RIYW5kbGVyKSkgeworICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19CRUdJTgogICAgICAgICBbVUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51Q29u dHJvbGxlciBoaWRlTWVudUZyb21WaWV3OnNlbGZdOworICAgICAgICBBTExPV19ERVBSRUNBVEVE X0RFQ0xBUkFUSU9OU19FTkQKICAgICAgICAgcGFzdGVIYW5kbGVyKHJlc3BvbnNlKTsKICAgICAg ICAgcmV0dXJuIFlFUzsKICAgICB9CkBAIC03MDUwLDggKzcwNjIsOSBAQCBzdGF0aWMgQk9PTCBh bGxQYXN0ZWJvYXJkSXRlbU9yaWdpbnNNYXRjaE9yaWdpbihVSVBhc3RlYm9hcmQgKnBhc3RlYm9h cmQsIGNvbnN0CiAgICAgICAgIG1lbnVDb250cm9sbGVyUmVjdCA9IHsgV2ViQ29yZTo6SW50UG9p bnQoX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uKSwgeyB9IH07CiAgICAgICAgIG1lbnVDb250cm9s bGVyUmVjdC5pbmZsYXRlKGludGVyYWN0aW9uTG9jYXRpb25NYXJnaW4pOwogICAgIH0KLQorICAg IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgW1VJTWVudUNvbnRyb2xs ZXIuc2hhcmVkTWVudUNvbnRyb2xsZXIgc2hvd01lbnVGcm9tVmlldzpzZWxmIHJlY3Q6bWVudUNv bnRyb2xsZXJSZWN0XTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIH0K IAogLSAodm9pZClkb0FmdGVyRWRpdG9yU3RhdGVVcGRhdGVBZnRlckZvY3VzaW5nRWxlbWVudDoo ZGlzcGF0Y2hfYmxvY2tfdClibG9jawpAQCAtMTE4NzgsNyArMTE4OTEsNyBAQCBzdGF0aWMgVUlN ZW51ICptZW51RnJvbUxlZ2FjeVByZXZpZXdPckRlZmF1bHRBY3Rpb25zKFVJVmlld0NvbnRyb2xs ZXIgKnByZXZpZXdWaQogICAgIHJldHVybiBbX2FjdGlvblNoZWV0QXNzaXN0YW50IHN1Z2dlc3Rl ZEFjdGlvbnNGb3JDb250ZXh0TWVudVdpdGhQb3NpdGlvbkluZm9ybWF0aW9uOl9wb3NpdGlvbklu Zm9ybWF0aW9uXTsKIH0KIAotLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVy YWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9y SGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJh dGlvbiAqKWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJ bnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmln dXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIHByZXZp ZXdGb3JIaWdobGlnaHRpbmdJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWluZz4paWRlbnRp ZmllcgogewogICAgIFtzZWxmIF9zdGFydFN1cHByZXNzaW5nU2VsZWN0aW9uQXNzaXN0YW50Rm9y UmVhc29uOldlYktpdDo6SW50ZXJhY3Rpb25Jc0hhcHBlbmluZ107CiAgICAgW3NlbGYgX2NhbmNl bFRvdWNoRXZlbnRHZXN0dXJlUmVjb2duaXplcl07CkBAIC0xMTkxMiw3ICsxMTkyNSw3IEBAIHN0 YXRpYyBVSU1lbnUgKm1lbnVGcm9tTGVnYWN5UHJldmlld09yRGVmYXVsdEFjdGlvbnMoVUlWaWV3 Q29udHJvbGxlciAqcHJldmlld1ZpCiAgICAgfQogfQogCi0tIChVSVRhcmdldGVkUHJldmlldyAq KWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVy YWN0aW9uIHByZXZpZXdGb3JEaXNtaXNzaW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRl eHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3 ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50 ZXJhY3Rpb24gY29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25m aWd1cmF0aW9uIGRpc21pc3NhbFByZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29w eWluZz4paWRlbnRpZmllcgogewogICAgIHJldHVybiBzdGQ6OmV4Y2hhbmdlKF9jb250ZXh0TWVu dUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3LCBuaWwpLmF1dG9yZWxlYXNlKCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdnZXN0aW9u c0Ryb3Bkb3duSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0 U3VnZ2VzdGlvbnNEcm9wZG93bklPUy5tbQppbmRleCBlZjZkZjY1OGNkMjkwM2E1ZjNmNmE3MDJh YmJjZmI1ZDJmNGY3ZDMxLi41MmQ5MTE5YTdhMjc5NTY2Y2I4OTMwNWIwNjgxNWJlZmQzMjM2M2Ew IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0YUxpc3RTdWdn ZXN0aW9uc0Ryb3Bkb3duSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1MubW0KQEAgLTU1Miw3ICs1NTIsNyBAQCBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIAogI3ByYWdtYSBtYXJrIFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbkRlbGVnYXRlCiAKLS0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4 dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24g cHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVu dUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCistIChVSVRhcmdldGVkUHJldmlldyAqKWNv bnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0 aW9uIGNvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJh dGlvbiBoaWdobGlnaHRQcmV2aWV3Rm9ySXRlbVdpdGhJZGVudGlmaWVyOihpZDxOU0NvcHlpbmc+ KWlkZW50aWZpZXIKIHsKICAgICByZXR1cm4gW3NlbGYudmlldyBfY3JlYXRlVGFyZ2V0ZWRDb250 ZXh0TWVudUhpbnRQcmV2aWV3Rm9yRm9jdXNlZEVsZW1lbnRdOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJv bC5tbQppbmRleCAyZGM2NTVjOWQwYTA1NTNjOWRlNjcwNzkyOGUyNzI3NDk0NDBlZTU0Li44MjVk Y2VkZTI0ZWQzNWNmZjNmMzJiMTVlZmFhMjE2Njg2ZDg2YjBmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJv bC5tbQpAQCAtNDE2LDcgKzQxNiw4IEBAIHN0YXRpYyBjb25zdCBDR0Zsb2F0IGtEYXRlVGltZVBp Y2tlckNvbnRyb2xNYXJnaW4gPSA2OwogICAgIHJldHVybiBVSUVkZ2VJbnNldHNaZXJvOwogfQog Ci0tIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51 V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJh dGlvbgorCistIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJ Q29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGNvbmZpZ3VyYXRpb246KFVJQ29u dGV4dE1lbnVDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbiBoaWdobGlnaHRQcmV2aWV3Rm9y SXRlbVdpdGhJZGVudGlmaWVyOihpZDxOU0NvcHlpbmc+KWlkZW50aWZpZXIKIHsKICAgICByZXR1 cm4gW192aWV3IF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdGb3JGb2N1c2Vk RWxlbWVudF07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGaWxlVXBsb2FkUGFuZWwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KaW5kZXggMzg2NTJkYzFiYTZiYWZhNWY0OTgwOWI4Y2Rj NDdmMjIxZDQzNjAwZC4uNzEwYWZkMzI1NDNkMzUyN2U4MThhYzQ0NTQzNDRiYmRmYTI4YmRiNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9h ZFBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVV cGxvYWRQYW5lbC5tbQpAQCAtNjM3LDcgKzYzNyw3IEBAIHN0YXRpYyBOU1NldDxOU1N0cmluZyAq PiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5ICptaW1lVHlwZXMpCiAKICNpZiBVU0UoVUlDT05U RVhUTUVOVSkKIAotLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9u OihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxp Z2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAq KWNvbmZpZ3VyYXRpb24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFj dGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlv bjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFBy ZXZpZXdGb3JJdGVtV2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWluZz4paWRlbnRpZmllcgogewog ICAgIHJldHVybiBbX3ZpZXcgX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lm UG9zc2libGVdOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRm9ybVNlbGVjdFBpY2tlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0Zvcm1TZWxlY3RQaWNrZXIubW0KaW5kZXggZjlmMDU2ZWI0OWU5NjgwMzA4MWZiY2Rh MTE4ZjkyYTNlNGUzYzBhNS4uN2M3YzFkNTNiZDM1MDI5M2JhNjgyNGExYjZhZGRlZDk5MGExY2Jl ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNl bGVjdFBpY2tlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tG b3JtU2VsZWN0UGlja2VyLm1tCkBAIC02NDksNyArNjQ5LDcgQEAgc3RhdGljIGNvbnN0IGZsb2F0 IEdyb3VwT3B0aW9uVGV4dENvbG9yQWxwaGEgPSAwLjU7CiAgICAgcmV0dXJuIG5pbDsKIH0KIAot LSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRN ZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdp dGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRp b24KKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250 ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gY29uZmlndXJhdGlvbjooVUlDb250ZXh0 TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIGhpZ2hsaWdodFByZXZpZXdGb3JJdGVt V2l0aElkZW50aWZpZXI6KGlkPE5TQ29weWluZz4paWRlbnRpZmllcgogewogICAgIHJldHVybiBb X3ZpZXcgX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVt ZW50XTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCA1Yzg3YWIyNWQ0NjRiOWZlMmRiZDEyNzgyMDc3OTk3ZTc2ZTEyZGE2Li5mZWQwZDk5OGU3 NWFkM2FiNGI5M2M4ZDA5N2U0YjJiNzMxOGUyNGY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDQtMjAgIE1l Z2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRyZXNz IHJlY2VudCBkZXByZWNhdGlvbiB3YXJuaW5ncyBvbiBpT1MuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk1NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dLQ29udGVudFZpZXdFZGl0aW5nQWN0aW9ucy5tbToKKyAgICAgICAgKFRFU1QpOgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdFJ1bm5lcldLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bVGVzdFJ1bm5lcldLV2ViVmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246 XSk6CisgICAgICAgICgtW1Rlc3RSdW5uZXJXS1dlYlZpZXcgX2FkZEN1c3RvbUl0ZW1Ub01lbnVD b250cm9sbGVySWZOZWNlc3NhcnldKToKKyAgICAgICAgKC1bVGVzdFJ1bm5lcldLV2ViVmlldyBy ZXNldEN1c3RvbU1lbnVBY3Rpb25dKToKKyAgICAgICAgKC1bVGVzdFJ1bm5lcldLV2ViVmlldyBj YW5QZXJmb3JtQWN0aW9uOndpdGhTZW5kZXI6XSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9pb3MvVGVzdENvbnRyb2xsZXJJT1MubW06CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVy OjpwbGF0Zm9ybUluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cGxh dGZvcm1EZXN0cm95KToKKwogMjAyMi0wNC0yMCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4Zmll bGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBXZWJHUFUgQ1RTIHRvIHJl dmlzaW9uIDU0OWQ3YzJmMTYzNzMyMWE5MjQ3ZjBhM2FiMDIyZjkxOWU1Y2E1ZGEKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld0Vk aXRpbmdBY3Rpb25zLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X S0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlvbnMubW0KaW5kZXggZjY4YmMzZGNjN2ZmZjZkM2Q4ZTU5 ZTU3MDljM2FiMDMwYTg0YzNlZi4uN2Y4NDgwNWZlMWM2NmJjNGUwZWJiNzA2NmZkNzdkZTE1N2U3 ZWFlZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X S0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlvbnMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3RWRpdGluZ0FjdGlvbnMubW0KQEAgLTEzNiw3 ICsxMzYsOSBAQCBURVNUKFdlYktpdCwgQ2FwdHVyZVRleHRGcm9tQ2FtZXJhKQogICAgIFt3ZWJW aWV3IHNlbGVjdEFsbDpuaWxdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9u VXBkYXRlXTsKICAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyBjYW5QZXJmb3JtQWN0aW9uOkBzZWxl Y3RvcihjYXB0dXJlVGV4dEZyb21DYW1lcmE6KSB3aXRoU2VuZGVyOm5pbF0pOworICAgIEFMTE9X X0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3 IGNhblBlcmZvcm1BY3Rpb246QHNlbGVjdG9yKGNhcHR1cmVUZXh0RnJvbUNhbWVyYTopIHdpdGhT ZW5kZXI6VUlNZW51Q29udHJvbGxlci5zaGFyZWRNZW51Q29udHJvbGxlcl0pOworICAgIEFMTE9X X0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogCiAgICAgW3dlYlZpZXcgY29sbGFwc2VUb0Vu ZF07CiAgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwpkaWZmIC0t Z2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0UnVubmVyV0tXZWJWaWV3Lm1t IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0UnVubmVyV0tXZWJWaWV3Lm1tCmlu ZGV4IGNkMDcxYjE4NjI1ZDc2MTBkZmE3YzFhZDU4NTgyM2FhMjU3YzExNWIuLmJmMzgxMGI2NmI5 ODg2MTlmMzI1MWNiNmQyZjE3N2FkMWMzMmYwYWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvY29jb2EvVGVzdFJ1bm5lcldLV2ViVmlldy5tbQorKysgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL2NvY29hL1Rlc3RSdW5uZXJXS1dlYlZpZXcubW0KQEAgLTExMSw5ICsxMTEsMTEg QEAgSUdOT1JFX1dBUk5JTkdTX0VORAogI2Vsc2UKICAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZl cjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfaW52b2tlU2hvd0tleWJvYXJkQ2FsbGJhY2tJZk5l Y2Vzc2FyeSkgbmFtZTpVSUtleWJvYXJkRGlkU2hvd05vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsK ICAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfaW52 b2tlSGlkZUtleWJvYXJkQ2FsbGJhY2tJZk5lY2Vzc2FyeSkgbmFtZTpVSUtleWJvYXJkRGlkSGlk ZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfQkVHSU4KICAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9y OkBzZWxlY3RvcihfZGlkU2hvd01lbnUpIG5hbWU6VUlNZW51Q29udHJvbGxlckRpZFNob3dNZW51 Tm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwogICAgICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNl bGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aWxsSGlkZU1lbnUpIG5hbWU6VUlNZW51Q29udHJvbGxl cldpbGxIaWRlTWVudU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAgICAgICAgW2NlbnRlciBh ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfZGlkSGlkZU1lbnUpIG5hbWU6VUlN ZW51Q29udHJvbGxlckRpZEhpZGVNZW51Tm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOworICAgICAg ICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICAgICAgW2NlbnRlciBhZGRP YnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2lsbFByZXNlbnRQb3BvdmVyKSBuYW1l OkAiVUlQb3BvdmVyQ29udHJvbGxlcldpbGxQcmVzZW50UG9wb3Zlck5vdGlmaWNhdGlvbiIgb2Jq ZWN0Om5pbF07CiAgICAgICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2Vs ZWN0b3IoX2RpZERpc21pc3NQb3BvdmVyKSBuYW1lOkAiVUlQb3BvdmVyQ29udHJvbGxlckRpZERp c21pc3NQb3BvdmVyTm90aWZpY2F0aW9uIiBvYmplY3Q6bmlsXTsKICAgICAgICAgc2VsZi5VSURl bGVnYXRlID0gc2VsZjsKQEAgLTI4Miw4ICsyODQsMTAgQEAgSUdOT1JFX1dBUk5JTkdTX0VORAog ICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIGl0ZW0gPSBhZG9wdE5TKFtbVUlNZW51SXRlbSBh bGxvY10gaW5pdFdpdGhUaXRsZTpfY3VzdG9tTWVudUFjdGlvbkluZm8tPm5hbWUuZ2V0KCkgYWN0 aW9uOkBzZWxlY3RvcihwZXJmb3JtQ3VzdG9tQWN0aW9uOildKTsKKyAgICBBTExPV19ERVBSRUNB VEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIFtpdGVtIHNldERvbnREaXNtaXNzOiFfY3VzdG9t TWVudUFjdGlvbkluZm8tPmRpc21pc3Nlc0F1dG9tYXRpY2FsbHldOwogICAgIFVJTWVudUNvbnRy b2xsZXIgKmNvbnRyb2xsZXIgPSBVSU1lbnVDb250cm9sbGVyLnNoYXJlZE1lbnVDb250cm9sbGVy OworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIGNvbnRyb2xsZXIu bWVudUl0ZW1zID0gQFsgaXRlbS5nZXQoKSBdOwogICAgIFtjb250cm9sbGVyIHVwZGF0ZV07CiB9 CkBAIC0zMDIsNyArMzA2LDkgQEAgSUdOT1JFX1dBUk5JTkdTX0VORAogLSAodm9pZClyZXNldEN1 c3RvbU1lbnVBY3Rpb24KIHsKICAgICBfY3VzdG9tTWVudUFjdGlvbkluZm8ucmVzZXQoKTsKKyAg ICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIFVJTWVudUNvbnRyb2xs ZXIuc2hhcmVkTWVudUNvbnRyb2xsZXIubWVudUl0ZW1zID0gQFsgXTsKKyAgICBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKIH0KIAogLSAodm9pZClwZXJmb3JtQ3VzdG9tQWN0aW9u OihpZClzZW5kZXIKQEAgLTMyNSw3ICszMzEsOSBAQCBJR05PUkVfV0FSTklOR1NfRU5ECiAgICAg aWYgKGlzQ3VzdG9tQWN0aW9uKQogICAgICAgICBjYW5QZXJmb3JtQWN0aW9uQnlEZWZhdWx0ID0g X2N1c3RvbU1lbnVBY3Rpb25JbmZvLmhhc192YWx1ZSgpOwogCisgICAgQUxMT1dfREVQUkVDQVRF RF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBpZiAoY2FuUGVyZm9ybUFjdGlvbkJ5RGVmYXVsdCAm JiBfYWxsb3dlZE1lbnVBY3Rpb25zICYmIHNlbmRlciA9PSBVSU1lbnVDb250cm9sbGVyLnNoYXJl ZE1lbnVDb250cm9sbGVyKSB7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E CiAgICAgICAgIEJPT0wgaXNBbGxvd2VkID0gTk87CiAgICAgICAgIGlmIChpc0N1c3RvbUFjdGlv bikgewogICAgICAgICAgICAgZm9yIChOU1N0cmluZyAqYWxsb3dlZEFjdGlvbiBpbiBfYWxsb3dl ZE1lbnVBY3Rpb25zLmdldCgpKSB7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L2lvcy9UZXN0Q29udHJvbGxlcklPUy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rl c3RDb250cm9sbGVySU9TLm1tCmluZGV4IDE0MmEyYzExOTUzMGYzYTMzMzI1OTBjODhhMDFkYWQ1 NTI3ZmY3ODcuLjRhMTFlODc4N2MwMzI1NWYzZmFiYzQ3Mzc1ZTdhODFiNmJmY2I3Y2UgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tCisr KyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tCkBAIC0x MTAsOCArMTEwLDEwIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtSW5pdGlhbGl6ZShj b25zdCBPcHRpb25zJiBvcHRpb25zKQogICAgIGF1dG8gY2VudGVyID0gQ0ZOb3RpZmljYXRpb25D ZW50ZXJHZXRMb2NhbENlbnRlcigpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2 ZXIoY2VudGVyLCB0aGlzLCBoYW5kbGVLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uLCAoQ0ZT dHJpbmdSZWYpVUlLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uLCBudWxscHRyLCBDRk5vdGlm aWNhdGlvblN1c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7CiAgICAgQ0ZOb3Rp ZmljYXRpb25DZW50ZXJBZGRPYnNlcnZlcihjZW50ZXIsIHRoaXMsIGhhbmRsZUtleWJvYXJkRGlk SGlkZU5vdGlmaWNhdGlvbiwgKENGU3RyaW5nUmVmKVVJS2V5Ym9hcmREaWRIaWRlTm90aWZpY2F0 aW9uLCBudWxscHRyLCBDRk5vdGlmaWNhdGlvblN1c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1l ZGlhdGVseSk7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICBD Rk5vdGlmaWNhdGlvbkNlbnRlckFkZE9ic2VydmVyKGNlbnRlciwgdGhpcywgaGFuZGxlTWVudVdp bGxIaWRlTm90aWZpY2F0aW9uLCAoQ0ZTdHJpbmdSZWYpVUlNZW51Q29udHJvbGxlcldpbGxIaWRl TWVudU5vdGlmaWNhdGlvbiwgbnVsbHB0ciwgQ0ZOb3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZp b3JEZWxpdmVySW1tZWRpYXRlbHkpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2 ZXIoY2VudGVyLCB0aGlzLCBoYW5kbGVNZW51RGlkSGlkZU5vdGlmaWNhdGlvbiwgKENGU3RyaW5n UmVmKVVJTWVudUNvbnRyb2xsZXJEaWRIaWRlTWVudU5vdGlmaWNhdGlvbiwgbnVsbHB0ciwgQ0ZO b3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVySW1tZWRpYXRlbHkpOworICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogfQogCiB2b2lkIFRlc3RDb250cm9sbGVy OjpwbGF0Zm9ybURlc3Ryb3koKQpAQCAtMTIxLDggKzEyMywxMCBAQCB2b2lkIFRlc3RDb250cm9s bGVyOjpwbGF0Zm9ybURlc3Ryb3koKQogICAgIGF1dG8gY2VudGVyID0gQ0ZOb3RpZmljYXRpb25D ZW50ZXJHZXRMb2NhbENlbnRlcigpOwogICAgIENGTm90aWZpY2F0aW9uQ2VudGVyUmVtb3ZlT2Jz ZXJ2ZXIoY2VudGVyLCB0aGlzLCAoQ0ZTdHJpbmdSZWYpVUlLZXlib2FyZFdpbGxIaWRlTm90aWZp Y2F0aW9uLCBudWxscHRyKTsKICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJlbW92ZU9ic2VydmVy KGNlbnRlciwgdGhpcywgKENGU3RyaW5nUmVmKVVJS2V5Ym9hcmREaWRIaWRlTm90aWZpY2F0aW9u LCBudWxscHRyKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAg IENGTm90aWZpY2F0aW9uQ2VudGVyUmVtb3ZlT2JzZXJ2ZXIoY2VudGVyLCB0aGlzLCAoQ0ZTdHJp bmdSZWYpVUlNZW51Q29udHJvbGxlcldpbGxIaWRlTWVudU5vdGlmaWNhdGlvbiwgbnVsbHB0cik7 CiAgICAgQ0ZOb3RpZmljYXRpb25DZW50ZXJSZW1vdmVPYnNlcnZlcihjZW50ZXIsIHRoaXMsIChD RlN0cmluZ1JlZilVSU1lbnVDb250cm9sbGVyRGlkSGlkZU1lbnVOb3RpZmljYXRpb24sIG51bGxw dHIpOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogfQogCiB2b2lkIFRl c3RDb250cm9sbGVyOjppbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVQYXRoKCkK